diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:14:29 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:14:29 +0900 |
commit | a97222978ab3e0e86e87dccacf59269a9060de9e (patch) | |
tree | f1df1c3ca9d591a3a5dc063041bf537106ce068b /bisect.c | |
parent | Merge branch 'sr/wrapper-quote-filenames' (diff) | |
parent | refs: update some more docs to use "oid" rather than "sha1" (diff) | |
download | tgif-a97222978ab3e0e86e87dccacf59269a9060de9e.tar.xz |
Merge branch 'mh/tidy-ref-update-flags'
Code clean-up in refs API implementation.
* mh/tidy-ref-update-flags:
refs: update some more docs to use "oid" rather than "sha1"
write_packed_entry(): take `object_id` arguments
refs: rename constant `REF_ISPRUNING` to `REF_IS_PRUNING`
refs: rename constant `REF_NODEREF` to `REF_NO_DEREF`
refs: tidy up and adjust visibility of the `ref_update` flags
ref_transaction_add_update(): remove a check
ref_transaction_update(): die on disallowed flags
prune_ref(): call `ref_transaction_add_update()` directly
files_transaction_prepare(): don't leak flags to packed transaction
Diffstat (limited to 'bisect.c')
-rw-r--r-- | bisect.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1073,7 +1073,7 @@ int bisect_clean_state(void) struct string_list refs_for_removal = STRING_LIST_INIT_NODUP; for_each_ref_in("refs/bisect", mark_for_removal, (void *) &refs_for_removal); string_list_append(&refs_for_removal, xstrdup("BISECT_HEAD")); - result = delete_refs("bisect: remove", &refs_for_removal, REF_NODEREF); + result = delete_refs("bisect: remove", &refs_for_removal, REF_NO_DEREF); refs_for_removal.strdup_strings = 1; string_list_clear(&refs_for_removal, 0); unlink_or_warn(git_path_bisect_expected_rev()); |