summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2011-02-19 03:04:56 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-02-22 10:57:58 -0800
commitded0abc73c67c6a9b9dbc2a22755fab01ae17e41 (patch)
tree3375822a2e7eb08bf851edd3a113f9df00b97be3 /git-mergetool--lib.sh
parentGit 1.7.0 (diff)
downloadtgif-ded0abc73c67c6a9b9dbc2a22755fab01ae17e41.tar.xz
diff: handle diffstat of rewritten binary files
The logic in builtin_diffstat assumes that a complete_rewrite pair should have its lines counted. This is nonsensical for binary files and leads to confusing things like: $ git diff --stat --summary HEAD^ HEAD foo.rand | Bin 4096 -> 4096 bytes 1 files changed, 0 insertions(+), 0 deletions(-) $ git diff --stat --summary -B HEAD^ HEAD foo.rand | 34 +++++++++++++++------------------- 1 files changed, 15 insertions(+), 19 deletions(-) rewrite foo.rand (100%) So let's reorder the function to handle binary files first (which from diffstat's perspective look like complete rewrites anyway), then rewrites, then actual diffstats. There are two bonus prizes to this reorder: 1. It gets rid of a now-superfluous goto. 2. The binary case is at the top, which means we can further optimize it in the next patch. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions