From: Junio C Hamano <gitster@pobox•com>
To: Max Horn <max@quendi•de>
Cc: git@vger•kernel.org, Felipe Contreras <felipe.contreras@gmail•com>
Subject: Re: What's cooking in git.git (Feb 2014, #06; Wed, 19)
Date: Thu, 20 Feb 2014 11:22:36 -0800 [thread overview]
Message-ID: <xmqqsird6137.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <BCF58F31-7130-4F4B-BE53-D917C4D50D96@quendi.de> (Max Horn's message of "Thu, 20 Feb 2014 19:39:14 +0100")
Max Horn <max@quendi•de> writes:
> On 19.02.2014, at 22:41, Junio C Hamano <gitster@pobox•com> wrote:
>
>> * fc/transport-helper-fixes (2013-12-09) 6 commits
>> - remote-bzr: support the new 'force' option
>> - test-hg.sh: tests are now expected to pass
>> - transport-helper: check for 'forced update' message
>> - transport-helper: add 'force' to 'export' helpers
>> - transport-helper: don't update refs in dry-run
>> - transport-helper: mismerge fix
>>
>> Reported to break t5541, and has been stalled for a while without
>> fixes.
> ...
> Since I somewhat care about transport-helpers, I had a closer look
> at this failure.
Thanks. Let's keep it a bit longer and see how your new
investigation (and possibly help from others) develops to a
solution.
> Torsten already narrowed it down to f9e3c6bebb89de12
> (transport-helper: check for 'forced update' message).
>
> Looking at that commit, the problem is the new line
>
> (*ref)->forced_update = forced;
>
> which is supposed to set forced_update to 1 in certain cases; but
> the code which sets "forced = 1" ever triggered (at least in my
> limited tests). Worse, it seems forced_update can be set to 1
> before we ever get there, and in these casss, we end up reseting
> forced_update from 1 back to 0. This triggers the test failure.
>
> So a simple fix for the test failure is to drop that
> patch. Another would be to change the assignment to
>
> (*ref)->forced_update |= forced;
>
> But I haven't spent enough time to look at the patch to determine
> if one of these two possible changes is correct. All I can say is
> that dropping that single commit fixes the test failure for me and
> seems to cause now new failures.
next prev parent reply other threads:[~2014-02-20 19:23 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-19 21:41 What's cooking in git.git (Feb 2014, #06; Wed, 19) Junio C Hamano
2014-02-20 18:39 ` Max Horn
2014-02-20 19:22 ` Junio C Hamano [this message]
2014-02-21 9:55 ` Max Horn
2014-02-21 15:46 ` Torsten Bögershausen
2014-02-21 18:04 ` Junio C Hamano
2014-02-22 0:55 ` Max Horn
2014-02-24 16:57 ` Junio C Hamano
2014-02-24 17:06 ` Junio C Hamano
2014-02-24 17:55 ` Max Horn
2014-02-21 16:18 ` Ramkumar Ramachandra
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=xmqqsird6137.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=felipe.contreras@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=max@quendi$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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