git-merge: minor fix for no_trivial_merge_strategies.

diff --git a/git-clean.sh b/git-clean.sh
index bb56264e046c906c529c712b36db239dd7ba99e9..db177a7886b6407b4c4ad7b778a1ae99471355ac 100755 (executable)
--- a/git-clean.sh
+++ b/git-clean.sh
@@ -14,13 +14,13 @@ When optional <paths>... arguments are given, the paths
 affected are further limited to those that match them.'
 SUBDIRECTORY_OK=Yes
 . git-sh-setup
+require_work_tree
 
 ignored=
 ignoredonly=
 cleandir=
-quiet=
-rmf="rm -f"
-rmrf="rm -rf"
+rmf="rm -f --"
+rmrf="rm -rf --"
 rm_refuse="echo Not removing"
 echo1="echo"
 
@@ -31,14 +31,13 @@ do
                cleandir=1
                ;;
        -n)
-               quiet=1
                rmf="echo Would remove"
                rmrf="echo Would remove"
                rm_refuse="echo Would not remove"
                echo1=":"
                ;;
        -q)
-               quiet=1
+               echo1=":"
                ;;
        -x)
                ignored=1