clean: require -f to do damage by default

This makes the clean.requireForce configuration default to true.
Too many people are burned by typing "git clean" by mistake when
they meant to say "make clean".

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 7ee97df8a70cd6c6b127d7d32f5e325acc405c98..aeb7961adefeb098f4a468bb560dcc95be9abd0a 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -338,8 +338,8 @@ branch.<name>.merge::
        `.` (a period) for branch.<name>.remote.
 
 clean.requireForce::
        `.` (a period) for branch.<name>.remote.
 
 clean.requireForce::

-       A boolean to make git-clean do nothing unless given -f or -n.  Defaults
-       to false.
+       A boolean to make git-clean do nothing unless given -f
+       or -n.   Defaults to true.

 
 color.branch::
        A boolean to enable/disable color in the output of
 
 color.branch::
        A boolean to enable/disable color in the output of

diff --git a/git-clean.sh b/git-clean.sh
index 44917381863e27de6bedc91fa742eb0f8211a492..f4965b8391436384bf795c1e39b7f9158e624e51 100755 (executable)
--- a/git-clean.sh
+++ b/git-clean.sh
@@ -20,12 +20,16 @@ require_work_tree
 ignored=
 ignoredonly=
 cleandir=
 ignored=
 ignoredonly=
 cleandir=

-disabled="`git config --bool clean.requireForce`"

 rmf="rm -f --"
 rmrf="rm -rf --"
 rm_refuse="echo Not removing"
 echo1="echo"
 
 rmf="rm -f --"
 rmrf="rm -rf --"
 rm_refuse="echo Not removing"
 echo1="echo"
 

+# requireForce used to default to false but now it defaults to true.
+# IOW, lack of explicit "clean.requireForce = false" is taken as
+# "clean.requireForce = true".
+disabled=$(git config --bool clean.requireForce || echo true)
+

 while test $# != 0
 do
        case "$1" in
 while test $# != 0
 do
        case "$1" in

diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index ed2e9ee3c6fea4767f0aa288dca02825569abedf..55558aba8b862b93cb8ad97a681a4749bae3b3e1 100755 (executable)
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -77,7 +77,7 @@ test_expect_success "checkout with dirty tree without -m" '
 test_expect_success "checkout -m with dirty tree" '
 
        git checkout -f master &&
 test_expect_success "checkout -m with dirty tree" '
 
        git checkout -f master &&

-       git clean &&
+       git clean -f &&

 
        fill 0 1 2 3 4 5 6 7 8 >one &&
        git checkout -m side &&
 
        fill 0 1 2 3 4 5 6 7 8 >one &&
        git checkout -m side &&


@@ -99,7 +99,7 @@ test_expect_success "checkout -m with dirty tree" '
 
 test_expect_success "checkout -m with dirty tree, renamed" '
 
 
 test_expect_success "checkout -m with dirty tree, renamed" '
 

-       git checkout -f master && git clean &&
+       git checkout -f master && git clean -f &&

 
        fill 1 2 3 4 5 7 8 >one &&
        if git checkout renamer
 
        fill 1 2 3 4 5 7 8 >one &&
        if git checkout renamer


@@ -121,7 +121,7 @@ test_expect_success "checkout -m with dirty tree, renamed" '
 
 test_expect_success 'checkout -m with merge conflict' '
 
 
 test_expect_success 'checkout -m with merge conflict' '
 

-       git checkout -f master && git clean &&
+       git checkout -f master && git clean -f &&

 
        fill 1 T 3 4 5 6 S 8 >one &&
        if git checkout renamer
 
        fill 1 T 3 4 5 6 S 8 >one &&
        if git checkout renamer


@@ -144,7 +144,7 @@ test_expect_success 'checkout -m with merge conflict' '
 
 test_expect_success 'checkout to detach HEAD' '
 
 
 test_expect_success 'checkout to detach HEAD' '
 

-       git checkout -f renamer && git clean &&
+       git checkout -f renamer && git clean -f &&

        git checkout renamer^ &&
        H=$(git rev-parse --verify HEAD) &&
        M=$(git show-ref -s --verify refs/heads/master) &&
        git checkout renamer^ &&
        H=$(git rev-parse --verify HEAD) &&
        M=$(git show-ref -s --verify refs/heads/master) &&


@@ -160,7 +160,7 @@ test_expect_success 'checkout to detach HEAD' '
 
 test_expect_success 'checkout to detach HEAD with branchname^' '
 
 
 test_expect_success 'checkout to detach HEAD with branchname^' '
 

-       git checkout -f master && git clean &&
+       git checkout -f master && git clean -f &&

        git checkout renamer^ &&
        H=$(git rev-parse --verify HEAD) &&
        M=$(git show-ref -s --verify refs/heads/master) &&
        git checkout renamer^ &&
        H=$(git rev-parse --verify HEAD) &&
        M=$(git show-ref -s --verify refs/heads/master) &&


@@ -176,7 +176,7 @@ test_expect_success 'checkout to detach HEAD with branchname^' '
 
 test_expect_success 'checkout to detach HEAD with HEAD^0' '
 
 
 test_expect_success 'checkout to detach HEAD with HEAD^0' '
 

-       git checkout -f master && git clean &&
+       git checkout -f master && git clean -f &&

        git checkout HEAD^0 &&
        H=$(git rev-parse --verify HEAD) &&
        M=$(git show-ref -s --verify refs/heads/master) &&
        git checkout HEAD^0 &&
        H=$(git rev-parse --verify HEAD) &&
        M=$(git show-ref -s --verify refs/heads/master) &&

diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index eb0847afe9825f4af46065c2ee38282c44789bfb..8697213e6b63fcaaaf2d91b7a3dc1b4e34f825ee 100755 (executable)
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -7,6 +7,8 @@ test_description='git-clean basic tests'
 
 . ./test-lib.sh
 
 
 . ./test-lib.sh
 

+git config clean.requireForce no
+

 test_expect_success 'setup' '
 
        mkdir -p src &&
 test_expect_success 'setup' '
 
        mkdir -p src &&


@@ -139,6 +141,13 @@ test_expect_success 'git-clean -d -X' '
 
 '
 
 
 '
 

+test_expect_success 'clean.requireForce defaults to true' '
+
+       git config --unset clean.requireForce &&
+       ! git-clean
+
+'
+

 test_expect_success 'clean.requireForce' '
 
        git config clean.requireForce true &&
 test_expect_success 'clean.requireForce' '
 
        git config clean.requireForce true &&