),
never. When set to true or auto, use colors only when the
output is to the terminal.
* color.interactive.: Use customized color for interactive
git-clean output (like git add --interactive). may be
prompt, header, help or error.
Signed-off-by: Jiang Xin
Comments-by: Matthieu Moy
array ends with EOF.
* If user pressed CTRL-D (i.e. EOF), no selection returned.
Signed-off-by: Jiang Xin
---
builtin/clean.c | 410 ++--
1 file changed, 367 insertions(+), 43 deletions(-)
diff --git a/builtin/clean.c b/builtin/clean.c
index
return back to main menu
Signed-off-by: Jiang Xin
---
builtin/clean.c | 39 +++
1 file changed, 39 insertions(+)
diff --git a/builtin/clean.c b/builtin/clean.c
index 3b9f3..3b07f 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -622,6 +622,43 @@ int
Add a "rm -i" style interactive cleaning method. User must confirm one
by one before starting to delete.
Signed-off-by: Jiang Xin
---
builtin/clean.c | 36
1 file changed, 36 insertions(+)
diff --git a/builtin/clean.c b/builtin/clean.c
index 3b
Signed-off-by: Jiang Xin
---
Documentation/git-clean.txt | 70 -
1 file changed, 63 insertions(+), 7 deletions(-)
diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt
index f5572..56d60 100644
--- a/Documentation/git-clean.txt
+++ b
2013/5/7 Jiang Xin :
> Rewrite menu using a new method `list_and_choose`, which is borrowed
> from `git-add--interactive.perl`. We can reused this method later for
> more actions.
>
> Please NOTE:
>
> * Method `list_and_choose` return an array of integers, and
> * it
2013/5/7 Jiang Xin :
> Signed-off-by: Jiang Xin
> ---
> Documentation/git-clean.txt | 70
> -
> 1 file changed, 63 insertions(+), 7 deletions(-)
>
> diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt
> i
4dcdc3d8ccfb7e6ae3a2d151b5df59785548a040:
l10n: zh_CN.po: translate 44 messages (2080t0f0u) (2013-05-08 08:13:32 +0800)
Jiang Xin (3):
l10n: git.pot: v1.8.3 round 2 (44 new, 12 removed)
Merge remote-tracking branch &#x
2013/5/7 Junio C Hamano :
> What is this message trying to achieve? "self review"???
>
> A bit puzzled
Maybe I should send a new rerolled patch series after this. Yesterday I
wanted to wait for a while to see suggestions and reviews from others.
--
Jiang Xin
--
To un
w a "rm -i" style cleaning, that you must confirm one
by one in order to delete items. This action is not as efficient
as the above two actions.
flags::
This lets you change the flags for git-clean, such as -x/-X/-d/-ff,
and refresh the cleaning candidates list automatically.
qu
mode, the user can input space-
separated patterns (the same syntax as gitignore), and each clean
candidate that matches with one of the patterns will be excluded
from cleaning. When the user feels it's OK, presses ENTER and back
to the confirmation dialog.
Signed-off-by: Jiang Xin
Suggest
structions
and warnings as header before them.
Signed-off-by: Jiang Xin
Comments-by: Matthieu Moy
---
Documentation/config.txt | 4
builtin/clean.c | 58 +---
2 files changed, 44 insertions(+), 18 deletions(-)
diff --git a/Doc
),
never. When set to true or auto, use colors only when the
output is to the terminal.
* color.interactive.: Use customized color for interactive
git-clean output (like git add --interactive). may be
prompt, header, help or error.
Signed-off-by: Jiang Xin
Comments-by: Matthieu Moy
array ends with EOF.
* If user pressed CTRL-D (i.e. EOF), no selection returned.
Signed-off-by: Jiang Xin
---
builtin/clean.c | 469 +++-
1 file changed, 428 insertions(+), 41 deletions(-)
diff --git a/builtin/clean.c b/builtin/clean.c
index
return back to main menu
Signed-off-by: Jiang Xin
---
builtin/clean.c | 39 +++
1 file changed, 39 insertions(+)
diff --git a/builtin/clean.c b/builtin/clean.c
index 10f3..75e37 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -684,6 +684,43 @@ static int
Add a "rm -i" style interactive cleaning method. User must confirm one
by one before starting to delete.
Signed-off-by: Jiang Xin
---
builtin/clean.c | 36
1 file changed, 36 insertions(+)
diff --git a/builtin/clean.c b/builtin/clean.c
index 75
Signed-off-by: Jiang Xin
---
Documentation/git-clean.txt | 70 -
1 file changed, 63 insertions(+), 7 deletions(-)
diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt
index f5572..47e8e 100644
--- a/Documentation/git-clean.txt
+++ b
Save some options in variable clean_flags, such as -ff (force > 1),
-x (ignored), -X (ignored_only), and -d (remove_directories). We may
change clean_flags later in the interactive git-clean.
Signed-off-by: Jiang Xin
---
builtin/clean.c | 46 +++---
Add new function `scan_clean_candidates`, which determines the del_list
(i.e. the cleaning candidates). This function will be reused later in
the interactive git-clean, so we can change flags of git-clean and
refresh the del_list.
Signed-off-by: Jiang Xin
---
builtin/clean.c | 169
Add new action in the interactive mode, so that the user can change
git-clean flags, such as -x/-X/-d/-ff, and refresh the cleaning
candidates list.
Signed-off-by: Jiang Xin
---
Documentation/git-clean.txt | 11 +++--
builtin/clean.c | 117
7;t fix but hide the problem.
- test_expect_success 'remote information for the origin' '
+ test_expect_success C_LOCALE_OUTPUT 'remote information for the origin' '
- test_expect_succes 'remove remote' '
+ test_expect_success C_LOCALE_OUTPUT 'r
en
running the command 'git rev-parse --git-dir' in a subdir of the work
tree, and the realpath may not equal to "$TRASH_DIRECTORY".
In this fix, "$TRASH_DIRECTORY" is determined right after the realpath
of CWD is resolved.
Signed-off-by: Jiang Xin
Reported-by: Mi
ies I
sent yesterday as the test suite was broken even before.
Jiang Xin (7):
Fix tests under GETTEXT_POISON on relative dates
Fix tests under GETTEXT_POISON on git-stash
Fix tests under GETTEXT_POISON on diffstat
Fix tests under GETTEXT_POISON on git-apply
Fix tests under GETTEXT_POIS
Use a i18n-specific test_i18ncmp in t/t0006-data.sh for relative dates
tests. This issue was was introduced in v1.7.10-230-g7d29a:
7d29a i18n: mark relative dates for translation
and been broken under GETTEXT_POISON=YesPlease since.
Signed-off-by: Jiang Xin
Signed-off-by: Nguyễn Thái Ngọc
Use i18n-specific test functions in test scripts for git-stash.
This issue was was introduced in v1.7.4.1-119-g355ec:
355ec i18n: git-status basic messages
and been broken under GETTEXT_POISON=YesPlease since.
Signed-off-by: Jiang Xin
Signed-off-by: Nguyễn Thái Ngọc Duy
---
t/t3903
Use i18n-specific test functions in test scripts for diffstat.
This issue was was introduced in v1.7.9-1-g7f814:
7f814 Use correct grammar in diffstat summary line
and been broken under GETTEXT_POISON=YesPlease since.
Signed-off-by: Jiang Xin
Signed-off-by: Nguyễn Thái Ngọc Duy
---
t
-off-by: Jiang Xin
Signed-off-by: Nguyễn Thái Ngọc Duy
---
t/t4012-diff-binary.sh | 4 ++--
t/t4120-apply-popt.sh | 4 ++--
t/t4133-apply-filenames.sh | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
index ec4de..1215a
under GETTEXT_POISON=YesPlease since.
Signed-off-by: Jiang Xin
Signed-off-by: Nguyễn Thái Ngọc Duy
---
t/t5300-pack-object.sh | 4 ++--
t/t5530-upload-pack-error.sh | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index
Use i18n-specific test functions in test scripts for git-remote.
This issue was was introduced in v1.7.10-233-gbb16d5:
bb16d5 i18n: remote: mark strings for translation
and been broken under GETTEXT_POISON=YesPlease since.
Signed-off-by: Jiang Xin
Signed-off-by: Nguyễn Thái Ngọc Duy
Use i18n-specific test functions in test scripts for parseopt tests.
This issue was was introduced in v1.7.10.1-488-g54e6d:
54e6d i18n: parseopt: lookup help and argument translations when showing
usage
and been broken under GETTEXT_POISON=YesPlease since.
Signed-off-by: Jiang Xin
Signed
2012/8/28 Junio C Hamano :
> Jiang Xin writes:
>
>> Use i18n-specific test functions in test scripts for git-remote.
>> This issue was was introduced in v1.7.10-233-gbb16d5:
>>
>> bb16d5 i18n: remote: mark strings for translation
>>
>> and been b
With this series, the test suite should pass again with gettext
poison on.
Updates in v3:
* patch 1/7: fix typo in commit log message.
* patch 6/7: remove tailing '&&'.
Jiang Xin (7):
Fix tests under GETTEXT_POISON on relative dates
Fix tests under GETTEXT_POISON on git
Use a i18n-specific test_i18ncmp in t/t0006-date.sh for relative dates
tests. This issue was was introduced in v1.7.10-230-g7d29a:
7d29a i18n: mark relative dates for translation
and been broken under GETTEXT_POISON=YesPlease since.
Signed-off-by: Jiang Xin
Signed-off-by: Nguyễn Thái Ngọc
Use i18n-specific test functions in test scripts for git-stash.
This issue was was introduced in v1.7.4.1-119-g355ec:
355ec i18n: git-status basic messages
and been broken under GETTEXT_POISON=YesPlease since.
Signed-off-by: Jiang Xin
Signed-off-by: Nguyễn Thái Ngọc Duy
---
t/t3903
Use i18n-specific test functions in test scripts for diffstat.
This issue was was introduced in v1.7.9-1-g7f814:
7f814 Use correct grammar in diffstat summary line
and been broken under GETTEXT_POISON=YesPlease since.
Signed-off-by: Jiang Xin
Signed-off-by: Nguyễn Thái Ngọc Duy
---
t
-off-by: Jiang Xin
Signed-off-by: Nguyễn Thái Ngọc Duy
---
t/t4012-diff-binary.sh | 4 ++--
t/t4120-apply-popt.sh | 4 ++--
t/t4133-apply-filenames.sh | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
index ec4de..1215a
under GETTEXT_POISON=YesPlease since.
Signed-off-by: Jiang Xin
Signed-off-by: Nguyễn Thái Ngọc Duy
---
t/t5300-pack-object.sh | 4 ++--
t/t5530-upload-pack-error.sh | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index
-off-by: Jiang Xin
Signed-off-by: Nguyễn Thái Ngọc Duy
---
t/t5505-remote.sh | 28 +---
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index e8af6..4b720 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -52,7
Use i18n-specific test functions in test scripts for parseopt tests.
This issue was was introduced in v1.7.10.1-488-g54e6d:
54e6d i18n: parseopt: lookup help and argument translations when showing
usage
and been broken under GETTEXT_POISON=YesPlease since.
Signed-off-by: Jiang Xin
Signed
d at lines:
4151, 4172
* 4 old messages are deleted from the previous version at lines:
350, 354, 2069, 4166
Signed-off-by: Jiang Xin
It's time for a new round of translation.
* Fetch new commits from git://github.com/git-l10n/git-po
* Update your "XX.po&q
I just notice that the 1st line of the orignal message below has
only 56 characters, much shorter than other lines. It is because
this is a warning message, and would add a prefix: "warning: ".
#: builtin/push.c:151
msgid ""
"push.default is unset; its implicit value is changing in\n"
"Git 2.0 fr
9a4f34bb6d11ab47d532f7798ecc2b051f6d8893:
l10n: Update Swedish translation (1166t0f0u) (2012-09-13 06:33:25 +0800)
Jiang Xin (3):
l10n: Update git.pot (2 new, 4 removed messages)
l10n: zh_CN.po: translate 2 new messages
Merge git
such as:
$ git config --global diff.podiff.textconv "sed -e '/^#/ d'"
2. Add two lines in .git/info/attributes to use this driver for po/pot files:
*.po diff=podiff
*.pot diff=podiff
--
Jiang Xin
--
To unsubscribe from this list: send the line "unsubscribe git&quo
MN() for translation
Signed-off-by: Jiang Xin
It's time for a new round of translation.
* Fetch new commits from git://github.com/git-l10n/git-po
* Update your "XX.po" according to the new "git.pot" file.
* Start your translation and review your commits inside your l10n te
5b3ba7193f2f99fa1c23c1952f3e0f880e101ae2:
Merge branch 'l10n-thynson' of git://github.com/thynson/git-po-zh_CN
into maint (2012-09-28 06:49:08 +0800)
----
Jiang Xin (2):
Merge branch 'maint' of https://github.com/ralfth/
b2f4b6cec2c5c1e2f802ac4b4bd12d5b26461069:
Merge git://github.com/gotgit/git-po-zh_CN (2012-09-28 07:03:43 +0800)
Jiang Xin (6):
l10n: Update git.pot (825 new, 24 removed messages)
l10n: zh.CN.po: msgmerge git.pot (1142t195f630u)
Merge branch '
a38d5627ab:
l10n: Update git.pot (3 new, 6 removed messages) (2012-10-16 08:39:10 +0800)
--------
Jiang Xin (2):
Merge branch 'master' of git://github.com/vnwildman/git
l10n: Update git.pot (3 new, 6 removed messages
ch changes up to b408887045e3e4abe1551936d4877f6b942c1916:
Merge branch 'master' of https://github.com/nafmo/git-l10n-sv
(2012-10-17 09:38:30 +0800)
--------
Jiang Xin (2):
Merge branch 'master' of git://github
6792b93b1965561e85be3733bb3ab00b2e598119:
l10n: zh_CN.po: translate 29 new messages (2012-07-06 09:11:15 +0800)
Jiang Xin (2):
l10n: Update git.pot (29 new messages)
l10n: zh_CN.po: translate 29 new messages
Peter Krefting (1):
Update
urrent branch:
$ git quiltimport
--
Jiang Xin
--
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
Mark strings in git-am, git-rebase, and git-merge for translation.
And contain fixes for shell gettext extraction and xgettext workaround.
Jiang Xin (7):
i18n: New keywords for xgettext extraction from sh
i18n: rebase: mark strings for translation
i18n: Rewrite gettext messages start with
Since we have additional shell wrappers (gettextln and eval_gettextln)
for gettext, we need to take into account these wrapers when run
'make pot' to extract messages from shell scripts.
Signed-off-by: Jiang Xin
---
Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
di
Signed-off-by: Jiang Xin
---
git-rebase.sh | 58 ++
1 file changed, 30 insertions(+), 28 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index 1cd06..df5998 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -65,6 +65,7 @@ abort
case. Rewrite the message
is a simpler and better solution.
Signed-off-by: Jiang Xin
Signed-off-by: Ævar Arnfjörð Bjarmason
---
git-rebase.sh | 2 +-
git-submodule.sh | 2 +-
t/t3404-rebase-interactive.sh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
di
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
---
git-rebase.sh | 25 -
1 file changed, 25 deletions(-)
diff --git a/git-rebase.sh b
Signed-off-by: Jiang Xin
---
git-am.sh | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/git-am.sh b/git-am.sh
index b6a53..20c1a 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -92,7 +92,7 @@ safe_to_abort () {
then
return 0
fi
Gettext message should not start with '-' nor '--'. Since the '-d' and
'--dotest' options are not exist in OPTIONS_SPEC variable, so it's safe
to remove the block.
Signed-off-by: Jiang Xin
---
git-am.sh | 3 ---
1 file changed, 3 deletions(-)
d
Signed-off-by: Jiang Xin
---
merge-recursive.c | 152 +-
1 file changed, 81 insertions(+), 71 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index 68093..d0167 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -187,7
Mark strings in git-am, git-rebase, and git-merge for translation.
And contain fixes for shell gettext extraction and xgettext workaround.
Jiang Xin (7):
i18n: New keywords for xgettext extraction from sh
i18n: rebase: mark strings for translation
i18n: Rewrite gettext messages start with
Since we have additional shell wrappers (gettextln and eval_gettextln)
for gettext, we need to take into account these wrappers when run
'make pot' to extract messages from shell scripts.
Signed-off-by: Jiang Xin
Signed-off-by: Stefano Lattarini
---
Makefile | 3 ++-
1 file
Signed-off-by: Jiang Xin
---
git-rebase.sh | 58 ++
1 file changed, 30 insertions(+), 28 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index 1cd06..df5998 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -65,6 +65,7 @@ abort
se. Rewriting the message
is a simpler and better solution.
Signed-off-by: Jiang Xin
Signed-off-by: Ævar Arnfjörð Bjarmason
Signed-off-by: Stefano Lattarini
---
git-rebase.sh | 2 +-
git-submodule.sh | 2 +-
t/t3404-rebase-interactive.sh | 2 +-
3 files changed
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
Signed-off-by: Stefano Lattarini
---
git-rebase.sh | 25 -
1 file changed,
Mark additional 3 strings for translation, and reduce one indentation
level for one gettextln clause introduced in commit de88c1c.
Signed-off-by: Jiang Xin
Signed-off-by: Stefano Lattarini
---
git-am.sh | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/git-am.sh b
Gettext message should not start with '-' nor '--'. Since the '-d' and
'--dotest' options do not exist in OPTIONS_SPEC variable, it's safe to
remove the block.
Signed-off-by: Jiang Xin
Signed-off-by: Stefano Lattarini
---
git-am.sh | 3 ---
1 f
Signed-off-by: Jiang Xin
---
merge-recursive.c | 152 +-
1 file changed, 81 insertions(+), 71 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index 68093..d0167 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -187,7
2012/7/22 Stefano Lattarini :
> s/message/messages/ I think.
> s/are not/do not/
> This "so" is redundant, in light of the earlier "Since". I'd just remove it.
Thanks, Stefano. New series of patches are generated and sent to this list.
--
Jiang Xin
--
To un
or test_i18ncmp with this change?
I find one test case failed, and correct it in PATCH 3/7.
--
Jiang Xin
--
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
atus: 1
Files=595, Tests=8548, 739 wallclock secs ( 5.05 usr 2.11 sys +
362.59 cusr 466.00 csys = 835.75 CPU)
Result: FAIL
--
Jiang Xin
--
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
2012/7/23 Nguyen Thai Ngoc Duy :
> On Mon, Jul 23, 2012 at 2:32 PM, Jiang Xin wrote:
>> If build git with GETTEXT_POISON and test, lots of test cases failed.
>> It seems that we haven't run these test cases for i18n for a long time.
>
> Gaah.. I should have resent the po
Marked messages for translation in git-am, git-rebase, and git-merge.
Also fixed affected test cases when turn GETTEXT_POISON switch on.
Jiang Xin (7):
i18n: New keywords for xgettext extraction from sh
i18n: rebase: mark strings for translation
i18n: Rewrite gettext messages start with
Since we have additional shell wrappers (gettextln and eval_gettextln)
for gettext, we need to take into account these wrappers when run
'make pot' to extract messages from shell scripts.
Signed-off-by: Jiang Xin
Reviewed-by: Stefano Lattarini
---
Makefile | 3 ++-
1 file changed, 2
Mark strings in git-rebase.sh for translation.
Some test scripts are affected by this update, and would fail if are
tested with GETTEXT_POISON switch turned on. Use i18n-specific test
functions, such as test_i18ngrep in the related test scripts will fix
these issues.
Signed-off-by: Jiang Xin
se. Rewriting the message
is a simpler and better solution.
Signed-off-by: Jiang Xin
Signed-off-by: Ævar Arnfjörð Bjarmason
Reported-by: Vincent van Ravesteijn
Reviewed-by: Stefano Lattarini
---
git-rebase.sh | 2 +-
git-submodule.sh | 2 +-
t/t3404-rebase-interact
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
Reviewed-by: Stefano Lattarini
---
git-rebase.sh | 25 -
1 file changed, 25 de
Mark additional 3 strings for translation, and reduce one indentation
level for one gettextln clause introduced in commit de88c1c.
Signed-off-by: Jiang Xin
Reviewed-by: Stefano Lattarini
---
git-am.sh | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/git-am.sh b
Gettext message should not start with '-' nor '--'. Since the '-d' and
'--dotest' options do not exist in OPTIONS_SPEC variable, it's safe to
remove the block.
Signed-off-by: Jiang Xin
Reviewed-by: Stefano Lattarini
---
git-am.sh | 3 ---
1 file ch
Mark strings in merge-recursive for translation.
Some test scripts are affected by this update, and would fail if are
tested with GETTEXT_POISON switch turned on. Use i18n-specific test
functions, such as test_i18ngrep in the related test scripts will fix
these issues.
Signed-off-by: Jiang Xin
quot;$TRASH_DIRECTORY", store it in
"$TRASH_REALPATH" variable, and use it when necessary.
Signed-off-by: Jiang Xin
---
t/t4035-diff-quiet.sh | 8 +---
t/t9903-bash-prompt.sh | 13 +++--
2 个文件被修改，插入 12 行(+)，删除 9 行(-)
diff --git a/t/t4035-diff-quiet.sh b/t/t4035-diff-quiet.sh
in
f6fb0a 100644
> --- a/t/test-lib.sh
> +++ b/t/test-lib.sh
> @@ -15,6 +15,8 @@
> # You should have received a copy of the GNU General Public License
> # along with this program. If not, see http://www.gnu.org/licenses/ .
>
> +cd "$(pwd -P)"
> +
Yes, it's much
gt;
The error messages are:
fatal: Needed a single revision
Does not point to a valid commit: invalid-ref
The first line has not been marked for translation (comes from
builtin/rev-parse.c), but the second line is marked for translation
in this patch. The output in my locale would be:
could not use eval_gettext either. Because
eval_gettext may be a wapper for gettext, and the positional
parameter would loose it's original context.
--
Jiang Xin
--
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
Marked messages for translation in git-am, git-rebase, and git-merge.
Also fixed affected test cases when turn GETTEXT_POISON switch on.
Jiang Xin (7):
i18n: New keywords for xgettext extraction from sh
i18n: rebase: mark strings for translation
i18n: Rewrite gettext messages start with
Since we have additional shell wrappers (gettextln and eval_gettextln)
for gettext, we need to take into account these wrappers when running
'make pot' to extract messages from shell scripts.
Signed-off-by: Jiang Xin
Reviewed-by: Stefano Lattarini
Reviewed-by: Jonathan Nieder
---
Ma
ome test scripts are affected by this update, and would fail if tested
with GETTEXT_POISON switch turned on. Using i18n-specific test
functions, such as test_i18ngrep, in the related test scripts will fix
these issues.
Signed-off-by: Jiang Xin
Reviewed-by: Stefano Lattarini
Reviewed-by: Jonathan Ni
se. Rewriting the message
is a simpler and better solution.
Signed-off-by: Jiang Xin
Signed-off-by: Ævar Arnfjörð Bjarmason
Reported-by: Vincent van Ravesteijn
Reviewed-by: Stefano Lattarini
---
git-rebase.sh | 2 +-
git-submodule.sh | 2 +-
t/t3404-rebase-interact
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
Reviewed-by: Stefano Lattarini
---
git-rebase.sh | 25 -
1 file changed, 25 de
tion level for one gettextln clause introduced
in commit de88c1c.
Signed-off-by: Jiang Xin
Reviewed-by: Stefano Lattarini
Reviewed-by: Jonathan Nieder
---
git-am.sh | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/git-am.sh b/git-am.sh
index 8961a..3f654 100755
--- a
) a year later by
removing the option from the option table in 98ef23b3 (git-am:
minor cleanups, 2009-01-28).
But the code to handle -d and --dotest stayed around even though
ever since then it could not be tripped. Remove this dead code.
Signed-off-by: Jiang Xin
Reviewed-by:
Mark strings in merge-recursive for translation.
Some test scripts are affected by this update, and would fail if tested
with GETTEXT_POISON switch turned on. Using i18n-specific test
functions, such as test_i18ngrep, in the related test scripts will fix
these issues.
Signed-off-by: Jiang Xin
red by the reviewer'.) If you'd like to
> credit my help, something like "With advice from Jonathan." would be
> fine.
How about Acked-by: ?
--
Jiang Xin
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...
Marked messages for translation in git-am, git-rebase, and git-merge.
Also fixed suffered tests when turning GETTEXT_POISON switch on.
Jiang Xin (7):
i18n: New keywords for xgettext extraction from sh
i18n: rebase: mark messages for translation
i18n: Rewrite gettext messages start with dash
Since we have additional shell wrappers (gettextln and eval_gettextln)
for gettext, we need to take into account these wrappers when running
'make pot' to extract messages from shell scripts.
Signed-off-by: Jiang Xin
Reviewed-by: Stefano Lattarini
Reviewed-by: Jonathan Nieder
---
Ma
GETTEXT_POISON turned on after
this update. Use test_i18ncmp and test_i18ngrep where appropriate
to mark strings that should only be checked in the C locale output
to avoid such issues.
Signed-off-by: Jiang Xin
Reviewed-by: Stefano Lattarini
Acked-by: Jonathan Nieder
---
git-am.sh
se. Rewriting the message
is a simpler and better solution.
Signed-off-by: Jiang Xin
Signed-off-by: Ævar Arnfjörð Bjarmason
Reported-by: Vincent van Ravesteijn
Reviewed-by: Stefano Lattarini
---
git-rebase.sh | 2 +-
git-submodule.sh | 2 +-
t/t3404-rebase-interact
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
Reviewed-by: Stefano Lattarini
---
git-rebase.sh | 25 -
1 file changed, 25 de
) a year later by
removing the option from the option table in 98ef23b3 (git-am:
minor cleanups, 2009-01-28).
But the code to handle -d and --dotest stayed around even though
ever since then it could not be tripped. Remove this dead code.
Signed-off-by: Jiang Xin
Reviewed-by:
Mark strings in merge-recursive for translation.
Some test scripts are affected by this update, and would fail if tested
with GETTEXT_POISON switch turned on. Using i18n-specific test
functions, such as test_i18ngrep, in the related test scripts will fix
these issues.
Signed-off-by: Jiang Xin
tion level for one gettextln clause introduced
in commit de88c1c.
Signed-off-by: Jiang Xin
Reviewed-by: Stefano Lattarini
Reviewed-by: Jonathan Nieder
---
git-am.sh | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/git-am.sh b/git-am.sh
index 8961a..25d0e 100755
--- a
al context.
>>
> ... here you should s/it's/its/.
OMG. You find what some grammer/spelling checking website hasn't.
If there are no other serious problems, I won't make noises (send
another series of patches) to this list, should I?
--
Jiang Xin
--
To unsubscribe from this l
501 - 600 of 656 matches
Mail list logo
