summaryrefslogtreecommitdiff
path: root/contrib/subtree
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2018-07-30 19:07:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-07-30 20:58:14 (GMT)
commitad6eee36ba1b5fa8f5b837edf12f3a84313ee021 (patch)
treeb8fcc51aa03d5bec6433c9baabd9cc51410c4c6a /contrib/subtree
parent53f9a3e157dbbc901a02ac2c73346d375e24978c (diff)
downloadgit-ad6eee36ba1b5fa8f5b837edf12f3a84313ee021.zip
git-ad6eee36ba1b5fa8f5b837edf12f3a84313ee021.tar.gz
git-ad6eee36ba1b5fa8f5b837edf12f3a84313ee021.tar.bz2
subtree test: add missing && to &&-chain
Detected using t/chainlint. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/subtree')
-rwxr-xr-xcontrib/subtree/t/t7900-subtree.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
index d05c613..e6a28f2 100755
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b/contrib/subtree/t/t7900-subtree.sh
@@ -708,7 +708,7 @@ test_expect_success 'make sure each filename changed exactly once in the entire
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
- git config log.date relative
+ git config log.date relative &&
git fetch ./"sub proj" master &&
git subtree add --prefix="sub dir" FETCH_HEAD
) &&