]> git.99rst.org Git - git.git/commitdiff
git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7593d66 9339fca)
Merge branch 'it/refs-name-conflict'
authorJunio C Hamano <redacted>
Thu, 23 May 2024 18:04:27 +0000 (11:04 -0700)
committerJunio C Hamano <redacted>
Thu, 23 May 2024 18:04:27 +0000 (11:04 -0700)
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

1  2 
refs/files-backend.c patch | diff1 | diff2 | blob | history
t/t5510-fetch.sh patch | diff1 | diff2 | blob | history

diff --cc refs/files-backend.c
Simple merge
diff --cc t/t5510-fetch.sh
Simple merge
git clone https://git.99rst.org/PROJECT