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

Re: [PATCH v2 0/7] i18n for git-am, git-rebase and git-merge

From
Jiang Xin <worldhello.net@gmail.com>
Date
Jul 23, 2012, 07:32 UTC
Message-ID
<CANYiYbGyDcR-y-JG5sPLVx0vfc9P+rQerF5ME2nkQ=0FyQB4xw@mail.gmail.com>
In-Reply-To
<7v4nozozz0.fsf@alter.siamese.dyndns.org>
2012/7/23 Junio C Hamano <gitster@pobox.com>:
Show 7 quoted lines
>> I find one test case failed, and correct it in PATCH 3/7.
>
> That test used i18ncmp already, so the update to expected string
> would be sufficient.  I was worried if there were existing tests
> that have been expecting that the output from am/rebase/merge would
> not be i18n'ised and using "test_cmp expect actual" to compare their
> output with expected result.

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.

test of t0006-date.sh failed, because of i18n in commit 7d29af.
    7d29a i18n: mark relative dates for translation
test of t0040-parse-options.sh failed, because of i18n in commit 54e6dc7:
    54e6d i18n: parseopt: lookup help and argument translations when
showing usage
I will try to fix them in next version of the patches.
Test Summary Report
-------------------
./t0006-date.sh                                    (Wstat: 256 Tests:
45 Failed: 11)
  Failed tests:  1-11
  Non-zero exit status: 1
./t0050-filesystem.sh                              (Wstat: 0 Tests: 10
Failed: 0)
  TODO passed:   6
./t0040-parse-options.sh                           (Wstat: 256 Tests:
36 Failed: 4)
  Failed tests:  1, 11-12, 27
  Non-zero exit status: 1
./t1502-rev-parse-parseopt.sh                      (Wstat: 256 Tests:
8 Failed: 1)
  Failed test:  1
  Non-zero exit status: 1
./t1450-fsck.sh                                    (Wstat: 256 Tests:
16 Failed: 1)
  Failed test:  13
  Non-zero exit status: 1
./t1300-repo-config.sh                             (Wstat: 256 Tests:
104 Failed: 1)
  Failed test:  48
  Non-zero exit status: 1
./t2006-checkout-index-basic.sh                    (Wstat: 256 Tests:
2 Failed: 2)
  Failed tests:  1-2
  Non-zero exit status: 1
./t2107-update-index-basic.sh                      (Wstat: 256 Tests:
3 Failed: 1)
  Failed test:  2
  Non-zero exit status: 1
./t3004-ls-files-basic.sh                          (Wstat: 256 Tests:
4 Failed: 2)
  Failed tests:  3-4
  Non-zero exit status: 1
./t3200-branch.sh                                  (Wstat: 256 Tests:
82 Failed: 2)
  Failed tests:  3, 10
  Non-zero exit status: 1
./t3406-rebase-message.sh                          (Wstat: 256 Tests:
6 Failed: 1)
  Failed test:  6
  Non-zero exit status: 1
./t3400-rebase.sh                                  (Wstat: 256 Tests:
26 Failed: 4)
  Failed tests:  5-8
  Non-zero exit status: 1
./t3501-revert-cherry-pick.sh                      (Wstat: 256 Tests:
7 Failed: 2)
  Failed tests:  2-3
  Non-zero exit status: 1
./t4006-diff-mode.sh                               (Wstat: 256 Tests:
7 Failed: 4)
  Failed tests:  4-7
  Non-zero exit status: 1
./t4012-diff-binary.sh                             (Wstat: 256 Tests:
13 Failed: 2)
  Failed tests:  7-8
  Non-zero exit status: 1
./t4035-diff-quiet.sh                              (Wstat: 256 Tests:
20 Failed: 3)
  Failed tests:  16, 18, 20
  Non-zero exit status: 1
./t4120-apply-popt.sh                              (Wstat: 256 Tests:
8 Failed: 2)
  Failed tests:  3, 5
  Non-zero exit status: 1
./t4133-apply-filenames.sh                         (Wstat: 256 Tests:
2 Failed: 1)
  Failed test:  2
  Non-zero exit status: 1
./t4200-rerere.sh                                  (Wstat: 256 Tests:
25 Failed: 2)
  Failed tests:  24-25
  Non-zero exit status: 1
./t4205-log-pretty-formats.sh                      (Wstat: 256 Tests:
13 Failed: 1)
  Failed test:  12
  Non-zero exit status: 1
./t4202-log.sh                                     (Wstat: 256 Tests:
33 Failed: 1)
  Failed test:  33
  Non-zero exit status: 1
./t3903-stash.sh                                   (Wstat: 256 Tests:
46 Failed: 1)
  Failed test:  45
  Non-zero exit status: 1
./t5300-pack-object.sh                             (Wstat: 256 Tests:
33 Failed: 2)
  Failed tests:  32-33
  Non-zero exit status: 1
./t5505-remote.sh                                  (Wstat: 256 Tests:
68 Failed: 9)
  Failed tests:  2-3, 6-9, 13, 15, 46
  Non-zero exit status: 1
./t5530-upload-pack-error.sh                       (Wstat: 256 Tests:
10 Failed: 1)
  Failed test:  3
  Non-zero exit status: 1
./t6500-gc.sh                                      (Wstat: 256 Tests:
3 Failed: 2)
  Failed tests:  2-3
  Non-zero exit status: 1
./t6042-merge-rename-corner-cases.sh               (Wstat: 256 Tests:
26 Failed: 1)
  Failed test:  18
  Non-zero exit status: 1
./t6022-merge-rename.sh                            (Wstat: 256 Tests:
46 Failed: 3)
  Failed tests:  12, 15-16
  Non-zero exit status: 1
./t7008-grep-binary.sh                             (Wstat: 0 Tests: 20
Failed: 0)
  TODO passed:   12
./t7508-status.sh                                  (Wstat: 256 Tests:
76 Failed: 1)
  Failed test:  5
  Non-zero exit status: 1
./t7600-merge.sh                                   (Wstat: 256 Tests:
48 Failed: 1)
  Failed test:  3
  Non-zero exit status: 1
./t9903-bash-prompt.sh                             (Wstat: 256 Tests:
44 Failed: 6)
  Failed tests:  6, 8, 12-15
  Non-zero exit status: 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
Previous: Junio C HamanoNext: Nguyen Thai Ngoc Duy
Message 14 of 16 in “i18n for git-am, git-rebase and git-merge”
  1. 0/7 i18n for git-am, git-rebase and git-mergeJiang Xin, Jul 22, 2012
  2. 1/7 i18n: New keywords for xgettext extraction from shJiang Xin, Jul 22, 2012
  3. 2/7 i18n: rebase: mark strings for translationJiang Xin, Jul 22, 2012
  4. 3/7 i18n: Rewrite gettext messages start with dashJiang Xin, Jul 22, 2012
  5. 4/7 Remove obsolete LONG_USAGE which breaks xgettextJiang Xin, Jul 22, 2012
  6. 5/7 i18n: am: mark more strings for translationJiang Xin, Jul 22, 2012
  7. 6/7 Remove unused and bad gettext block from git-amJiang Xin, Jul 22, 2012
  8. 7/7 i18n: merge-recursive: mark strings for translationJiang Xin, Jul 22, 2012
  9. Junio C HamanoJul 22, 2012
  10. Junio C HamanoJul 22, 2012
  11. Junio C HamanoJul 22, 2012
  12. Jiang XinJul 23, 2012
  13. Junio C HamanoJul 23, 2012
  14. Jiang XinJul 23, 2012
  15. Nguyen Thai Ngoc DuyJul 23, 2012
  16. Jiang XinJul 23, 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.