Re: [PATCH] blame: use different author name for fake commit generated by --contents
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 24, 2023, 16:05 UTC
- Message-ID
- <xmqqh6t5gt9b.fsf@gitster.g>
- In-Reply-To
- <019057ab-c917-80cd-063b-4871e47dc382@intel.com>
Jacob Keller <jacob.e.keller@intel.com> writes:
Show 10 quoted lines
>> 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.
Show 27 quoted lines
> >> 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 >> ' >> >> >>