diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-06 20:44:07 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-06 20:44:07 (GMT) |
| commit | 5de89d3abfca98b0dfd0280d28576940c913d60d (patch) | |
| tree | ce339497e72abc84f4a1bbc9b270b07ab46dbc0c /notes-cache.c | |
| parent | 4a3a1edd0be1c5254ae4fc66e06297d87ef7d530 (diff) | |
| parent | d041ffa55a69cb6cdc3b160dc181c7e59b3bd4bb (diff) | |
| download | git-5de89d3abfca98b0dfd0280d28576940c913d60d.zip git-5de89d3abfca98b0dfd0280d28576940c913d60d.tar.gz git-5de89d3abfca98b0dfd0280d28576940c913d60d.tar.bz2 | |
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-cache.c')
| -rw-r--r-- | notes-cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/notes-cache.c b/notes-cache.c index bea013e..eabe4a0 100644 --- a/notes-cache.c +++ b/notes-cache.c @@ -59,7 +59,7 @@ int notes_cache_write(struct notes_cache *c) return -1; strbuf_attach(&msg, c->validity, strlen(c->validity), strlen(c->validity) + 1); - if (commit_tree(&msg, tree_sha1, NULL, commit_sha1, NULL) < 0) + if (commit_tree(&msg, tree_sha1, NULL, commit_sha1, NULL, NULL) < 0) return -1; if (update_ref("update notes cache", c->tree.ref, commit_sha1, NULL, 0, QUIET_ON_ERR) < 0) |