Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
merge-submodule: reduce output verbosity
[gitweb.git]
/
notes-merge.c
diff --git
a/notes-merge.c
b/notes-merge.c
index c09c5e0e474a30b0a8bf3d91063c8bbc61e63557..8e0726a9418e3b24bc8e665057f607e18e7d4206 100644
(file)
--- a/
notes-merge.c
+++ b/
notes-merge.c
@@
-322,7
+322,7
@@
static void write_note_to_worktree(const struct object_id *obj,
{
enum object_type type;
unsigned long size;
- void *buf = read_
sha1_file(note->hash
, &type, &size);
+ void *buf = read_
object_file(note
, &type, &size);
if (!buf)
die("cannot read note %s for object %s",