From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Jan 2014 18:33:13 +0000 (-0800)
Subject: Merge branch 'nd/commit-tree-constness'
X-Git-Tag: v1.9-rc0~29
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/34aacf30a39570e58de7c499f102b7196f2a9744?hp=-c

Merge branch 'nd/commit-tree-constness'

Code clean-up.

* nd/commit-tree-constness:
commit.c: make "tree" a const pointer in commit_tree*()
---

34aacf30a39570e58de7c499f102b7196f2a9744
diff --combined commit.c
index 5df1df7351,9a2c7429ec..5ff553872b
--- a/commit.c
+++ b/commit.c
@@@ -79,7 -79,7 +79,7 @@@ struct commit *lookup_commit_reference_
  	if (get_sha1_committish(name, sha1))
  		return NULL;
  	commit = lookup_commit_reference(sha1);
 -	if (!commit || parse_commit(commit))
 +	if (parse_commit(commit))
  		return NULL;
  	return commit;
  }
@@@ -341,13 -341,6 +341,13 @@@ int parse_commit(struct commit *item
  	return ret;
  }
  
 +void parse_commit_or_die(struct commit *item)
 +{
 +	if (parse_commit(item))
 +		die("unable to parse commit %s",
 +		    item ? sha1_to_hex(item->object.sha1) : "(null)");
 +}
 +
  int find_commit_subject(const char *commit_buffer, const char **subject)
  {
  	const char *eol;
@@@ -566,7 -559,7 +566,7 @@@ static void record_author_date(struct a
  	     buf;
  	     buf = line_end + 1) {
  		line_end = strchrnul(buf, '\n');
 -		if (prefixcmp(buf, "author ")) {
 +		if (!starts_with(buf, "author ")) {
  			if (!line_end[0] || line_end[1] == '\n')
  				return; /* end of header */
  			continue;
@@@ -1113,7 -1106,7 +1113,7 @@@ int parse_signed_commit(const unsigned 
  		next = next ? next + 1 : tail;
  		if (in_signature && line[0] == ' ')
  			sig = line + 1;
 -		else if (!prefixcmp(line, gpg_sig_header) &&
 +		else if (starts_with(line, gpg_sig_header) &&
  			 line[gpg_sig_header_len] == ' ')
  			sig = line + gpg_sig_header_len + 1;
  		if (sig) {
@@@ -1193,7 -1186,7 +1193,7 @@@ static void parse_gpg_output(struct sig
  	for (i = 0; i < ARRAY_SIZE(sigcheck_gpg_status); i++) {
  		const char *found, *next;
  
 -		if (!prefixcmp(buf, sigcheck_gpg_status[i].check + 1)) {
 +		if (starts_with(buf, sigcheck_gpg_status[i].check + 1)) {
  			/* At the very beginning of the buffer */
  			found = buf + strlen(sigcheck_gpg_status[i].check + 1);
  		} else {
@@@ -1356,7 -1349,7 +1356,7 @@@ void free_commit_extra_headers(struct c
  	}
  }
  
- int commit_tree(const struct strbuf *msg, unsigned char *tree,
+ int commit_tree(const struct strbuf *msg, const unsigned char *tree,
  		struct commit_list *parents, unsigned char *ret,
  		const char *author, const char *sign_commit)
  {
@@@ -1485,7 -1478,7 +1485,7 @@@ static const char commit_utf8_warn[] 
  "You may want to amend it after fixing the message, or set the config\n"
  "variable i18n.commitencoding to the encoding your project uses.\n";
  
- int commit_tree_extended(const struct strbuf *msg, unsigned char *tree,
+ int commit_tree_extended(const struct strbuf *msg, const unsigned char *tree,
  			 struct commit_list *parents, unsigned char *ret,
  			 const char *author, const char *sign_commit,
  			 struct commit_extra_header *extra)
diff --combined commit.h
index 934af889f7,dd8ae45918..f8a451d864
--- a/commit.h
+++ b/commit.h
@@@ -49,7 -49,6 +49,7 @@@ struct commit *lookup_commit_or_die(con
  
  int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size);
  int parse_commit(struct commit *item);
 +void parse_commit_or_die(struct commit *item);
  
  /* Find beginning and length of commit subject. */
  int find_commit_subject(const char *commit_buffer, const char **subject);
@@@ -232,11 -231,11 +232,11 @@@ struct commit_extra_header 
  extern void append_merge_tag_headers(struct commit_list *parents,
  				     struct commit_extra_header ***tail);
  
- extern int commit_tree(const struct strbuf *msg, unsigned char *tree,
+ extern int commit_tree(const struct strbuf *msg, const unsigned char *tree,
  		       struct commit_list *parents, unsigned char *ret,
  		       const char *author, const char *sign_commit);
  
- extern int commit_tree_extended(const struct strbuf *msg, unsigned char *tree,
+ extern int commit_tree_extended(const struct strbuf *msg, const unsigned char *tree,
  				struct commit_list *parents, unsigned char *ret,
  				const char *author, const char *sign_commit,
  				struct commit_extra_header *);