From: Junio C Hamano <gitster@pobox.com>
To: "Han-Wen Nienhuys via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Han-Wen Nienhuys" <hanwen@google.com>,
"Bagas Sanjaya" <bagasdotme@gmail.com>,
"Elijah Newren" <newren@gmail.com>,
"Han-Wen Nienhuys" <hanwenn@gmail.com>
Subject: Re: [PATCH v2 4/5] test-ref-store: tweaks to for-each-reflog-ent format
Date: Fri, 26 Nov 2021 00:02:22 -0800 [thread overview]
Message-ID: <xmqqsfvj73ap.fsf@gitster.g> (raw)
In-Reply-To: <62f5cb8a8243f9e5c2af5c148ed586a2504c8cee.1637855872.git.gitgitgadget@gmail.com> (Han-Wen Nienhuys via GitGitGadget's message of "Thu, 25 Nov 2021 15:57:51 +0000")
"Han-Wen Nienhuys via GitGitGadget" <gitgitgadget@gmail.com> writes:
> - printf("%s %s %s %" PRItime " %d %s", oid_to_hex(old_oid),
> - oid_to_hex(new_oid), committer, timestamp, tz, msg);
> + printf("%s %s %s %" PRItime " %+05d%s%s", oid_to_hex(old_oid),
> + oid_to_hex(new_oid), committer, timestamp, tz,
> + *msg == '\n' ? "" : "\t", msg);
So, we used to show the timezone as an integer casually, but now we
make sure we use the +/- prefix, with 0 filled 4 digits, that is
consistent with how we record the tz in different places (like the
low-level object header, or the user-visible header lines in commit
and tag objects).
> return 0;
> }
>
> diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
> index 0d4f73acaa8..0d46a488032 100755
> --- a/t/t1400-update-ref.sh
> +++ b/t/t1400-update-ref.sh
> @@ -321,8 +321,9 @@ $A $B $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150260 +0000 Switch
> $B $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150860 +0000
> EOF
> test_expect_success "verifying $m's log (logged by touch)" '
> - test_when_finished "rm -rf .git/$m .git/logs expect" &&
> - test_cmp expect .git/logs/$m
> + test_when_finished "git update-ref -d $m && rm -rf .git/logs actual expect" &&
> + test-tool ref-store main for-each-reflog-ent $m > actual &&
micronit: lose SP between redirection '>' and its target 'actual'.
> + test_cmp actual expect
And the +0000 will be checked by comparing with "expect" file. Nice.
> '
>
> test_expect_success "create $m (logged by config)" '
> @@ -350,8 +351,9 @@ $A $B $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150380 +0000 Switch
> $B $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150980 +0000
> EOF
> test_expect_success "verifying $m's log (logged by config)" '
> - test_when_finished "rm -f .git/$m .git/logs/$m expect" &&
> - test_cmp expect .git/logs/$m
> + test_when_finished "git update-ref -d $m && rm -rf .git/logs actual expect" &&
> + test-tool ref-store main for-each-reflog-ent $m > actual &&
Ditto.
> + test_cmp actual expect
> '
>
> test_expect_success 'set up for querying the reflog' '
> @@ -467,7 +469,8 @@ $h_OTHER $h_FIXED $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117151040 +0000 co
> $h_FIXED $h_MERGED $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117151100 +0000 commit (merge): Merged initial commit and a later commit.
> EOF
> test_expect_success 'git commit logged updates' '
> - test_cmp expect .git/logs/$m
> + test-tool ref-store main for-each-reflog-ent $m >actual &&
This one is good.
> + test_cmp expect actual
> '
> unset h_TEST h_OTHER h_FIXED h_MERGED
Thanks.
next prev parent reply other threads:[~2021-11-26 8:04 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-22 14:20 [PATCH 0/4] Inspect reflog data programmatically in more tests Han-Wen Nienhuys via GitGitGadget
2021-11-22 14:20 ` [PATCH 1/4] show-branch: show reflog message Han-Wen Nienhuys via GitGitGadget
2021-11-22 22:22 ` Junio C Hamano
2021-11-23 7:40 ` Bagas Sanjaya
2021-11-23 8:03 ` Elijah Newren
2021-11-22 14:20 ` [PATCH 2/4] refs: trim newline from " Han-Wen Nienhuys via GitGitGadget
2021-11-22 22:27 ` Junio C Hamano
2021-11-23 16:35 ` Han-Wen Nienhuys
2021-11-23 17:09 ` Junio C Hamano
2021-11-23 17:28 ` Han-Wen Nienhuys
2021-11-23 20:34 ` Junio C Hamano
2021-11-24 11:17 ` Han-Wen Nienhuys
2021-11-24 18:53 ` Junio C Hamano
2021-11-24 19:06 ` Han-Wen Nienhuys
2021-11-24 20:55 ` Junio C Hamano
2021-11-25 16:00 ` Han-Wen Nienhuys
2021-11-29 2:30 ` Junio C Hamano
2021-11-24 19:26 ` Junio C Hamano
2021-11-24 19:39 ` Han-Wen Nienhuys
2021-11-26 8:35 ` Re* " Junio C Hamano
2021-11-28 17:50 ` Ævar Arnfjörð Bjarmason
2021-11-28 18:59 ` Junio C Hamano
2021-11-28 19:25 ` Junio C Hamano
2021-11-29 8:39 ` Ævar Arnfjörð Bjarmason
2021-11-23 10:24 ` Ævar Arnfjörð Bjarmason
2021-11-23 16:44 ` Han-Wen Nienhuys
2021-11-22 14:20 ` [PATCH 3/4] test-ref-store: tweaks to for-each-reflog-ent format Han-Wen Nienhuys via GitGitGadget
2021-11-22 22:31 ` Junio C Hamano
2021-11-23 17:06 ` Han-Wen Nienhuys
2021-11-23 18:31 ` Junio C Hamano
2021-11-22 14:20 ` [PATCH 4/4] t1400: use test-helper ref-store to inspect reflog contents Han-Wen Nienhuys via GitGitGadget
2021-11-22 15:20 ` Ævar Arnfjörð Bjarmason
2021-11-22 17:07 ` Han-Wen Nienhuys
2021-11-22 22:22 ` Junio C Hamano
2021-11-25 15:57 ` [PATCH v2 0/5] Inspect reflog data programmatically in more tests Han-Wen Nienhuys via GitGitGadget
2021-11-25 15:57 ` [PATCH v2 1/5] show-branch: show reflog message Han-Wen Nienhuys via GitGitGadget
2021-11-25 15:57 ` [PATCH v2 2/5] test-ref-store: don't add newline to " Han-Wen Nienhuys via GitGitGadget
2021-11-26 7:56 ` Junio C Hamano
2021-11-25 15:57 ` [PATCH v2 3/5] t1405: check for_each_reflog_ent_reverse() more thoroughly Han-Wen Nienhuys via GitGitGadget
2021-11-25 15:57 ` [PATCH v2 4/5] test-ref-store: tweaks to for-each-reflog-ent format Han-Wen Nienhuys via GitGitGadget
2021-11-26 8:02 ` Junio C Hamano [this message]
2021-11-25 15:57 ` [PATCH v2 5/5] refs/debug: trim trailing LF from reflog message Han-Wen Nienhuys via GitGitGadget
2021-11-26 8:16 ` Junio C Hamano
2021-11-29 18:29 ` Han-Wen Nienhuys
2021-11-29 19:19 ` Junio C Hamano
2021-11-29 19:35 ` Junio C Hamano
2021-12-02 16:24 ` Han-Wen Nienhuys
2021-12-02 18:36 ` Junio C Hamano
2021-11-29 20:59 ` Ævar Arnfjörð Bjarmason
2021-11-29 9:50 ` [PATCH v2 0/5] Inspect reflog data programmatically in more tests Ævar Arnfjörð Bjarmason
2021-11-29 18:24 ` Han-Wen Nienhuys
2021-11-29 22:30 ` Junio C Hamano
2021-11-29 23:28 ` Ævar Arnfjörð Bjarmason
2021-12-02 16:11 ` Han-Wen Nienhuys
2021-12-02 17:36 ` [PATCH v3 " Han-Wen Nienhuys via GitGitGadget
2021-12-02 17:36 ` [PATCH v3 1/5] show-branch: show reflog message Han-Wen Nienhuys via GitGitGadget
2021-12-02 17:36 ` [PATCH v3 2/5] test-ref-store: don't add newline to " Han-Wen Nienhuys via GitGitGadget
2021-12-02 17:36 ` [PATCH v3 3/5] t1405: check for_each_reflog_ent_reverse() more thoroughly Han-Wen Nienhuys via GitGitGadget
2021-12-02 17:36 ` [PATCH v3 4/5] test-ref-store: tweaks to for-each-reflog-ent format Han-Wen Nienhuys via GitGitGadget
2021-12-02 17:36 ` [PATCH v3 5/5] refs/debug: trim trailing LF from reflog message Han-Wen Nienhuys via GitGitGadget
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=xmqqsfvj73ap.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=bagasdotme@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=hanwen@google.com \
--cc=hanwenn@gmail.com \
--cc=newren@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).