diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-06 12:44:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-06 12:44:07 -0800 |
| commit | 5de89d3abfca98b0dfd0280d28576940c913d60d (patch) | |
| tree | ce339497e72abc84f4a1bbc9b270b07ab46dbc0c /notes-merge.c | |
| parent | 4a3a1edd0be1c5254ae4fc66e06297d87ef7d530 (diff) | |
| parent | d041ffa55a69cb6cdc3b160dc181c7e59b3bd4bb (diff) | |
| download | git-5de89d3abfca98b0dfd0280d28576940c913d60d.tar.gz | |
Merge branch 'jc/show-sig'
* jc/show-sig:
log --show-signature: reword the common two-head merge case
log-tree: show mergetag in log --show-signature output
log-tree.c: small refactor in show_signature()
commit --amend -S: strip existing gpgsig headers
verify_signed_buffer: fix stale comment
gpg-interface: allow use of a custom GPG binary
pretty: %G[?GS] placeholders
test "commit -S" and "log --show-signature"
log: --show-signature
commit: teach --gpg-sign option
Conflicts:
builtin/commit-tree.c
builtin/commit.c
builtin/merge.c
notes-cache.c
pretty.c
Diffstat (limited to 'notes-merge.c')
| -rw-r--r-- | notes-merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/notes-merge.c b/notes-merge.c index 0d38a1b17d..fb0832f97d 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -551,7 +551,7 @@ void create_notes_commit(struct notes_tree *t, struct commit_list *parents, /* else: t->ref points to nothing, assume root/orphan commit */ } - if (commit_tree(msg, tree_sha1, parents, result_sha1, NULL)) + if (commit_tree(msg, tree_sha1, parents, result_sha1, NULL, NULL)) die("Failed to commit notes tree to database"); } |