diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-02-27 23:01:21 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-27 23:01:21 +0100 |
| commit | 1e745453fee88b3322b8be05548220c31cf654cd (patch) | |
| tree | 63d872c82f9cd17084f4dd59d784d50f7fda32a8 /t/t4035-diff-quiet.sh | |
| parent | Merge branch 'nd/submodule-pathspec-ending-with-slash' (diff) | |
| parent | diff: do not quit early on stat-dirty files (diff) | |
| download | git-1e745453fee88b3322b8be05548220c31cf654cd.tar.xz git-1e745453fee88b3322b8be05548220c31cf654cd.zip | |
Merge branch 'nd/diff-quiet-stat-dirty'
"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 '')
| -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 |