]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7593d66 9339fca)
Merge branch 'it/refs-name-conflict'
authorJunio C Hamano <gitster@pobox.com>
Thu, 23 May 2024 18:04:27 +0000 (11:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 23 May 2024 18:04:27 +0000 (11:04 -0700)
commit86a49253a62dcecd927af6008b3e8d0f4e506936
tree5e1e5366162fd807655ac048b17438e37d18c5b2tree | snapshot
parent7593d669284b16db4dc43f9b9bd8cd96ec862377commit | diff
parent9339fca23efbe1a2f9dc916356be9d0a22d233c2commit | 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
refs/files-backend.c diff1 | diff2 | blob | history
t/t5510-fetch.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.