diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-03-29 22:22:03 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-03-29 22:22:03 +0300 |
| commit | 5fe35fcc790f6df1839ff984896f9d5e6710d012 (patch) | |
| tree | c974a750116a6a13c9b53d40d447d7ee146d0bef /t | |
| parent | d62966735d0f2c9a632d34023336bc0387a4bd5a (diff) | |
| parent | 2a69ff09d5654de31361365e3faf9f8495f03ed7 (diff) | |
Merge branch 'jt/reset-grafts-when-resetting-shallow'
When "shallow" information is updated, we forgot to update the
in-core equivalent, which has been corrected.
* jt/reset-grafts-when-resetting-shallow:
shallow: reset commit grafts when shallow is reset
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5537-fetch-shallow.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t5537-fetch-shallow.sh b/t/t5537-fetch-shallow.sh index 11d5ea54a9..92948de7a0 100755 --- a/t/t5537-fetch-shallow.sh +++ b/t/t5537-fetch-shallow.sh @@ -161,6 +161,15 @@ test_expect_success 'fetch --update-shallow' ' ) ' +test_expect_success 'fetch --update-shallow into a repo with submodules' ' + git init a-submodule && + test_commit -C a-submodule foo && + git init repo-with-sub && + git -C repo-with-sub submodule add ../a-submodule a-submodule && + git -C repo-with-sub commit -m "added submodule" && + git -C repo-with-sub fetch --update-shallow ../shallow/.git refs/heads/*:refs/remotes/shallow/* +' + test_expect_success 'fetch --update-shallow (with fetch.writeCommitGraph)' ' ( cd shallow && |