summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Wyckoff <pw@padd.com>2011-07-31 13:45:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-01 17:23:54 (GMT)
commit83cf0fe49fc6a7124377ef6dec75a9776c753346 (patch)
tree5a74f6a46697817f8fc4a8f5ba753d3b117b4a53
parentf40ae5cee61f35bdc46b17ccc11fbc6eb7977c89 (diff)
downloadgit-83cf0fe49fc6a7124377ef6dec75a9776c753346.zip
git-83cf0fe49fc6a7124377ef6dec75a9776c753346.tar.gz
git-83cf0fe49fc6a7124377ef6dec75a9776c753346.tar.bz2
git-p4: add missing && in test
Signed-off-by: Pete Wyckoff <pw@padd.com> Acked-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t9800-git-p4.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9800-git-p4.sh b/t/t9800-git-p4.sh
index aec3ba1..b7eda82 100755
--- a/t/t9800-git-p4.sh
+++ b/t/t9800-git-p4.sh
@@ -202,7 +202,7 @@ test_expect_success 'preserve user where author is unknown to p4' '
"$GITP4" clone --dest="$git" //depot &&
test_when_finished cleanup_git &&
cd "$git" &&
- git config git-p4.skipSubmitEditCheck true
+ git config git-p4.skipSubmitEditCheck true &&
echo "username-bob: a change by bob" >> file1 &&
git commit --author "Bob <bob@localhost>" -m "preserve: a change by bob" file1 &&
echo "username-unknown: a change by charlie" >> file1 &&