diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-05-23 11:04:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-23 11:04:27 -0700 |
| commit | 86a49253a62dcecd927af6008b3e8d0f4e506936 (patch) | |
| tree | 5e1e5366162fd807655ac048b17438e37d18c5b2 /refs/files-backend.c | |
| parent | 7593d669284b16db4dc43f9b9bd8cd96ec862377 (diff) | |
| parent | 9339fca23efbe1a2f9dc916356be9d0a22d233c2 (diff) | |
Merge branch 'it/refs-name-conflict'
Expose "name conflict" error when a ref creation fails due to D/F
conflict in the ref namespace, to improve an error message given by
"git fetch".
* it/refs-name-conflict:
refs: return conflict error when checking packed refs
Diffstat (limited to 'refs/files-backend.c')
| -rw-r--r-- | refs/files-backend.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/refs/files-backend.c b/refs/files-backend.c index 3957bfa579..3dce0c2a34 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -794,8 +794,10 @@ retry: */ if (refs_verify_refname_available( refs->packed_ref_store, refname, - extras, NULL, err)) + extras, NULL, err)) { + ret = TRANSACTION_NAME_CONFLICT; goto error_return; + } } ret = 0; |