diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-19 00:59:55 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-19 00:59:56 +0400 |
| commit | 34120a5fb555a24904a85e64554bdcc7bcc17963 (patch) | |
| tree | 9a20fc3e1c20238f18173c0bf53f927bf1de3615 /t | |
| parent | 1030d4c8f0ee5aaee9a1a74416314ec811672a86 (diff) | |
| parent | f34b205f6cc2c78cbed03a1582422cb59e36f729 (diff) | |
Merge branch 'nd/diff-quiet-stat-dirty' into maint
"git diff --quiet -- pathspec1 pathspec2" sometimes did not return
correct status value.
* nd/diff-quiet-stat-dirty:
diff: do not quit early on stat-dirty files
diff.c: move diffcore_skip_stat_unmatch core logic out for reuse later
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4035-diff-quiet.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t4035-diff-quiet.sh b/t/t4035-diff-quiet.sh index 231412d100..e8ae2a03fd 100755 --- a/t/t4035-diff-quiet.sh +++ b/t/t4035-diff-quiet.sh @@ -148,4 +148,10 @@ test_expect_success 'git diff --ignore-all-space, both files outside repo' ' ) ' +test_expect_success 'git diff --quiet ignores stat-change only entries' ' + test-chmtime +10 a && + echo modified >>b && + test_expect_code 1 git diff --quiet +' + test_done |