diff options
| author | Patryk Obara <patryk.obara@gmail.com> | 2017-08-20 22:09:28 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-20 21:51:38 -0700 |
| commit | 98e019b067ac8a34e06f9c412f14a080c7c4dc0d (patch) | |
| tree | 993e29b9bcffe7603f5b7d377af86aefbb7f1785 /notes-merge.c | |
| parent | bebfecb94c5c71091a07ebbd300740990d3266c7 (diff) | |
| download | git-98e019b067ac8a34e06f9c412f14a080c7c4dc0d.tar.gz | |
sha1_file: convert index_path to struct object_id
Convert all remaining callers as well.
Signed-off-by: Patryk Obara <patryk.obara@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 c12b354f10..744c685576 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -709,7 +709,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.hash, path.buf, &st, HASH_WRITE_OBJECT)) + if (index_path(&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", |