diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2018-07-02 02:24:03 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-16 23:38:47 +0200 |
| commit | e974e06de01aede87161fb04cfeb119343bb7594 (patch) | |
| tree | 72c174931f3adfe4f3f104f06a117e2d2354ec07 /t/t7406-submodule-update.sh | |
| parent | t6000-t6999: fix broken &&-chains (diff) | |
| download | git-e974e06de01aede87161fb04cfeb119343bb7594.tar.xz git-e974e06de01aede87161fb04cfeb119343bb7594.zip | |
t7000-t7999: fix broken &&-chains
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7406-submodule-update.sh')
| -rwxr-xr-x | t/t7406-submodule-update.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index 9e0d31700e..f604ef7a72 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -865,9 +865,9 @@ test_expect_success 'submodule update places git-dir in superprojects git-dir re (cd submodule/subsubmodule && git log > ../../expected ) && - (cd .git/modules/submodule/modules/subsubmodule + (cd .git/modules/submodule/modules/subsubmodule && git log > ../../../../../actual - ) + ) && test_cmp actual expected ) ' @@ -886,7 +886,7 @@ test_expect_success 'submodule update properly revives a moved submodule' ' git commit -am "pre move" && H2=$(git rev-parse --short HEAD) && git status | sed "s/$H/XXX/" >expect && - H=$(cd submodule2; git rev-parse HEAD) && + H=$(cd submodule2 && git rev-parse HEAD) && git rm --cached submodule2 && rm -rf submodule2 && mkdir -p "moved/sub module" && |