| commit | fc1320bfe2419e5eb3f43761e27ffa4f42a81825 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 7 May 2012 20:29:08 +0000 (7 13:29 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 7 May 2012 20:29:08 +0000 (7 13:29 -0700) | ||
| tree | d164b4cfbf359242729fc180abba294c1eb169c1 | treesnapshot (tar.gz zip) |
| parent | 43d1e41ea91ba95b902f549274916660bf520b98 | commitdiff |
| parent | 9380aed286df31dcb31fd6ae467b69471c8cf148 | commitdiff |
Merge branch 'zj/diff-empty-chmod'
"git diff --stat" used to fully count a binary file with modified
execution bits whose contents is unmodified, which was not right.
By Zbigniew Jędrzejewski-Szmek (4) and Johannes Sixt (1)
* zj/diff-empty-chmod:
t4006: Windows do not have /dev/zero
diff --stat: do not run diff on indentical files
diff --stat: report mode-only changes for binary files like text files
tests: check --[short]stat output after chmod
test: modernize style of t4006
Conflicts:
diff.c
"git diff --stat" used to fully count a binary file with modified
execution bits whose contents is unmodified, which was not right.
By Zbigniew Jędrzejewski-Szmek (4) and Johannes Sixt (1)
* zj/diff-empty-chmod:
t4006: Windows do not have /dev/zero
diff --stat: do not run diff on indentical files
diff --stat: report mode-only changes for binary files like text files
tests: check --[short]stat output after chmod
test: modernize style of t4006
Conflicts:
diff.c
| diff.c | diff1 | diff2 | blobhistory |