Re: Bug report: Git pull hang occasionally

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 12, 2017, 21:12 UTC
Message-ID: <xmqqy3yghtio.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <E9196161-995C-4575-9560-D7E7B9A6B43D@netskope.com>

Kai Zhang <kai@netskope.com> writes:

Show 9 quoted lines

>> On Dec 21, 2016, at 1:32 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> 
>> Junio C Hamano <gitster@pobox.com> writes:
>>  ...
>> 
>> I wonder if the latter is solved by recent patch 296b847c0d
>> ("remote-curl: don't hang when a server dies before any output",
>> 2016-11-18) on the client side.
>> ...

> After apply this patch, hanging did not happen again.

Thanks for confirming.

> Would this patch go to release in near future?

I see 296b847c0d in the message you are responding to (by the way, do not top-post to this list).

Let's check it together.

	$ git log master..296b847c0d
	$ git merge-base master 296b847c0d
        296b847c0d6de63353e236cfbf94163d24155529

Yup, it already is in master.

Using a third-party script "when-merged" [*1*], we can easily find that it was merged a few days ago to 'master', after cooking in 'next' for a handful of weeks:

	$ git when-merged 296b847c0d next
	refs/heads/next 3ea70d01afc6305b88d33b8585f1fc41c486a182
	$ git when-merged 296b847c0d master
	refs/heads/master d984592043aec3c9f5b1955560a133896ca115b5
	$ git show -s --format='%cI' 3ea70d01af d984592043 
        2016-12-05T11:38:03-08:00
        2017-01-10T15:24:25-08:00

Unless people find regressions caused by this change (in which case we may have to revert it), this will be included in the release at the end of this cycle. http://tinyurl.com/gitCal tells us that the current cycle is expected to complete early February.

[Footnote]

*1* git://github.com/mhagger/git-when-merged