diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-14 03:37:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-14 03:37:18 -0800 |
| commit | fb5fd011482b5aa0b340a4a5bd9192c0efc1edb7 (patch) | |
| tree | 1701d97cd2ae3aa4ce52127cf8343b8b1efc9383 /t/t7300-clean.sh | |
| parent | 481424e1f100de690849a9f0348fc78f45ab815e (diff) | |
| parent | b57321f57b324320bdcf9f453ec4788da166f8f4 (diff) | |
| download | git-fb5fd011482b5aa0b340a4a5bd9192c0efc1edb7.tar.gz git-fb5fd011482b5aa0b340a4a5bd9192c0efc1edb7.tar.xz | |
Merge branch 'maint'
* maint:
git-clean: honor core.excludesfile
Documentation: Fix man page breakage with DocBook XSL v1.72
git-remote.txt: fix typo
core-tutorial.txt: Fix argument mistake in an example.
replace reference to git-rm with git-reset in git-commit doc
Grammar fixes for gitattributes documentation
Don't allow fast-import tree delta chains to exceed maximum depth
revert/cherry-pick: allow starting from dirty work tree.
t/t3404: fix test for a bogus todo file.
Conflicts:
fast-import.c
Diffstat (limited to 't/t7300-clean.sh')
| -rwxr-xr-x | t/t7300-clean.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh index 25d3102de..f013c176e 100755 --- a/t/t7300-clean.sh +++ b/t/t7300-clean.sh @@ -291,4 +291,15 @@ test_expect_success 'clean.requireForce and -f' ' ' +test_expect_success 'core.excludesfile' ' + + echo excludes >excludes && + echo included >included && + git config core.excludesfile excludes && + output=$(git clean -n excludes included 2>&1) && + expr "$output" : ".*included" >/dev/null && + ! expr "$output" : ".*excludes" >/dev/null + +' + test_done |