Re: [PATCH v2 3/7] i18n: git-parse-remote.sh: mark strings for translation
From: Junio C Hamano <hidden>
Date: 2016-06-16 02:18:45
Vasco Almeida [off-list ref] writes:
quoted hunk
diff --git a/git-parse-remote.sh b/git-parse-remote.sh index 55fe8d5..c5e5840 100644 --- a/git-parse-remote.sh +++ b/git-parse-remote.sh@@ -6,6 +6,9 @@ # this would fail in that case and would issue an error message. GIT_DIR=$(git rev-parse -q --git-dir) || :; +. git-sh-setup +. git-sh-i18n
This hunk should be dropped, I think. The scriptlet is not meant to be used as a standalone command and is designed to be always used with ". git-parse-remote". The scripted command that uses it would already have done the above two.
quoted hunk
@@ -68,22 +73,33 @@ error_on_missing_default_upstream () { if test -z "$branch_name" then - echo "You are not currently on a branch. Please specify which -branch you want to $op_type $op_prep. See git-${cmd}(1) for details. - - $example -" + gettextln "You are not currently on a branch." + if test "$op_type" = rebase + then + gettextln "Please specify which branch you want to rebase against." + else + gettextln "Please specify which branch you want to merge with." + fi
The original did not have to know $op_type can only be rebase or
merge, but this one hardcodes the assumption. To make sure that
anybody who adds yet another way to rebase need to come up with a
phrasing that is suited for the new way, something like this would
be a good way to future-proof it.
case "$op_type" in
rebase)
... ;;
merge)
... ;;
*)
echo >&2 "BUG: ..."
exit 1 ;;
esac