diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-07-10 00:00:44 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-07-10 00:00:44 +0300 |
commit | 24ecfdf206ee0e9e01f86d333d90d281fdfd12d0 (patch) | |
tree | cebd8275c93f7a86afa85fb6ed69fe0691034f3f /t | |
parent | 46be023084bd6ce4958f16427da7cdaf91cff205 (diff) | |
parent | ce16364e897e70a17bd1864b6007719eeec959f3 (diff) |
Merge branch 'tb/fix-persistent-shallow' into master
When "fetch.writeCommitGraph" configuration is set in a shallow
repository and a fetch moves the shallow boundary, we wrote out
broken commit-graph files that do not match the reality, which has
been corrected.
* tb/fix-persistent-shallow:
commit.c: don't persist substituted parents when unshallowing
Diffstat (limited to 't')
-rwxr-xr-x | t/t5537-fetch-shallow.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t5537-fetch-shallow.sh b/t/t5537-fetch-shallow.sh index d427a2d7f7..a55202d2d3 100755 --- a/t/t5537-fetch-shallow.sh +++ b/t/t5537-fetch-shallow.sh @@ -81,6 +81,20 @@ test_expect_success 'fetch --unshallow from shallow clone' ' ) ' +test_expect_success 'fetch --unshallow from a full clone' ' + git clone --no-local --depth=2 .git shallow3 && + ( + cd shallow3 && + git log --format=%s >actual && + test_write_lines 4 3 >expect && + test_cmp expect actual && + git -c fetch.writeCommitGraph fetch --unshallow && + git log origin/master --format=%s >actual && + test_write_lines 4 3 2 1 >expect && + test_cmp expect actual + ) +' + test_expect_success 'fetch something upstream has but hidden by clients shallow boundaries' ' # the blob "1" is available in .git but hidden by the # shallow2/.git/shallow and it should be resent |