]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'sp/shallow-deepen-relative-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 4 Mar 2026 18:52:59 +0000 (10:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 Mar 2026 18:52:59 +0000 (10:52 -0800)
"git fetch --deepen" that tries to go beyond merged branch used to
get confused where the updated shallow points are, which has been
corrected.

* sp/shallow-deepen-relative-fix:
  shallow: handling fetch relative-deepen
  shallow: free local object_array allocations

1  2 
shallow.c
shallow.h
t/t5500-fetch-pack.sh

diff --cc shallow.c
Simple merge
diff --cc shallow.h
Simple merge
Simple merge