summaryrefslogtreecommitdiff
path: root/git-submodule.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-05 14:15:13 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-05 14:15:13 -0700
commit7b72ec5e14656af2d48c7a2a0b7251c35903bbaf (patch)
tree256a8fc8eaba0b2b22f0853d88ecba58d7c5f04f /git-submodule.sh
parentcb660275789973aa56128b3fbbda4bdff270572a (diff)
parent7b294bf4948931a915cee2d5a692235e9b9c0e27 (diff)
downloadgit-7b72ec5e14656af2d48c7a2a0b7251c35903bbaf.tar.gz
Merge branch 'jl/submodule-deinit'
A finishing touch to the new topic in 1.8.3. * jl/submodule-deinit: submodule deinit: clarify work tree removal message
Diffstat (limited to 'git-submodule.sh')
-rwxr-xr-xgit-submodule.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/git-submodule.sh b/git-submodule.sh
index 275c664ff5..79bfaac9d4 100755
--- 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'")"