Signed-off-by: Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxx> --- Hi Junio, This test in the current pu branch (commit bb0e6bf "Merge branch 'aw/rebase-am-failure-detection' into pu", 11-10-2012) overwrites the contents of t/.gitattributes. Note that the merge of the two branches 'nd/wildmatch' and 'nd/attr-match-optim-more' both add new tests at the end, and *both* sets initially 'cd ..' ... ATB, Ramsay Jones t/t0003-attributes.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh index 7ed288f..fe80af7 100755 --- a/t/t0003-attributes.sh +++ b/t/t0003-attributes.sh @@ -247,7 +247,6 @@ test_expect_success 'patterns starting with exclamation' ' ' test_expect_success '"**" test' ' - cd .. && echo "**/f foo=bar" >.gitattributes && cat <<\EOF >expect && f: foo: bar -- 1.7.12 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html