diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-03-18 11:06:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-18 11:06:15 -0700 |
| commit | 5cee349370bd2dce48d0d653ab4ce99bb79a3415 (patch) | |
| tree | 382693a846a87b9f1af799a1fdf35b51142757b0 /t/t3001-ls-files-others-exclude.sh | |
| parent | 8ad3cb08690bdf9a340e47ed4fdb67cbacd1edf2 (diff) | |
| download | git-5cee349370bd2dce48d0d653ab4ce99bb79a3415.tar.gz | |
Revert "Merge branch 'nd/exclusion-regression-fix'"
This reverts commit 5e57f9c3dfe7dd44a1b56bb5b3327d7a1356ec7c, reversing
changes made to e79112d21024beb997951381db21a70b087d459d.
We will be postponing nd/exclusion-regression-fix topic to later
cycle.
Diffstat (limited to 't/t3001-ls-files-others-exclude.sh')
| -rwxr-xr-x | t/t3001-ls-files-others-exclude.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/t/t3001-ls-files-others-exclude.sh b/t/t3001-ls-files-others-exclude.sh index d043078da5..3fc484e8c3 100755 --- a/t/t3001-ls-files-others-exclude.sh +++ b/t/t3001-ls-files-others-exclude.sh @@ -175,10 +175,13 @@ test_expect_success 'negated exclude matches can override previous ones' ' grep "^a.1" output ' -test_expect_success 'excluded directory does not override content patterns' ' +test_expect_success 'excluded directory overrides content patterns' ' git ls-files --others --exclude="one" --exclude="!one/a.1" >output && - grep "^one/a.1" output + if grep "^one/a.1" output + then + false + fi ' test_expect_success 'negated directory doesn'\''t affect content patterns' ' |