summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6fdd50e)
raw | patch | inline | side by side (parent: 6fdd50e)
author | Jon Seymour <jon.seymour@gmail.com> | |
Sun, 7 Aug 2011 11:58:17 +0000 (21:58 +1000) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 8 Aug 2011 19:05:27 +0000 (12:05 -0700) |
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-submodule.sh | patch | blob | history |
diff --git a/git-submodule.sh b/git-submodule.sh
index bc1d3fa663a5eb39dd96f6ad2ca17437073ceb0a..986c5d6a74730477f51de6e704ba896ee7fee677 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
if test -z "$force" && ! git add --dry-run --ignore-missing "$path" > /dev/null 2>&1
then
- (
- eval_gettext "The following path is ignored by one of your .gitignore files:
+ eval_gettextln "The following path is ignored by one of your .gitignore files:
\$path
-Use -f if you really want to add it." &&
- echo
- ) >&2
+Use -f if you really want to add it." >&2
exit 1
fi
then
if test -d "$path"/.git -o -f "$path"/.git
then
- eval_gettext "Adding existing repo at '\$path' to the index"; echo
+ eval_gettextln "Adding existing repo at '\$path' to the index"
else
die "$(eval_gettext "'\$path' already exists and is not a valid git repo")"
fi
;; # removed
*)
# unexpected type
- (
- eval_gettext "unexpected mode \$mod_dst" &&
- echo
- ) >&2
+ eval_gettextln "unexpected mode \$mod_dst" >&2
continue ;;
esac
fi
done |
if test -n "$for_status"; then
if [ -n "$files" ]; then
- gettext "# Submodules changed but not updated:"; echo
+ gettextln "# Submodules changed but not updated:"
else
- gettext "# Submodule changes to be committed:"; echo
+ gettextln "# Submodule changes to be committed:"
fi
echo "#"
sed -e 's|^|# |' -e 's|^# $|#|'