aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-08-21 23:16:32 -0700
committerJunio C Hamano <gitster@pobox.com>2010-08-21 23:16:32 -0700
commitc307fbfdc403a59dc33209677a02bb5e88487185 (patch)
treee2afe62da00ad772b134bb62f99fc3ac937dc3cf /t
parentf9c33605700e37b75279ed6ce4bffaad3eb0cf10 (diff)
parent0eb032d86c99ac8f23435ad5ea9f2b83f1be744f (diff)
downloadgit-c307fbfdc403a59dc33209677a02bb5e88487185.tar.gz
git-c307fbfdc403a59dc33209677a02bb5e88487185.tar.xz
Merge branch 'maint'
* maint: t7403: add missing &&'s Tell ignore file about generate files in /gitweb/static
Diffstat (limited to 't')
-rwxr-xr-xt/t7403-submodule-sync.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7403-submodule-sync.sh b/t/t7403-submodule-sync.sh
index 753875648..bade2179b 100755
--- a/t/t7403-submodule-sync.sh
+++ b/t/t7403-submodule-sync.sh
@@ -14,7 +14,7 @@ test_expect_success setup '
echo file > file &&
git add file &&
test_tick &&
- git commit -m upstream
+ git commit -m upstream &&
git clone . super &&
git clone super submodule &&
(cd super &&
@@ -42,7 +42,7 @@ test_expect_success 'change submodule url' '
) &&
mv submodule moved-submodule &&
(cd super &&
- git config -f .gitmodules submodule.submodule.url ../moved-submodule
+ git config -f .gitmodules submodule.submodule.url ../moved-submodule &&
test_tick &&
git commit -a -m moved-submodule
)