diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-04-15 06:15:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-15 06:15:09 (GMT) |
| commit | 189d6b8bfae62ab0c0bc62877ba97d6d88ae1595 (patch) | |
| tree | be8cbe8ec2a5db5306fa93d62ff2d05d642efcc8 /t | |
| parent | 8e4c6aa1ac6e63d2fcee1825e32afbf4cb97206f (diff) | |
| parent | 2b6f0b0a78a713be51149f27c2c1172fe4afc9cd (diff) | |
| download | git-189d6b8bfae62ab0c0bc62877ba97d6d88ae1595.zip git-189d6b8bfae62ab0c0bc62877ba97d6d88ae1595.tar.gz git-189d6b8bfae62ab0c0bc62877ba97d6d88ae1595.tar.bz2 | |
Merge branch 'maint'
* maint:
git clean: Add test to verify directories aren't removed with a prefix
git clean: Don't automatically remove directories when run within subdirectory
git-submodule - possibly use branch name to describe a module
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7300-clean.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh index afccfc9..a50492f 100755 --- a/t/t7300-clean.sh +++ b/t/t7300-clean.sh @@ -75,8 +75,8 @@ test_expect_success 'git-clean src/ src/' ' test_expect_success 'git-clean with prefix' ' - mkdir -p build docs && - touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && + mkdir -p build docs src/test && + touch a.out src/part3.c docs/manual.txt obj.o build/lib.so src/test/1.c && (cd src/ && git-clean) && test -f Makefile && test -f README && @@ -84,6 +84,7 @@ test_expect_success 'git-clean with prefix' ' test -f src/part2.c && test -f a.out && test ! -f src/part3.c && + test -f src/test/1.c && test -f docs/manual.txt && test -f obj.o && test -f build/lib.so |