diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-09-21 15:57:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-21 16:48:11 (GMT) |
| commit | 58bf2a4cc7a929d2fe0ff30eda86fcec54aef0f8 (patch) | |
| tree | 14a33e0559d194d11f89ac2cdf61789db64dffcb /notes-merge.c | |
| parent | a7edadda593e34243c1cd3b3db750d502acf9b83 (diff) | |
| download | git-58bf2a4cc7a929d2fe0ff30eda86fcec54aef0f8.zip git-58bf2a4cc7a929d2fe0ff30eda86fcec54aef0f8.tar.gz git-58bf2a4cc7a929d2fe0ff30eda86fcec54aef0f8.tar.bz2 | |
sha1-file.c: remove implicit dependency on the_index
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 432edfb..13dd9ba 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -710,7 +710,7 @@ int notes_merge_commit(struct notes_merge_options *o, /* write file as blob, and add to partial_tree */ if (stat(path.buf, &st)) die_errno("Failed to stat '%s'", path.buf); - if (index_path(&blob_oid, path.buf, &st, HASH_WRITE_OBJECT)) + if (index_path(&the_index, &blob_oid, path.buf, &st, HASH_WRITE_OBJECT)) die("Failed to write blob object from '%s'", path.buf); if (add_note(partial_tree, &obj_oid, &blob_oid, NULL)) die("Failed to add resolved note '%s' to notes tree", |