diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-27 10:33:52 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-27 10:33:52 +0100 |
| commit | 4e4b55dd0f5b4644767265f7c16a8b370278ce56 (patch) | |
| tree | 67412de0f549d86f89bf2c05f4c39487a817fb44 /builtin-apply.c | |
| parent | Documentation: link in 1.5.0.2 material to the top documentation page. (diff) | |
| parent | git-apply: do not fix whitespaces on context lines. (diff) | |
| download | git-4e4b55dd0f5b4644767265f7c16a8b370278ce56.tar.xz git-4e4b55dd0f5b4644767265f7c16a8b370278ce56.zip | |
Merge branch 'maint'
* maint:
git-apply: do not fix whitespaces on context lines.
diff --cc: integer overflow given a 2GB-or-larger file
mailinfo: do not get confused with logical lines that are too long.
Diffstat (limited to 'builtin-apply.c')
| -rw-r--r-- | builtin-apply.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index 2dde34186a..b84d747e3f 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -1607,7 +1607,8 @@ static int apply_line(char *output, const char *patch, int plen) int need_fix_leading_space = 0; char *buf; - if ((new_whitespace != strip_whitespace) || !whitespace_error) { + if ((new_whitespace != strip_whitespace) || !whitespace_error || + *patch != '+') { memcpy(output, patch + 1, plen); return plen; } |