diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-17 11:37:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-17 11:37:13 -0700 |
| commit | 5e3a3a1527b5ebf4c0c7e3a8394287a04220543f (patch) | |
| tree | c7481477f3bcca1b4798389a27135bd5719fad8f | |
| parent | b3e7d24ca19d841eb2c5c7fce7919ebb5d370a6f (diff) | |
| parent | d5b99f35bd9102cf25ffb5d438898fa0c625defd (diff) | |
| download | git-5e3a3a1527b5ebf4c0c7e3a8394287a04220543f.tar.gz git-5e3a3a1527b5ebf4c0c7e3a8394287a04220543f.tar.xz | |
Merge branch 'maint'
* maint:
t7406-submodule-update: add missing &&
| -rwxr-xr-x | t/t7406-submodule-update.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index b192f936b..f0b33053a 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 && |