From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Apr 2018 04:29:00 +0000 (+0900)
Subject: Merge branch 'js/t5404-path-fix'
X-Git-Tag: v2.18.0-rc0~117
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3d5a179ec01fa179a1f142c803a12d60062e9839?hp=b3d6c48c5fbec88e96799c5463f7fdddaa19e9d5

Merge branch 'js/t5404-path-fix'

Test fix.

* js/t5404-path-fix:
t5404: relax overzealous test
---

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