diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-04 15:02:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-04 15:02:27 -0800 |
| commit | 1538f21bfb33dcaa65fe84b9823a8963bf1e6443 (patch) | |
| tree | a2cb1d26d6519485d0b9d8877b244b1b1f72efcb /t | |
| parent | 24161eb036e140c964d278e24190ef2ad558caf0 (diff) | |
| parent | abb371a1ef5bddee904551afdec38854f95e99bb (diff) | |
| download | git-1538f21bfb33dcaa65fe84b9823a8963bf1e6443.tar.gz git-1538f21bfb33dcaa65fe84b9823a8963bf1e6443.tar.xz | |
Merge branch 'jk/diffstat-binary'
* 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 7e7b307a2..7d7470f21 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' |