From 98e019b067ac8a34e06f9c412f14a080c7c4dc0d Mon Sep 17 00:00:00 2001 From: Patryk Obara Date: Sun, 20 Aug 2017 22:09:28 +0200 Subject: sha1_file: convert index_path to struct object_id Convert all remaining callers as well. Signed-off-by: Patryk Obara Signed-off-by: Junio C Hamano --- notes-merge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'notes-merge.c') 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", -- cgit v1.2.3