summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-17 18:37:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-09-17 18:37:13 (GMT)
commit5e3a3a1527b5ebf4c0c7e3a8394287a04220543f (patch)
treec7481477f3bcca1b4798389a27135bd5719fad8f
parentb3e7d24ca19d841eb2c5c7fce7919ebb5d370a6f (diff)
parentd5b99f35bd9102cf25ffb5d438898fa0c625defd (diff)
downloadgit-5e3a3a1527b5ebf4c0c7e3a8394287a04220543f.zip
git-5e3a3a1527b5ebf4c0c7e3a8394287a04220543f.tar.gz
git-5e3a3a1527b5ebf4c0c7e3a8394287a04220543f.tar.bz2
Merge branch 'maint'
* maint: t7406-submodule-update: add missing &&
-rwxr-xr-xt/t7406-submodule-update.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index b192f93..f0b3305 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -58,7 +58,7 @@ test_expect_success 'setup a submodule tree' '
git submodule add ../merging merging &&
test_tick &&
git commit -m "rebasing"
- )
+ ) &&
(cd super &&
git submodule add ../none none &&
test_tick &&