diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-05 11:00:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-05 11:00:49 -0800 |
| commit | 9d3d78435f2735b74afc74e9c5a735c27c026d33 (patch) | |
| tree | 8f66df5b090f6163698d66cc9dd7a522ae359dfd /notes-cache.c | |
| parent | 0074d18dc0d816f9842d3e0e1cd0b26341715b37 (diff) | |
| parent | 0c5e70f041bfda8b3899d13694a9093b41fafa19 (diff) | |
| download | git-9d3d78435f2735b74afc74e9c5a735c27c026d33.tar.xz | |
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>
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 4c8984ede1..c36a960bc3 100644 --- a/notes-cache.c +++ b/notes-cache.c @@ -56,7 +56,7 @@ int notes_cache_write(struct notes_cache *c) if (write_notes_tree(&c->tree, tree_sha1)) return -1; - if (commit_tree(c->validity, tree_sha1, NULL, commit_sha1, NULL) < 0) + if (commit_tree(c->validity, 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) |