2 commits

Author	SHA1	Message	Date
Junio C Hamano	65aadb92a1	apply: force matching at the beginning. ... When there is no leading context, the patch must match at the beginning of preimage; otherwise there is a "patch adds these lines while the other lines were added to the original file" conflict. This is the opposite of match_end fix earlier in this series. Unlike matching at the end case, we can additionally check the preimage line number recorded in the patch, so the change is not symmetrical with the earlier one. Signed-off-by: Junio C Hamano <junkio@cox.net>	2006-05-24 13:23:31 -07:00
Catalin Marinas	cc189c2ca2	Add a test-case for git-apply trying to add an ending line ... git-apply adding an ending line doesn't seem to fail if the ending line is already present in the patched file. Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>	2006-05-24 00:19:20 -07:00