diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-02-18 22:53:27 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-18 22:53:27 +0100 |
| commit | 991b4d47f0accd3955d05927d5ce434e03ffbdb6 (patch) | |
| tree | b60f5608c4a0f3a04014e57a9fbd024dadf35ef3 /sequencer.c | |
| parent | Merge branch 'pw/use-in-process-checkout-in-rebase' (diff) | |
| parent | refs: skip hooks when deleting uncovered packed refs (diff) | |
| download | git-991b4d47f0accd3955d05927d5ce434e03ffbdb6.tar.xz git-991b4d47f0accd3955d05927d5ce434e03ffbdb6.zip | |
Merge branch 'ps/avoid-unnecessary-hook-invocation-with-packed-refs'
Because a deletion of ref would need to remove it from both the
loose ref store and the packed ref store, a delete-ref operation
that logically removes one ref may end up invoking ref-transaction
hook twice, which has been corrected.
* ps/avoid-unnecessary-hook-invocation-with-packed-refs:
refs: skip hooks when deleting uncovered packed refs
refs: do not execute reference-transaction hook on packing refs
refs: demonstrate excessive execution of the reference-transaction hook
refs: allow skipping the reference-transaction hook
refs: allow passing flags when beginning transactions
refs: extract packed_refs_delete_refs() to allow control of transaction
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index d3d73d86ad..9b697158c5 100644 --- a/sequencer.c +++ b/sequencer.c @@ -3584,7 +3584,7 @@ static int do_label(struct repository *r, const char *name, int len) strbuf_addf(&ref_name, "refs/rewritten/%.*s", len, name); strbuf_addf(&msg, "rebase (label) '%.*s'", len, name); - transaction = ref_store_transaction_begin(refs, &err); + transaction = ref_store_transaction_begin(refs, 0, &err); if (!transaction) { error("%s", err.buf); ret = -1; |