summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2016-12-02 20:05:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-12-05 20:19:30 (GMT)
commit8954bd76ebb7eb2bb252ea36b1a91f7b67603fe6 (patch)
tree7c2c50e33dc9f151c569841269ef0f0b09e68ade
parentbbad9f9314f658b5c0f302148fc9780f5788dcd8 (diff)
downloadgit-8954bd76ebb7eb2bb252ea36b1a91f7b67603fe6.zip
git-8954bd76ebb7eb2bb252ea36b1a91f7b67603fe6.tar.gz
git-8954bd76ebb7eb2bb252ea36b1a91f7b67603fe6.tar.bz2
t3600: remove useless redirect
In the next line the `actual` is overwritten again, so no need to redirect the output of checkout into that file. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t3600-rm.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index 3d30581..95cf63f 100755
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -709,7 +709,7 @@ test_expect_success 'checking out a commit after submodule removal needs manual
git commit -m "submodule removal" submod &&
git checkout HEAD^ &&
git submodule update &&
- git checkout -q HEAD^ 2>actual &&
+ git checkout -q HEAD^ &&
git checkout -q master 2>actual &&
echo "warning: unable to rmdir submod: Directory not empty" >expected &&
test_i18ncmp expected actual &&