| commit | 6a402843c2bc0a72fb70c8795aee523d7f1582d3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 7 Dec 2012 22:10:17 +0000 (7 14:10 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 7 Dec 2012 22:10:17 +0000 (7 14:10 -0800) | ||
| tree | 4ba680313d66959760850755c558823b5afd0f1f | treesnapshot (tar.gz zip) |
| parent | 7c65b2ebb72fcf9b563be3367a088256757343a6 | commitdiff |
| parent | de9095955c581a664d9ce568a1ae58a98484090e | commitdiff |
Merge branch 'lt/diff-stat-show-0-lines' into maint
"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:
t4049: refocus tests
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
Fix "git diff --stat" for interesting - but empty - file changes
"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:
t4049: refocus tests
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
Fix "git diff --stat" for interesting - but empty - file changes