diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-04-25 04:29:00 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-25 04:29:00 (GMT) |
| commit | 3d5a179ec01fa179a1f142c803a12d60062e9839 (patch) | |
| tree | 852fb2bc9ddb5e939d4bdd74b06bb38708c2c768 /t | |
| parent | b3d6c48c5fbec88e96799c5463f7fdddaa19e9d5 (diff) | |
| parent | 43b44ccfe767a20b6bca1ae11a051cdb154fb99c (diff) | |
| download | git-3d5a179ec01fa179a1f142c803a12d60062e9839.zip git-3d5a179ec01fa179a1f142c803a12d60062e9839.tar.gz git-3d5a179ec01fa179a1f142c803a12d60062e9839.tar.bz2 | |
Merge branch 'js/t5404-path-fix'
Test fix.
* js/t5404-path-fix:
t5404: relax overzealous test
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5404-tracking-branches.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5404-tracking-branches.sh b/t/t5404-tracking-branches.sh index 2b8c0ba..2762f42 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 |