From: Junio C Hamano <gitster@pobox.com>
To: Miklos Vajna <vmiklos@vmiklos.hu>
Cc: demerphq <demerphq@gmail.com>, Git <git@vger.kernel.org>
Subject: Re: [PATCH v6] log: "--since-as-filter" option is a non-terminating "--since" variant
Date: Fri, 22 Apr 2022 16:43:21 -0700 [thread overview]
Message-ID: <xmqqsfq44rc6.fsf@gitster.g> (raw)
In-Reply-To: <YmMJqvKN6itSHEZW@vmiklos.hu> (Miklos Vajna's message of "Fri, 22 Apr 2022 22:01:46 +0200")
Miklos Vajna <vmiklos@vmiklos.hu> writes:
> +test_expect_success 'git blame --since=...' '
> + git blame --since="2020-02-15" file >actual &&
> + cat >expect <<-\EOF &&
> + ^c7bc5ce (A U Thor 2020-02-01 00:00:00 +0000 1) a
> + ^c7bc5ce (A U Thor 2020-02-01 00:00:00 +0000 2) a
> + 33fc0d13 (A U Thor 2020-03-01 00:00:00 +0000 3) a
> + ec76e003 (A U Thor 2020-04-01 00:00:00 +0000 4) a
> + EOF
> + test_cmp expect actual
> +'
Hardcoding the object names like this does not pass our test suite.
These abbreviated object names hardcode the use of SHA-1, but the
code is tested in repositories that use SHA-256 as well.
As you are creating four commits with distinct timestamps, I think
you can simply filter out the object name part for comparison,
perhaps like:
redact_blame_output () {
sed -e 's/\([^]*\)\([0-9a-f]*\) /\1HASH /'
}
test_expect_success 'git blame --since=...' '
git blame --since=2020-02-15 file >raw &&
redact_blame_output <raw >actual &&
redact_blame_output <<-\EOF &&
^c7bc5ce (A U Thor 2020-02-01 00:00:00 +0000 1) a
^c7bc5ce (A U Thor 2020-02-01 00:00:00 +0000 2) a
33fc0d13 (A U Thor 2020-03-01 00:00:00 +0000 3) a
ec76e003 (A U Thor 2020-04-01 00:00:00 +0000 4) a
EOF
test_cmp expect actual
'
But did you really mean to test how --since works with blame? Given
that there does not seem to be any clock skew in the history being
tested, I am wondering if this new test file should even be a part
of the topic.
Thanks.
next prev parent reply other threads:[~2022-04-22 23:43 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-01 8:21 git log --since to not stop after first old commit? Miklos Vajna
2022-04-01 9:57 ` Ævar Arnfjörð Bjarmason
2022-04-01 10:14 ` Miklos Vajna
2022-04-01 13:51 ` Ævar Arnfjörð Bjarmason
2022-04-01 17:51 ` Junio C Hamano
2022-04-01 21:36 ` [PATCH] git-log: add a --since-as-filter option Miklos Vajna
2022-04-02 10:09 ` [PATCH v2] " Miklos Vajna
2022-04-07 15:43 ` git log --since to not stop after first old commit? Miklos Vajna
2022-04-08 2:30 ` Junio C Hamano
2022-04-08 18:19 ` Junio C Hamano
[not found] ` <CANgJU+Wr+tKNPfeh4dst-E_LSnoYYmN1easqmkFUA9spp-rpKQ@mail.gmail.com>
2022-04-11 6:37 ` Miklos Vajna
2022-04-11 9:18 ` demerphq
2022-04-11 16:58 ` Junio C Hamano
2022-04-22 18:48 ` Junio C Hamano
2022-04-22 20:01 ` [PATCH v6] log: "--since-as-filter" option is a non-terminating "--since" variant Miklos Vajna
2022-04-22 22:11 ` Junio C Hamano
2022-04-22 23:43 ` Junio C Hamano [this message]
2022-04-23 12:59 ` [PATCH v7] " Miklos Vajna
2022-04-08 21:01 ` [PATCH v3] git-log: add a --since=... --as-filter option Miklos Vajna
2022-04-12 8:47 ` Ævar Arnfjörð Bjarmason
2022-04-15 20:39 ` [PATCH v4] " Miklos Vajna
2022-04-15 23:13 ` Junio C Hamano
2022-04-16 14:23 ` [PATCH v5] log: "--as-filter" option adjusts how "--since" cut-off works Miklos Vajna
2022-04-22 6:50 ` Miklos Vajna
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=xmqqsfq44rc6.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=demerphq@gmail.com \
--cc=git@vger.kernel.org \
--cc=vmiklos@vmiklos.hu \
/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).