summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-04-25 13:29:00 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-04-25 13:29:00 +0900
commit3d5a179ec01fa179a1f142c803a12d60062e9839 (patch)
tree852fb2bc9ddb5e939d4bdd74b06bb38708c2c768 /t
parentMerge branch 'jk/ref-array-push' (diff)
parentt5404: relax overzealous test (diff)
downloadtgif-3d5a179ec01fa179a1f142c803a12d60062e9839.tar.xz
Merge branch 'js/t5404-path-fix'
Test fix. * js/t5404-path-fix: t5404: relax overzealous test
Diffstat (limited to 't')
-rwxr-xr-xt/t5404-tracking-branches.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5404-tracking-branches.sh b/t/t5404-tracking-branches.sh
index 2b8c0bac7d..2762f420bc 100755
--- a/t/t5404-tracking-branches.sh
+++ b/t/t5404-tracking-branches.sh
@@ -56,7 +56,7 @@ test_expect_success 'deleted branches have their tracking branches removed' '
test_expect_success 'already deleted tracking branches ignored' '
git branch -d -r origin/b3 &&
git push origin :b3 >output 2>&1 &&
- ! grep error output
+ ! grep "^error: " output
'
test_done