From: Junio C Hamano <gitster@pobox.com>
To: Jacob Keller <jacob.e.keller@intel.com>
Cc: <git@vger.kernel.org>, Jacob Keller <jacob.keller@gmail.com>,
Glen Choo <chooglen@google.com>
Subject: Re: [PATCH] blame: use different author name for fake commit generated by --contents
Date: Mon, 24 Apr 2023 09:05:52 -0700 [thread overview]
Message-ID: <xmqqh6t5gt9b.fsf@gitster.g> (raw)
In-Reply-To: <019057ab-c917-80cd-063b-4871e47dc382@intel.com> (Jacob Keller's message of "Fri, 21 Apr 2023 17:11:54 -0700")
Jacob Keller <jacob.e.keller@intel.com> writes:
>> test_expect_success 'blame working copy' '
>> test_when_finished "git restore file" &&
>> - echo "1A quick brown fox jumps over" >file &&
>> - echo "another lazy dog" >> file &&
>> + echo "11A quick brown fox jumps over the" >file &&
>> + echo "lazy dog" >>file &&
>
> I think the right fix for this test is to keep the first line (1A) the
> same, and include the missing "the" I had removed before, and keep the
> 2nd line as the changed line with "another lazy dog".
Either is fine as long as one line is left intact and the other line
is modified, as the end result we want is for one to be attributed
to the floating change while the other one to be attributed to the
HEAD.
>
> Will fix in v2, and double check the tests.
Thanks.
> I had run them but my local
> system sometimes fails the following test:
Hmph, I do not recall seeing t5551 fail but we had seen a fair
number of flaky http tests, and I would not be surprised if there
were still remaining flaky tests there.
>
>> not ok 46 - passing hostname resolution information works
>> #
>> # BOGUS_HOST=gitbogusexamplehost.invalid &&
>> # BOGUS_HTTPD_URL=$HTTPD_PROTO://$BOGUS_HOST:$LIB_HTTPD_PORT &&
>> # test_must_fail git ls-remote "$BOGUS_HTTPD_URL/smart/repo.git" >/dev/null &&
>> # git -c "http.curloptResolve=$BOGUS_HOST:$LIB_HTTPD_PORT:127.0.0.1" ls-remote "$BOGUS_HTTPD_URL/smart/repo.git" >/dev/null
>> #
>
> I had thought this was the only failure, and that it has something to do
> with my system configuration (possibly proxy settings) which affect
> this.. I checked the firewall configuration and it doesn't appear to be
> that...
>
> It would be nice to figure out what makes it so the tests fail so that I
> can make sure tests properly pass on my submissions before sending them
> in the future.
>
> Thanks,
> Jake
>
>
>> check_count A 1 "Not Committed Yet" 1
>> '
>>
>>
>>
next prev parent reply other threads:[~2023-04-24 16:05 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-21 22:30 [PATCH] blame: use different author name for fake commit generated by --contents Jacob Keller
2023-04-21 23:34 ` Junio C Hamano
2023-04-22 0:11 ` Jacob Keller
2023-04-24 16:05 ` Junio C Hamano [this message]
2023-04-24 17:59 ` Glen Choo
2023-04-24 18:37 ` Jacob Keller
-- strict thread matches above, loose matches on Subject: below --
2023-04-24 19:35 Jacob Keller
2023-04-24 19:36 ` Jacob Keller
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqh6t5gt9b.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=chooglen@google.com \
--cc=git@vger.kernel.org \
--cc=jacob.e.keller@intel.com \
--cc=jacob.keller@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.
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).