diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-27 08:11:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-27 08:11:40 (GMT) |
| commit | 95d0367b2e397080d37c4b82dbd2ba10ffa262dc (patch) | |
| tree | 9c1f392b839c88b870683c96a09813f2da95ba89 /t | |
| parent | 6c18dd4dc370284417938a252ba7f1a36ad51053 (diff) | |
| parent | f2627d9b19f91455a3f8b3c150da601cb72e4085 (diff) | |
| download | git-95d0367b2e397080d37c4b82dbd2ba10ffa262dc.zip git-95d0367b2e397080d37c4b82dbd2ba10ffa262dc.tar.gz git-95d0367b2e397080d37c4b82dbd2ba10ffa262dc.tar.bz2 | |
Merge branch 'sb/submodule-config-cleanup'
Minor code clean-up.
* sb/submodule-config-cleanup:
submodule-config: clarify parsing of null_sha1 element
submodule-config: rename commit_sha1 to treeish_name
submodule config: inline config_from_{name, path}
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7411-submodule-config.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t7411-submodule-config.sh b/t/t7411-submodule-config.sh index 47562ce..d389ae5 100755 --- a/t/t7411-submodule-config.sh +++ b/t/t7411-submodule-config.sh @@ -93,6 +93,20 @@ test_expect_success 'error message contains blob reference' ' ) ' +test_expect_success 'using different treeishs works' ' + ( + cd super && + git tag new_tag && + tree=$(git rev-parse HEAD^{tree}) && + commit=$(git rev-parse HEAD^{commit}) && + test-submodule-config $commit b >expect && + test-submodule-config $tree b >actual.1 && + test-submodule-config new_tag b >actual.2 && + test_cmp expect actual.1 && + test_cmp expect actual.2 + ) +' + cat >super/expect_url <<EOF Submodule url: 'git@somewhere.else.net:a.git' for path 'b' Submodule url: 'git@somewhere.else.net:submodule.git' for path 'submodule' |