From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Jan 2012 19:00:38 +0000 (-0800)
Subject: Merge branch 'jc/signed-commit' and 'jc/pull-signed-tag'
X-Git-Tag: v1.7.9-rc0~1^2~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9d3d78435f2735b74afc74e9c5a735c27c026d33;p=git.git

Merge branch 'jc/signed-commit' and 'jc/pull-signed-tag'

They both use the extended headers in commit objects, and the former has
necessary infrastructure to show them that is useful to view the result of
the latter.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

9d3d78435f2735b74afc74e9c5a735c27c026d33
diff --cc builtin/commit.c
index 0c64c880d,7e8a1cf4e..fa41ec8c8
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@@ -1484,15 -1493,11 +1493,15 @@@ int cmd_commit(int argc, const char **a
  		exit(1);
  	}
  
 -	if (amend)
 +	if (amend) {
  		extra = read_commit_extra_headers(current_head);
 +	} else {
 +		struct commit_extra_header **tail = &extra;
 +		append_merge_tag_headers(parents, &tail);
 +	}
  
  	if (commit_tree_extended(sb.buf, active_cache_tree->sha1, parents, sha1,
- 				 author_ident.buf, extra)) {
+ 				 author_ident.buf, sign_commit, extra)) {
  		rollback_index_files();
  		die(_("failed to write commit object"));
  	}