Files
git/diff.c
Junio C Hamano 5a92787e35 Merge branch 'zj/diff-empty-chmod' into next
"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
* zj/diff-empty-chmod:
  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
2012-05-01 21:30:48 -07:00

130 KiB