diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-05 21:15:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-05 21:15:13 (GMT) |
| commit | 7b72ec5e14656af2d48c7a2a0b7251c35903bbaf (patch) | |
| tree | 256a8fc8eaba0b2b22f0853d88ecba58d7c5f04f /git-submodule.sh | |
| parent | cb660275789973aa56128b3fbbda4bdff270572a (diff) | |
| parent | 7b294bf4948931a915cee2d5a692235e9b9c0e27 (diff) | |
| download | git-7b72ec5e14656af2d48c7a2a0b7251c35903bbaf.zip git-7b72ec5e14656af2d48c7a2a0b7251c35903bbaf.tar.gz git-7b72ec5e14656af2d48c7a2a0b7251c35903bbaf.tar.bz2 | |
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-x | git-submodule.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index 275c664..79bfaac 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'")" |