-
Notifications
You must be signed in to change notification settings - Fork 25.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'ba/clone-remote-submodules'
"git clone --recurse-submodules" learned to set up the submodules to ignore commit object names recorded in the superproject gitlink and instead use the commits that happen to be at the tip of the remote-tracking branches from the get-go, by passing the new "--remote-submodules" option. * ba/clone-remote-submodules: clone: add `--remote-submodules` flag
- Loading branch information
Showing
3 changed files
with
70 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
#!/bin/sh | ||
|
||
test_description='Test cloning repos with submodules using remote-tracking branches' | ||
|
||
. ./test-lib.sh | ||
|
||
pwd=$(pwd) | ||
|
||
test_expect_success 'setup' ' | ||
git checkout -b master && | ||
test_commit commit1 && | ||
mkdir sub && | ||
( | ||
cd sub && | ||
git init && | ||
test_commit subcommit1 && | ||
git tag sub_when_added_to_super | ||
) && | ||
git submodule add "file://$pwd/sub" sub && | ||
git commit -m "add submodule" && | ||
( | ||
cd sub && | ||
test_commit subcommit2 | ||
) | ||
' | ||
|
||
test_expect_success 'clone with --no-remote-submodules' ' | ||
test_when_finished "rm -rf super_clone" && | ||
git clone --recurse-submodules --no-remote-submodules "file://$pwd/." super_clone && | ||
( | ||
cd super_clone/sub && | ||
git diff --exit-code sub_when_added_to_super | ||
) | ||
' | ||
|
||
test_expect_success 'clone with --remote-submodules' ' | ||
test_when_finished "rm -rf super_clone" && | ||
git clone --recurse-submodules --remote-submodules "file://$pwd/." super_clone && | ||
( | ||
cd super_clone/sub && | ||
git diff --exit-code remotes/origin/master | ||
) | ||
' | ||
|
||
test_expect_success 'check the default is --no-remote-submodules' ' | ||
test_when_finished "rm -rf super_clone" && | ||
git clone --recurse-submodules "file://$pwd/." super_clone && | ||
( | ||
cd super_clone/sub && | ||
git diff --exit-code sub_when_added_to_super | ||
) | ||
' | ||
|
||
test_done |