diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-15 04:14:29 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-15 04:14:29 +0100 |
| commit | a97222978ab3e0e86e87dccacf59269a9060de9e (patch) | |
| tree | f1df1c3ca9d591a3a5dc063041bf537106ce068b /builtin/am.c | |
| parent | Merge branch 'sr/wrapper-quote-filenames' (diff) | |
| parent | refs: update some more docs to use "oid" rather than "sha1" (diff) | |
| download | git-a97222978ab3e0e86e87dccacf59269a9060de9e.tar.xz git-a97222978ab3e0e86e87dccacf59269a9060de9e.zip | |
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/am.c')
| -rw-r--r-- | builtin/am.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/am.c b/builtin/am.c index 92c4853505..02853b3e05 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -2148,7 +2148,7 @@ static void am_abort(struct am_state *state) has_curr_head ? &curr_head : NULL, 0, UPDATE_REFS_DIE_ON_ERR); else if (curr_branch) - delete_ref(NULL, curr_branch, NULL, REF_NODEREF); + delete_ref(NULL, curr_branch, NULL, REF_NO_DEREF); free(curr_branch); am_destroy(state); |