diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-06-15 22:00:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-15 22:00:53 (GMT) |
| commit | 0b6e913c8be236ba801b49d21490409f13af7cd9 (patch) | |
| tree | afae79287a2430befe80ce32d44768afa94bd76c /t/t4012-diff-binary.sh | |
| parent | 1fd8f97f6e2c5f928e7399adb59b6d87ac82eb08 (diff) | |
| parent | de9658b511377e9eaa2c58a8c3885a1a01b94be8 (diff) | |
| download | git-0b6e913c8be236ba801b49d21490409f13af7cd9.zip git-0b6e913c8be236ba801b49d21490409f13af7cd9.tar.gz git-0b6e913c8be236ba801b49d21490409f13af7cd9.tar.bz2 | |
Merge branch 'as/diff-shortstat-ignore-binary'
# By Alexander Strasser
* as/diff-shortstat-ignore-binary:
diff: Only count lines in show_shortstats
Diffstat (limited to 't/t4012-diff-binary.sh')
| -rwxr-xr-x | t/t4012-diff-binary.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh index 8b4e80d..6cebb39 100755 --- a/t/t4012-diff-binary.sh +++ b/t/t4012-diff-binary.sh @@ -36,6 +36,18 @@ test_expect_success '"apply --stat" output for binary file change' ' test_i18ncmp expected current ' +test_expect_success 'diff --shortstat output for binary file change' ' + echo " 4 files changed, 2 insertions(+), 2 deletions(-)" >expected && + git diff --shortstat >current && + test_i18ncmp expected current +' + +test_expect_success 'diff --shortstat output for binary file change only' ' + echo " 1 file changed, 0 insertions(+), 0 deletions(-)" >expected && + git diff --shortstat -- b >current && + test_i18ncmp expected current +' + test_expect_success 'apply --numstat notices binary file change' ' git diff >diff && git apply --numstat <diff >current && |