summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-06-07 09:07:27 -0700
committerJunio C Hamano <gitster@pobox.com>2012-06-07 09:07:27 -0700
commit1b829eee17443b5bb932407a55c30426fee40dbd (patch)
tree76084f1d8e6b671c4508db811ede1550b78ba927
parent7c0382bbeef198db0e399dc81bb2123f40370336 (diff)
parent070bad6d0ca61b23611661eb4f05ddd548d42afd (diff)
downloadgit-1b829eee17443b5bb932407a55c30426fee40dbd.tar.gz
Merge branch 'rr/maint-t3510-cascade-fix'
* rr/maint-t3510-cascade-fix: t3510 (cherry-pick-sequence): add missing '&&'
-rwxr-xr-xt/t3510-cherry-pick-sequence.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
index 97f3710700..f4e6450d6a 100755
--- a/t/t3510-cherry-pick-sequence.sh
+++ b/t/t3510-cherry-pick-sequence.sh
@@ -31,7 +31,7 @@ test_cmp_rev () {
}
test_expect_success setup '
- git config advice.detachedhead false
+ git config advice.detachedhead false &&
echo unrelated >unrelated &&
git add unrelated &&
test_commit initial foo a &&