checkout: add --ignore-skip-worktree-bits in sparse checkout mode

[~andy/git] / git-submodule.sh

diff --git a/git-submodule.sh b/git-submodule.sh
index 275c664ff55f2d669ad302f0b11d8629b2d7d1ec..79bfaac9d4cb9a04e5e1fd7675d740cf9fc27e87 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -606,10 +606,12 @@ cmd_deinit()
 
                        if test -z "$force"
                        then
-                               git rm -n "$sm_path" ||
+                               git rm -qn "$sm_path" ||
                                die "$(eval_gettext "Submodule work tree '\$sm_path' contains local modifications; use '-f' to discard them")"
                        fi
-                       rm -rf "$sm_path" || say "$(eval_gettext "Could not remove submodule work tree '\$sm_path'")"
+                       rm -rf "$sm_path" &&
+                       say "$(eval_gettext "Cleared directory '\$sm_path'")" ||
+                       say "$(eval_gettext "Could not remove submodule work tree '\$sm_path'")"
                fi
 
                mkdir "$sm_path" || say "$(eval_gettext "Could not create empty submodule directory '\$sm_path'")"