aboutsummaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2017-06-27 19:03:39 +0200
committerJunio C Hamano <gitster@pobox.com>2017-06-27 14:41:10 -0700
commitd70e9c5c8c865626b6e69c2bf9fd0e368543617b (patch)
tree309b7e2255b5467662d3f3b43f74a369469a874d /advice.h
parent44e5471a8d8ec5f04058220f8b91513b5b5accaa (diff)
downloadgit-d70e9c5c8c865626b6e69c2bf9fd0e368543617b.tar.gz
git-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 'advice.h')
0 files changed, 0 insertions, 0 deletions