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 /builtin/branch.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 'builtin/branch.c')
| -rw-r--r-- | builtin/branch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index b1ed649300..33fd5fcfd1 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -258,7 +258,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds, } if (delete_ref(NULL, name, is_null_oid(&oid) ? NULL : &oid, - REF_NODEREF)) { + REF_NO_DEREF)) { error(remote_branch ? _("Error deleting remote-tracking branch '%s'") : _("Error deleting branch '%s'"), |