diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-25 16:23:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-25 16:23:26 -0700 |
| commit | 5cfe4256d98af22a570c78c5e3048391a90f5f98 (patch) | |
| tree | 2a168e5e4c4f52e0c58c6078304c9757f728c4e6 /notes-merge.c | |
| parent | 84da3e21dc008fe7ba18811e8b7f7614ede33079 (diff) | |
| parent | 4dd1fbc7b1df0030f813a05cee19cad2c7a9cbf9 (diff) | |
| download | git-5cfe4256d98af22a570c78c5e3048391a90f5f98.tar.gz | |
Merge branch 'jc/bigfile'
* jc/bigfile:
Bigfile: teach "git add" to send a large file straight to a pack
index_fd(): split into two helper functions
index_fd(): turn write_object and format_check arguments into one flag
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 28046a9984..e1aaf43b43 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -707,7 +707,7 @@ int notes_merge_commit(struct notes_merge_options *o, /* write file as blob, and add to partial_tree */ if (stat(ent->name, &st)) die_errno("Failed to stat '%s'", ent->name); - if (index_path(blob_sha1, ent->name, &st, 1)) + if (index_path(blob_sha1, ent->name, &st, HASH_WRITE_OBJECT)) die("Failed to write blob object from '%s'", ent->name); if (add_note(partial_tree, obj_sha1, blob_sha1, NULL)) die("Failed to add resolved note '%s' to notes tree", |