summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-12-18 19:13:30 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-12-19 07:45:13 -0800
commit27f6342f615a4e3fc4dcab5cef2b6bc9ca574ce6 (patch)
tree12cec65e880d48badb68eaad35fe8d6c51eccbb4 /ll-merge.c
parentt9502: do not assume GNU tar (diff)
downloadtgif-27f6342f615a4e3fc4dcab5cef2b6bc9ca574ce6.tar.xz
t4014: fix arguments to grep
These "expect-failure" tests were not looking for the right string in the patch file. For example: grep "^ *"S. E. Cipient" <scipient@example.com>\$" patch5 was looking for "^ *S." in these three files: "E." "Cipient <scipient@example.com>$" "patch5" With some implementations of grep, the lack of file "E." was reported as an error, leading to the failure of the test. With other implementations of grep, the pattern "^ *S." matched what was in patch5, without diagnosing the missing files as an error, and made these tests unexpectedly pass. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions