diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-04-16 13:54:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-16 13:54:19 -0700 |
| commit | 47478802daddf3f9916111307f153c6298ffc0bc (patch) | |
| tree | 4caf590d3e027eda9a8b9c01c91da9927a672b90 /builtin/fetch.c | |
| parent | Merge branch 'zy/send-email-error-handling' (diff) | |
| parent | update-ref: add --batch-updates flag for stdin mode (diff) | |
| download | git-47478802daddf3f9916111307f153c6298ffc0bc.tar.gz git-47478802daddf3f9916111307f153c6298ffc0bc.zip | |
Merge branch 'kn/non-transactional-batch-updates'
Updating multiple references have only been possible in all-or-none
fashion with transactions, but it can be more efficient to batch
multiple updates even when some of them are allowed to fail in a
best-effort manner. A new "best effort batches of updates" mode
has been introduced.
* kn/non-transactional-batch-updates:
update-ref: add --batch-updates flag for stdin mode
refs: support rejection in batch updates during F/D checks
refs: implement batch reference update support
refs: introduce enum-based transaction error types
refs/reftable: extract code from the transaction preparation
refs/files: remove duplicate duplicates check
refs: move duplicate refname update check to generic layer
refs/files: remove redundant check in split_symref_update()
Diffstat (limited to 'builtin/fetch.c')
| -rw-r--r-- | builtin/fetch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c index 5694a3a27f..45f143f2f1 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -687,7 +687,7 @@ static int s_update_ref(const char *action, switch (ref_transaction_commit(our_transaction, &err)) { case 0: break; - case TRANSACTION_NAME_CONFLICT: + case REF_TRANSACTION_ERROR_NAME_CONFLICT: ret = STORE_REF_ERROR_DF_CONFLICT; goto out; default: |