git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jiang Xin <worldhello.net@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Git List" <git@vger.kernel.org>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
	"Jonathan Nieder" <jrnieder@gmail.com>,
	"Jiang Xin" <worldhello.net@gmail.com>
Subject: [PATCH v3 4/7] Remove obsolete LONG_USAGE which breaks xgettext
Date: Tue, 24 Jul 2012 14:59:32 +0800	[thread overview]
Message-ID: <e3481427da5efcb60053bb4cd5bcc7e4567100f0.1343112786.git.worldhello.net@gmail.com> (raw)
In-Reply-To: <441f0613d796c35b6865a1258f074d1ea91e605c.1343112786.git.worldhello.net@gmail.com>
In-Reply-To: <cover.1343112786.git.worldhello.net@gmail.com>

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.net@gmail.com>
Reviewed-by: Stefano Lattarini <stefano.lattarini@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

  reply	other threads:[~2012-07-24  7:00 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-24  6:59 [PATCH v3 0/7] i18n for git-am, git-rebase and git-merge Jiang Xin
2012-07-24  6:59 ` [PATCH v3 1/7] i18n: New keywords for xgettext extraction from sh Jiang Xin
2012-07-24  6:59   ` [PATCH v3 2/7] i18n: rebase: mark strings for translation Jiang Xin
2012-07-24  6:59     ` [PATCH v3 3/7] i18n: Rewrite gettext messages start with dash Jiang Xin
2012-07-24  6:59       ` Jiang Xin [this message]
2012-07-24  6:59         ` [PATCH v3 5/7] i18n: am: mark more strings for translation Jiang Xin
2012-07-24  6:59           ` [PATCH v3 6/7] Remove unused and bad gettext block from git-am Jiang Xin
2012-07-24  6:59             ` [PATCH v3 7/7] i18n: merge-recursive: mark strings for translation Jiang Xin
2012-07-24  9:47               ` Stefano Lattarini
2012-07-24 18:27             ` [PATCH v3 6/7] Remove unused and bad gettext block from git-am Jonathan Nieder
2012-07-24 20:40               ` Junio C Hamano
2012-07-24 21:16               ` Martin von Zweigbergk
2012-07-24 21:21                 ` Junio C Hamano
2012-07-24 21:25                 ` Jonathan Nieder
2012-07-24 22:18                   ` Junio C Hamano
2012-07-24 18:16           ` [PATCH v3 5/7] i18n: am: mark more strings for translation Jonathan Nieder
2012-07-24 20:43             ` Junio C Hamano
2012-07-25  6:38               ` Thomas Rast
2012-07-24 23:00             ` Jiang Xin
2012-07-24 18:08         ` [PATCH v3 4/7] Remove obsolete LONG_USAGE which breaks xgettext Jonathan Nieder
2012-07-24 19:07           ` Junio C Hamano
2012-07-24  9:44       ` [PATCH v3 3/7] i18n: Rewrite gettext messages start with dash Stefano Lattarini
2012-07-24  9:43     ` [PATCH v3 2/7] i18n: rebase: mark strings for translation Stefano Lattarini
2012-07-24 18:01     ` Jonathan Nieder
2012-07-24 18:57       ` Junio C Hamano
2012-07-24 22:49       ` Jiang Xin
2012-07-24  9:38   ` [PATCH v3 1/7] i18n: New keywords for xgettext extraction from sh Stefano Lattarini
2012-07-24 17:46   ` Jonathan Nieder

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e3481427da5efcb60053bb4cd5bcc7e4567100f0.1343112786.git.worldhello.net@gmail.com \
    --to=worldhello.net@gmail.com \
    --cc=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --cc=pclouds@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).