| commit | de89eede776717b6fee3937e2de0c1163376262a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 28 Nov 2012 21:57:55 +0000 (28 13:57 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 28 Nov 2012 21:57:55 +0000 (28 13:57 -0800) | ||
| tree | bd51a23f58a4679df251d14291fcbf8e20ac4f77 | treesnapshot (tar.gz zip) |
| parent | 7114637205e7aa909b9fe0cd505db2ade31161db | commitdiff |
| parent | 20c8cde45656fc187e06088ef5baf0bbdfdf70bd | commitdiff |
Merge branch 'lt/diff-stat-show-0-lines' into next
"git diff --stat" miscounted the total number of changed lines when
binary files were involved and hidden beyond --stat-count. It also
miscounted the total number of changed files when there were
unmerged paths.
* lt/diff-stat-show-0-lines:
diff --shortstat: do not count "unmerged" entries
diff --stat: do not count "unmerged" entries
diff --stat: move the "total count" logic to the last loop
diff --stat: use "file" temporary variable to refer to data->files[i]
diff --stat: status of unmodified pair in diff-q is not zero
test: add failing tests for "diff --stat" to t4049
"git diff --stat" miscounted the total number of changed lines when
binary files were involved and hidden beyond --stat-count. It also
miscounted the total number of changed files when there were
unmerged paths.
* lt/diff-stat-show-0-lines:
diff --shortstat: do not count "unmerged" entries
diff --stat: do not count "unmerged" entries
diff --stat: move the "total count" logic to the last loop
diff --stat: use "file" temporary variable to refer to data->files[i]
diff --stat: status of unmodified pair in diff-q is not zero
test: add failing tests for "diff --stat" to t4049
| diff.c | diff1 | diff2 | blobhistory |