Merge branch 'rv/maint-index-commit' into maint

diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index de70b38d1cc2f8a16bd1fd68fc24d0bef82def97..0ed4ae282728a1701a8d67ae16572db14f1dee69 100755 (executable)
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -13,10 +13,10 @@ test_expect_success 'setup' '
        touch src/part1.c Makefile &&
        echo build >.gitignore &&
        echo \*.o >>.gitignore &&
-       git-add . &&
+       git add . &&
        git-commit -m setup &&
        touch src/part2.c README &&
-       git-add .
+       git add .
 
 '
 
@@ -141,7 +141,7 @@ test_expect_success 'git-clean -d -X' '
 
 test_expect_success 'clean.requireForce' '
 
-       git-config clean.requireForce true &&
+       git config clean.requireForce true &&
        ! git-clean
 
 '
@@ -177,4 +177,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