diff options
| author |  René Scharfe <l.s.r@web.de> | 2017-06-27 19:03:39 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-06-27 14:41:10 -0700 |
| commit | d70e9c5c8c865626b6e69c2bf9fd0e368543617b (patch) | |
| tree | 309b7e2255b5467662d3f3b43f74a369469a874d /builtin/merge.c | |
| parent | apply: check git diffs for invalid file modes (diff) | |
| download | tgif-d70e9c5c8c865626b6e69c2bf9fd0e368543617b.tar.xz | |
apply: check git diffs for mutually exclusive header lines
A file can either be added, removed, copied, or renamed, but no two of
these actions can be done by the same patch. Some of these combinations
provoke error messages due to missing file names, and some are only
caught by an assertion. Check git patches already as they are parsed
and report conflicting lines on sight.
Found by Vegard Nossum using AFL.
Reported-by: Vegard Nossum <vegard.nossum@oracle.com>
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions