| commit | c330fdd42dc57127272534cd2a8dd9569334b219 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 29 Jan 2008 08:17:55 +0000 (29 00:17 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 5 Feb 2008 08:38:41 +0000 (5 00:38 -0800) | ||
| tree | 0077523338ba174c44548a20cf07d04b7c4836f6 | treesnapshot (tar.gz zip) |
| parent | ecf4c2ec6ba6dc39e72c6b37f2a238e28fec2dc1 | commitdiff |
builtin-apply.c: mark common context lines in lineinfo structure.
This updates the way preimage and postimage in a patch hunk is
parsed and prepared for applying. By looking at image->line[n].flag,
the code can tell if it is a common context line that is the
same between the preimage and the postimage.
This matters when we actually start applying a patch with
contexts that have whitespace breakages that have already been
fixed in the target file.
This updates the way preimage and postimage in a patch hunk is
parsed and prepared for applying. By looking at image->line[n].flag,
the code can tell if it is a common context line that is the
same between the preimage and the postimage.
This matters when we actually start applying a patch with
contexts that have whitespace breakages that have already been
fixed in the target file.
| builtin-apply.c | diffblobblamehistory |