diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-03-16 16:47:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-16 16:47:26 -0700 |
| commit | 4e530c5049a305f82c3e4768b26e6a689aa3c84e (patch) | |
| tree | 3705739dc7b4ba40e80d81715c65077d78ef75b3 /t | |
| parent | Merge branch 'mg/maint-difftool-vim-readonly' into maint (diff) | |
| parent | diff: don't retrieve binary blobs for diffstat (diff) | |
| download | tgif-4e530c5049a305f82c3e4768b26e6a689aa3c84e.tar.xz | |
Merge branch 'jk/diffstat-binary' into maint
* jk/diffstat-binary:
diff: don't retrieve binary blobs for diffstat
diff: handle diffstat of rewritten binary files
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4031-diff-rewrite-binary.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t4031-diff-rewrite-binary.sh b/t/t4031-diff-rewrite-binary.sh index 7e7b307a24..7d7470f21b 100755 --- a/t/t4031-diff-rewrite-binary.sh +++ b/t/t4031-diff-rewrite-binary.sh @@ -44,6 +44,13 @@ test_expect_success 'rewrite diff can show binary patch' ' grep "GIT binary patch" diff ' +test_expect_success 'rewrite diff --stat shows binary changes' ' + git diff -B --stat --summary >diff && + grep "Bin" diff && + grep "0 insertions.*0 deletions" diff && + grep " rewrite file" diff +' + { echo "#!$SHELL_PATH" cat <<'EOF' |