diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-02 23:34:44 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-02 23:34:44 (GMT) |
| commit | be38bee862d628e29043b3f680580ceb24a6ba1e (patch) | |
| tree | d848f433968754e5e9d1e6231614ab8db7cf31dc /t | |
| parent | d2446dfd7f3b3f8948142cfb07a0270e2497d93f (diff) | |
| parent | 2f93541d88fadd1ff5307d81c2c8921ee3eea058 (diff) | |
| download | git-be38bee862d628e29043b3f680580ceb24a6ba1e.zip git-be38bee862d628e29043b3f680580ceb24a6ba1e.tar.gz git-be38bee862d628e29043b3f680580ceb24a6ba1e.tar.bz2 | |
Sync with 1.8.4.5
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7406-submodule-update.sh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index f0b3305..0825a92 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -323,6 +323,21 @@ test_expect_success 'submodule update - command in .git/config catches failure' ) ' +test_expect_success 'submodule init does not copy command into .git/config' ' + (cd super && + H=$(git ls-files -s submodule | cut -d" " -f2) && + mkdir submodule1 && + git update-index --add --cacheinfo 160000 $H submodule1 && + git config -f .gitmodules submodule.submodule1.path submodule1 && + git config -f .gitmodules submodule.submodule1.url ../submodule && + git config -f .gitmodules submodule.submodule1.update !false && + git submodule init submodule1 && + echo "none" >expect && + git config submodule.submodule1.update >actual && + test_cmp expect actual + ) +' + test_expect_success 'submodule init picks up rebase' ' (cd super && git config -f .gitmodules submodule.rebasing.update rebase && |