summaryrefslogtreecommitdiff
path: root/t/t7506-status-submodule.sh
diff options
context:
space:
mode:
authorEric Sunshine <sunshine@sunshineco.com>2018-07-02 00:24:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-07-16 21:38:47 (GMT)
commite974e06de01aede87161fb04cfeb119343bb7594 (patch)
tree72c174931f3adfe4f3f104f06a117e2d2354ec07 /t/t7506-status-submodule.sh
parentc8ce3763ffbc1841f2b4fedebd82280ed0c3a7b7 (diff)
downloadgit-e974e06de01aede87161fb04cfeb119343bb7594.zip
git-e974e06de01aede87161fb04cfeb119343bb7594.tar.gz
git-e974e06de01aede87161fb04cfeb119343bb7594.tar.bz2
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/t7506-status-submodule.sh')
-rwxr-xr-xt/t7506-status-submodule.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh
index b4b74db..943708f 100755
--- a/t/t7506-status-submodule.sh
+++ b/t/t7506-status-submodule.sh
@@ -193,9 +193,9 @@ test_expect_success 'status with added and untracked file in modified submodule
test_expect_success 'setup .git file for sub' '
(cd sub &&
- rm -f new-file
+ rm -f new-file &&
REAL="$(pwd)/../.real" &&
- mv .git "$REAL"
+ mv .git "$REAL" &&
echo "gitdir: $REAL" >.git) &&
echo .real >>.gitignore &&
git commit -m "added .real to .gitignore" .gitignore
@@ -209,12 +209,12 @@ test_expect_success 'status with added file in modified submodule with .git file
test_expect_success 'status with a lot of untracked files in the submodule' '
(
- cd sub
+ cd sub &&
i=0 &&
while test $i -lt 1024
do
- >some-file-$i
- i=$(( $i + 1 ))
+ >some-file-$i &&
+ i=$(( $i + 1 )) || exit 1
done
) &&
git status --porcelain sub 2>err.actual &&