Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'js/t5404-path-fix'
author
Junio C Hamano
<gitster@pobox.com>
Wed, 25 Apr 2018 04:29:00 +0000
(13:29 +0900)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 25 Apr 2018 04:29:00 +0000
(13:29 +0900)
Test fix.
* js/t5404-path-fix:
t5404: relax overzealous test
t/t5404-tracking-branches.sh
patch
|
blob
|
history
raw
(from parent 1:
b3d6c48
)
diff --git
a/t/t5404-tracking-branches.sh
b/t/t5404-tracking-branches.sh
index 2b8c0bac7db47ef7b37024ecea95ed0e37d5364f..2762f420bc2c670b42eaefa0c1d33bc397fb4b2f 100755
(executable)
--- 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