summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorLibravatar Brandon Casey <drafnel@gmail.com>2011-12-03 14:35:50 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-05 11:20:50 -0800
commitcc64b318f26c9e176c4f07b1a459a86e7a04c4eb (patch)
tree7199e2205d9d1ec141595731eec3a9c2388b3df1 /git-mergetool--lib.sh
parentt/t4131-apply-fake-ancestor.sh: fix broken test (diff)
downloadtgif-cc64b318f26c9e176c4f07b1a459a86e7a04c4eb.tar.xz
builtin/apply.c: report error on failure to recognize input
When git apply is passed something that is not a patch, it does not produce an error message or exit with a non-zero status if it was not actually "applying" the patch i.e. --check or --numstat etc were supplied on the command line. Fix this by producing an error when apply fails to find any hunks whatsoever while parsing the patch. This will cause some of the output formats (--numstat, --diffstat, etc) to produce an error when they formerly would have reported zero changes and exited successfully. That seems like the correct behavior though. Failure to recognize the input as a patch should be an error. Plus, add a test. Reported-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions