git-clean: Fix error message if clean.requireForce is not set.
It was distracting to see this error message: clean.requireForce set and -n or -f not given; refusing to clean even though clean.requireForce was not set at all. This patch distinguishes the cases and gives a different message depending on whether the configuration variable is not set or set to true. While we are here, we also divert the error messages to stderr. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Sixt committed
Nov 12, 2007 at 09:27 UTC
f192c5d0fb37a1a89d88e92bb7b21418b57c2129
1 file changed
+14
-10
git-clean.sh
+14
-10
@@ -25,10 +25,7 @@ rmrf="rm -rf --"
25
rm_refuse="echo Not removing"
26
echo1="echo"
27
28
-# requireForce used to default to false but now it defaults to true.
29
-# IOW, lack of explicit "clean.requireForce = false" is taken as
30
-# "clean.requireForce = true".
31
-disabled=$(git config --bool clean.requireForce || echo true)
28
+disabled=$(git config --bool clean.requireForce)
29
30
while test $# != 0
31
do
@@ -37,10 +34,10 @@ do
34
cleandir=1
35
;;
36
-f)
40
- disabled=
37
+ disabled=false
38
;;
39
-n)
43
- disabled=
40
+ disabled=false
41
rmf="echo Would remove"
42
rmrf="echo Would remove"
43
rm_refuse="echo Would not remove"
@@ -68,10 +65,17 @@ do
65
shift
66
done
67
71
-if [ "$disabled" = true ]; then
72
- echo "clean.requireForce set and -n or -f not given; refusing to clean"
73
- exit 1
74
-fi
68
+# requireForce used to default to false but now it defaults to true.
69
+# IOW, lack of explicit "clean.requireForce = false" is taken as
70
+# "clean.requireForce = true".
71
+case "$disabled" in
72
+"")
73
+ die "clean.requireForce not set and -n or -f not given; refusing to clean"
74
+ ;;
75
+"true")
76
+ die "clean.requireForce set and -n or -f not given; refusing to clean"
77
+ ;;
78
+esac
79
80
case "$ignored,$ignoredonly" in
81
1,1) usage;;