git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 4/7] Remove obsolete LONG_USAGE which breaks xgettext

From
Jiang Xin <worldhello.net@gmail.com>
Date
Jul 21, 2012, 15:50 UTC
Message-ID
<941f7bd695e8a14c940a5b8e4214d2773ae82557.1342884459.git.worldhello.net@gmail.com>
In-Reply-To
<77cbbce0450735a66ef1d9101af0bc82e3fc545c.1342884459.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 extract l10n messages. But if remove single quotes from the message, xgettext works fine on 'git-rebase.sh'.

Since there is a mordern OPTIONS_SPEC variable in use in this script, it's safe to remove the obsolte USAGE and LONG_USAGE variables.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
---
 git-rebase.sh | 25 -------------------------
 1 file changed, 25 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index 640af..02c63 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.11.2.259.g37fc0e1
Previous: Jiang XinNext: Jiang Xin
Message 5 of 14 in “i18n for git-am, git-rebase and git-merge”
  1. 0/7 i18n for git-am, git-rebase and git-mergeJiang Xin, Jul 21, 2012
  2. 1/7 i18n: New keywords for xgettext extraction from shJiang Xin, Jul 21, 2012
  3. 2/7 i18n: rebase: mark strings for translationJiang Xin, Jul 21, 2012
  4. 3/7 i18n: Rewrite gettext messages start with dashJiang Xin, Jul 21, 2012
  5. 4/7 Remove obsolete LONG_USAGE which breaks xgettextJiang Xin, Jul 21, 2012
  6. 5/7 i18n: am: mark more strings for translationJiang Xin, Jul 21, 2012
  7. 6/7 Remove unused and bad gettext block from git-amJiang Xin, Jul 21, 2012
  8. 7/7 i18n: merge-recursive: mark strings for translationJiang Xin, Jul 21, 2012
  9. Stefano LattariniJul 21, 2012
  10. Jiang XinJul 22, 2012
  11. Stefano LattariniJul 21, 2012
  12. Stefano LattariniJul 21, 2012
  13. Stefano LattariniJul 21, 2012
  14. Stefano LattariniJul 21, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.