diff options
| author | Patrick Steinhardt <ps@pks.im> | 2025-04-15 11:38:19 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-15 08:24:36 -0700 |
| commit | 70c0f9db4e00586e4df5cca24fe7ce05848ee59c (patch) | |
| tree | 54480f65c224dbe45dd0d35bbecbbfd07eac6044 /notes-merge.c | |
| parent | d9f517d051d1008178cb6c809b5f906d0905508f (diff) | |
object-file: split up concerns of `HASH_*` flags
The functions `hash_object_file()`, `write_object_file()` and
`index_fd()` reuse the same set of flags to alter their behaviour. This
not only adds confusion, but given that every function only supports a
subset of the flags it becomes very hard to see which flags can be
passed to what function. Last but not least, this entangles the
implementation of all three function families.
Split up concerns by creating separate flags for each of the function
families.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
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 fce4504365..520b92942c 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -729,7 +729,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(o->repo->index, &blob_oid, path.buf, &st, HASH_WRITE_OBJECT)) + if (index_path(o->repo->index, &blob_oid, path.buf, &st, INDEX_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", |