[PATCH v3 4/7] Remove obsolete LONG_USAGE which breaks xgettext
The obsolete LONG_USAGE variable has the following message in it: A'\''--B'\''--C'\'' And such complex LONG_USAGE message will breaks xgettext when extracting l10n messages. But if single quotes are removed from the message, xgettext works fine on 'git-rebase.sh'. Since there is a modern OPTIONS_SPEC variable in use in this script, it's safe to remove the obsolete USAGE and LONG_USAGE variables. Signed-off-by: Jiang Xin worldhello@gmail.com Reviewed-by: Stefano Lattarini stefano.lattar...@gmail.com --- git-rebase.sh | 25 - 1 file changed, 25 deletions(-) diff --git a/git-rebase.sh b/git-rebase.sh index 09a3..63485 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -3,31 +3,6 @@ # Copyright (c) 2005 Junio C Hamano. # -USAGE='[--interactive | -i] [--exec | -x cmd] [-v] [--force-rebase | -f] - [--no-ff] [--onto newbase] [upstream|--root] [branch] [--quiet | -q]' -LONG_USAGE='git-rebase replaces branch with a new branch of the -same name. When the --onto option is provided the new branch starts -out with a HEAD equal to newbase, otherwise it is equal to upstream -It then attempts to create a new commit for each commit from the original -branch that does not exist in the upstream branch. - -It is possible that a merge failure will prevent this process from being -completely automatic. You will have to resolve any such merge failure -and run git rebase --continue. Another option is to bypass the commit -that caused the merge failure with git rebase --skip. To check out the -original branch and remove the .git/rebase-apply working files, use the -command git rebase --abort instead. - -Note that if branch is not specified on the command line, the -currently checked out branch is used. - -Example: git-rebase master~1 topic - - A---B---C topic A'\''--B'\''--C'\'' topic - / -- / - D---E---F---G master D---E---F---G master -' - SUBDIRECTORY_OK=Yes OPTIONS_KEEPDASHDASH= OPTIONS_SPEC=\ -- 1.7.12.rc0.17.gcb766d3 -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v3 4/7] Remove obsolete LONG_USAGE which breaks xgettext
Hi, Jiang Xin wrote: The obsolete LONG_USAGE variable [...] It's a shame to lose the information that was in the LONG_USAGE message, though. Maybe it could be incorporated into the OPTIONS_SPEC before the opening --, or maybe it could be used to clarify the description in git-rebase(1). Cc-ing Martin who carried out the parseoptification for advice. Patch left unsnipped below for reference. Thanks and hope that helps, Jonathan [...] --- a/git-rebase.sh +++ b/git-rebase.sh @@ -3,31 +3,6 @@ # Copyright (c) 2005 Junio C Hamano. # -USAGE='[--interactive | -i] [--exec | -x cmd] [-v] [--force-rebase | -f] - [--no-ff] [--onto newbase] [upstream|--root] [branch] [--quiet | -q]' -LONG_USAGE='git-rebase replaces branch with a new branch of the -same name. When the --onto option is provided the new branch starts -out with a HEAD equal to newbase, otherwise it is equal to upstream -It then attempts to create a new commit for each commit from the original -branch that does not exist in the upstream branch. - -It is possible that a merge failure will prevent this process from being -completely automatic. You will have to resolve any such merge failure -and run git rebase --continue. Another option is to bypass the commit -that caused the merge failure with git rebase --skip. To check out the -original branch and remove the .git/rebase-apply working files, use the -command git rebase --abort instead. - -Note that if branch is not specified on the command line, the -currently checked out branch is used. - -Example: git-rebase master~1 topic - - A---B---C topic A'\''--B'\''--C'\'' topic - / -- / - D---E---F---G master D---E---F---G master -' - SUBDIRECTORY_OK=Yes OPTIONS_KEEPDASHDASH= OPTIONS_SPEC=\ -- 1.7.12.rc0.17.gcb766d3 -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v3 4/7] Remove obsolete LONG_USAGE which breaks xgettext
Jonathan Nieder jrnie...@gmail.com writes: Jiang Xin wrote: The obsolete LONG_USAGE variable [...] It's a shame to lose the information that was in the LONG_USAGE message, though. Maybe it could be incorporated into the OPTIONS_SPEC before the opening --, or maybe it could be used to clarify the description in git-rebase(1). I personally think the original long-usage was overkill to be part of the help text, and I am happy to see it go. I wouldn't mind seeing it incorporated in the documentation if there is something in there that is missing, but I suspect that the first part of the DESCRIPTION should be sufficiently clear already. [...] --- a/git-rebase.sh +++ b/git-rebase.sh @@ -3,31 +3,6 @@ # Copyright (c) 2005 Junio C Hamano. # -USAGE='[--interactive | -i] [--exec | -x cmd] [-v] [--force-rebase | -f] - [--no-ff] [--onto newbase] [upstream|--root] [branch] [--quiet | -q]' -LONG_USAGE='git-rebase replaces branch with a new branch of the -same name. When the --onto option is provided the new branch starts -out with a HEAD equal to newbase, otherwise it is equal to upstream -It then attempts to create a new commit for each commit from the original -branch that does not exist in the upstream branch. - -It is possible that a merge failure will prevent this process from being -completely automatic. You will have to resolve any such merge failure -and run git rebase --continue. Another option is to bypass the commit -that caused the merge failure with git rebase --skip. To check out the -original branch and remove the .git/rebase-apply working files, use the -command git rebase --abort instead. - -Note that if branch is not specified on the command line, the -currently checked out branch is used. - -Example: git-rebase master~1 topic - -A---B---C topic A'\''--B'\''--C'\'' topic - / -- / - D---E---F---G master D---E---F---G master -' - SUBDIRECTORY_OK=Yes OPTIONS_KEEPDASHDASH= OPTIONS_SPEC=\ -- 1.7.12.rc0.17.gcb766d3 -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
