From: Jonathan Nieder <jrnieder@gmail.com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: git@vger.kernel.org, "Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Jiang Xin" <worldhello.net@gmail.com>
Subject: Re: [PATCH 03/65] i18n: archive: mark parseopt strings for translation
Date: Mon, 28 May 2012 17:47:29 -0500 [thread overview]
Message-ID: <20120528224729.GK14606@burratino> (raw)
In-Reply-To: <1338203657-26486-1-git-send-email-pclouds@gmail.com>
Nguyễn Thái Ngọc Duy wrote:
> rc times are usually more quiet times, let's slip the series in..
> minor conflict with revert topic in pu, but should be easy to
> resolve.
Thanks. Some semi-automated checks follow. :)
"git log --name-status" reveals that files these patches change don't
overlap. Good.
Filtering out changes involving N, _, (, and ) by running "git diff
--word-diff-regex='[^N_()]' origin/master", the remaining changes are
in
builtin/for-each-ref.c
builtin/ls-tree.c
builtin/notes.c
builtin/rev-parse.c
builtin/show-branch.c
These are whitespace adjustments to keep continuation lines lined up
given the extra "N_(" characters, except for the for-each-ref.c change
which is an unrelated conversion of 8 spaces to a tab (also seems
fine).
GETTEXT_POISON is annoyed by
t0006.1-11 relative dates
test-date show $t >actual &&
test_cmp expect actual
t0040.1 test help
test_must_fail test-parse-options -h > output 2> output.err &&
test_cmp expect output
t0040.11-12 handling of unknown options
test_must_fail test-parse-options $* >output 2>output.err &&
test_cmp expect output.err
t0040.27 form of errors from OPT_CALLBACK
test_cmp expect.err output.err
t1300.48 no arguments, but no crash
grep usage output
t1502.1 --parseopt help output
test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec &&
test_cmp expect output
t2006.1,2 checkout-index --gobbledegook, -h
grep "[Uu]sage" err
t2107.2 update-index --nonsense dumps usage
grep "[Uu]sage: git update-index" err
t3004.3 ls-files with nonsense option
grep "[Uu]sage: git ls-files" actual
t3004.4 ls-files -h in corrupt repository
grep "[Uu]sage: git ls-files " broken/usage
t3200.3 branch -h in broken repository
grep "[Uu]sage" broken/usage
t3200.10 branch -m dumps usage
grep "[Uu]sage: git branch" err'
t3501.2,3 cherry-pick/revert --nonsense
test_must_fail git cherry-pick --nonsense 2>msg &&
grep '[Uu]sage:' msg
t4006.4-7 diff --stat, --shorstat
git diff HEAD --stat >actual &&
test_cmp expect actual
t4120.3,5 apply with too large -p
grep "removing 3 leading" err
t4012.5-6 apply detects corrupt patch
detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
t4133.2 apply diff with consistent filename in headers
grep "inconsistent new filename" err &&
t4200.24,25 rerere --no-no-rerere-autoupdate, -h
grep [Uu]sage err &&
t4202.33 log --graph with diff and stats
sed -e 's/ *$//' \
-e 's/commit [0-9a-f]*$/commit COMMIT_OBJECT_NAME/' \
-e 's/Merge: [ 0-9a-f]*$/Merge: MERGE_PARENTS/' \
-e 's/Merge tag.*/Merge HEADS DESCRIPTION/' \
-e 's/Merge commit.*/Merge HEADS DESCRIPTION/' \
-e 's/, 0 deletions(-)//' \
-e 's/, 0 insertions(+)//' \
-e 's/ 1 files changed, / 1 file changed, /' \
-e 's/, 1 deletions(-)/, 1 deletion(-)/' \
-e 's/, 1 insertions(+)/, 1 insertion(+)/'
t4205.12 NUL separation with --stat
expecting success:
stat0_part=$(git diff --stat HEAD^ HEAD) &&
stat1_part=$(git diff --stat --root HEAD^) &&
printf "add bar\n$stat0_part\n\0initial\n$stat1_part\n" >expected &&
git log -z --stat --pretty="format:%s" >actual &&
test_cmp expected actual
Binary files expected and actual differ
not ok - 12 NUL separation with --stat
$ xxd trash\ directory.t4205-log-pretty-formats/expected
0000000: 6164 6420 6261 720a 2320 4745 5454 4558 add bar.# GETTEX
0000010: 5420 504f 4953 4f4e 2023 0a00 696e 6974 T POISON #..init
0000020: 6961 6c0a 2320 4745 5454 4558 5420 504f ial.# GETTEXT PO
0000030: 4953 4f4e 2023 0a ISON #.
$ xxd trash\ directory.t4205-log-pretty-formats/actual
0000000: 6164 6420 6261 720a 2320 4745 5454 4558 add bar.# GETTEX
0000010: 5420 504f 4953 4f4e 2023 0069 6e69 7469 T POISON #.initi
0000020: 616c 0a23 2047 4554 5445 5854 2050 4f49 al.# GETTEXT POI
0000030: 534f 4e20 23 SON #
t5300.32 index-pack detects the SHA1 collision
grep "SHA1 COLLISION FOUND" msg
t5505.2-3,6-9,13,15,46 remote porcelain-ish
actual=$(git remote show "$1" | sed -ne 's|^ \(.*\) tracked$|\1|p')
shift &&
tokens_match "$*" "$actual"
r6500.2-3 gc --gobbledegook, -h
grep "[Uu]sage: git gc" err
t7508.5 status --column
COLUMNS=50 git status --column="column dense" >output &&
test_cmp expect output
t7600.3 merge -h
grep "[Uu]sage: git merge" broken/usage
Assuming we want to require scripts to set LC_ALL=C before trying
to parse error messages and descriptions within usage strings (which
seems like a sensible requirement to me), these look like test suite
bugs and not bugs in git itself. So for what it's worth,
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
next prev parent reply other threads:[~2012-05-28 22:47 UTC|newest]
Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-06 14:23 [PATCH 00/65] Mark parseopt strings for translation Nguyễn Thái Ngọc Duy
2012-05-06 14:23 ` [PATCH 01/65] i18n: parseopt: lookup help and argument translations when showing usage Nguyễn Thái Ngọc Duy
2012-05-06 14:23 ` [PATCH 02/65] i18n: apply: mark parseopt strings for translation Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 03/65] i18n: archive: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 04/65] i18n: add: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 05/65] i18n: bisect--helper: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 06/65] i18n: blame: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 07/65] i18n: branch: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 08/65] i18n: cat-file: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 09/65] i18n: check-attr: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 10/65] i18n: checkout-index: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 11/65] i18n: checkout: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 12/65] i18n: cherry: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 13/65] i18n: clean: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 14/65] i18n: clone: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 15/65] i18n: column: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 16/65] i18n: commit: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 17/65] i18n: config: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 18/65] i18n: count-objects: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 19/65] i18n: describe: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 20/65] i18n: fast-export: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 21/65] i18n: fetch: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 22/65] i18n: fmt-merge-msg: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 23/65] i18n: for-each-ref: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 24/65] i18n: format-patch: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 25/65] i18n: fsck: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 26/65] i18n: gc: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 27/65] i18n: grep: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 28/65] i18n: hash-object: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 29/65] i18n: help: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 30/65] i18n: init-db: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 31/65] i18n: log: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 32/65] i18n: ls-files: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 33/65] i18n: ls-tree: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 34/65] i18n: merge-base: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 35/65] i18n: merge-file: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 36/65] i18n: merge: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 37/65] i18n: mktree: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 38/65] i18n: mv: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 39/65] i18n: name-rev: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 40/65] i18n: notes: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 41/65] i18n: pack-objects: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 42/65] i18n: pack-refs: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 43/65] i18n: prune-packed: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 44/65] i18n: prune: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 45/65] i18n: push: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 46/65] i18n: read-tree: " Nguyễn Thái Ngọc Duy
2012-05-28 11:13 ` [PATCH 47/65] i18n: remote: " Nguyễn Thái Ngọc Duy
2012-05-28 11:14 ` [PATCH 48/65] i18n: replace: " Nguyễn Thái Ngọc Duy
2012-05-28 11:14 ` [PATCH 49/65] i18n: status: " Nguyễn Thái Ngọc Duy
2012-05-28 11:14 ` [PATCH 50/65] i18n: rerere: " Nguyễn Thái Ngọc Duy
2012-05-28 11:14 ` [PATCH 51/65] i18n: reset: " Nguyễn Thái Ngọc Duy
2012-05-28 11:14 ` [PATCH 52/65] i18n: rev-parse: " Nguyễn Thái Ngọc Duy
2012-05-28 11:14 ` [PATCH 53/65] i18n: revert, cherry-pick: " Nguyễn Thái Ngọc Duy
2012-05-28 11:14 ` [PATCH 54/65] i18n: rm: " Nguyễn Thái Ngọc Duy
2012-05-28 11:14 ` [PATCH 55/65] i18n: shortlog: " Nguyễn Thái Ngọc Duy
2012-05-28 11:14 ` [PATCH 56/65] i18n: show-branch: " Nguyễn Thái Ngọc Duy
2012-05-28 11:14 ` [PATCH 57/65] i18n: show-ref: " Nguyễn Thái Ngọc Duy
2012-05-28 11:14 ` [PATCH 58/65] i18n: symbolic-ref: " Nguyễn Thái Ngọc Duy
2012-05-28 11:14 ` [PATCH 59/65] i18n: tag: " Nguyễn Thái Ngọc Duy
2012-05-28 11:14 ` [PATCH 60/65] i18n: update-index: " Nguyễn Thái Ngọc Duy
2012-05-28 11:14 ` [PATCH 61/65] i18n: update-ref: " Nguyễn Thái Ngọc Duy
2012-05-28 11:14 ` [PATCH 62/65] i18n: update-server-info: " Nguyễn Thái Ngọc Duy
2012-05-28 11:14 ` [PATCH 63/65] i18n: verify-pack: " Nguyễn Thái Ngọc Duy
2012-05-28 11:14 ` [PATCH 64/65] i18n: verify-tag: " Nguyễn Thái Ngọc Duy
2012-05-28 11:14 ` [PATCH 65/65] i18n: write-tree: " Nguyễn Thái Ngọc Duy
2012-05-28 22:47 ` Jonathan Nieder [this message]
2012-05-29 11:30 ` [PATCH 03/65] i18n: archive: " Nguyen Thai Ngoc Duy
2012-05-29 12:14 ` Jonathan Nieder
2012-05-29 18:49 ` Junio C Hamano
2012-05-30 5:11 ` Nguyen Thai Ngoc Duy
2012-05-30 6:24 ` Jonathan Nieder
2012-05-30 12:25 ` Nguyen Thai Ngoc Duy
2012-05-30 12:50 ` Nguyen Thai Ngoc Duy
2012-05-29 20:31 ` Junio C Hamano
2012-05-29 20:37 ` Jonathan Nieder
2012-05-29 21:08 ` Junio C Hamano
2012-05-30 5:27 ` Nguyen Thai Ngoc Duy
2012-06-02 10:55 ` Nguyen Thai Ngoc Duy
2012-06-02 12:44 ` Jonathan Nieder
2012-06-07 12:31 ` Nguyen Thai Ngoc Duy
2012-06-07 12:41 ` Jonathan Nieder
2012-06-07 12:53 ` Nguyen Thai Ngoc Duy
2012-06-07 19:50 ` Jonathan Nieder
2012-06-07 18:03 ` Junio C Hamano
2012-05-08 18:40 ` [PATCH 00/65] Mark " Junio C Hamano
2012-05-18 4:25 ` Nguyen Thai Ngoc Duy
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120528224729.GK14606@burratino \
--to=jrnieder@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=worldhello.net@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).