diff options
author | Tatyana Krasnukha <tatyana@synopsys.com> | 2018-02-15 01:29:34 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-02-15 20:09:02 +0100 |
commit | e454ad4becff73588b1b3cc24dba3a0e740c7f7c (patch) | |
tree | e15d28dc555858b6227d1b2ca96276ded66cd697 /apply.c | |
parent | apply: demonstrate a problem applying svn diffs (diff) | |
download | git-e454ad4becff73588b1b3cc24dba3a0e740c7f7c.tar.xz git-e454ad4becff73588b1b3cc24dba3a0e740c7f7c.zip |
apply: handle Subversion diffs with /dev/null gracefully
Subversion generates diffs that can contain lines like this one:
--- /dev/null (nonexistent)
Let's teach Git's apply machinery to handle such a line gracefully.
This fixes https://github.com/git-for-windows/git/isues/1489
Signed-off-by: Tatyana Krasnukha <tatyana@synopsys.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'apply.c')
-rw-r--r-- | apply.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -975,7 +975,7 @@ static int gitdiff_verify_name(struct apply_state *state, } free(another); } else { - if (!starts_with(line, "/dev/null\n")) + if (!is_dev_null(line)) return error(_("git apply: bad git-diff - expected /dev/null on line %d"), state->linenr); } |