kernel/git - git - PowerEL Git System

5105 Commits

6 Branches

36 Tags

131 MiB

Tree: c5c23745d8

Commit Graph

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>	19 years ago
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>	19 years ago

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>

19 years ago

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>

19 years ago

2 Commits (c5c23745d8d6eb0504a16851b9b080ec3ded94f9)