diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-08 01:47:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-09 11:58:19 -0700 |
| commit | c4ce46fc7ac1b59372aa935e641ca15b12359f5b (patch) | |
| tree | 000be1d69bef6c7129bdc97568d441e6b8e6615a /notes-merge.c | |
| parent | 9cedd16c62e12521f35b44e10bba80bfe261e69c (diff) | |
| download | git-c4ce46fc7ac1b59372aa935e641ca15b12359f5b.tar.gz git-c4ce46fc7ac1b59372aa935e641ca15b12359f5b.tar.xz | |
index_fd(): turn write_object and format_check arguments into one flag
The "format_check" parameter tucked after the existing parameters is too
ugly an afterthought to live in any reasonable API.
Combine it with the other boolean parameter "write_object" into a single
"flags" parameter.
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 28046a998..e1aaf43b4 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", |