Re: What's cooking in git.git (Jan 2020, #04; Wed, 22)
Denton Liu <liu.denton@gmail.com> writes:
> Sorry, I'm back in school so I haven't had the time to keep up with my
> contributions very much. Feel free to give my topics lower priority for
> the next couple of months if they interfere with any other topics.
Thanks for a quick status report.
Show 11 quoted lines
> On Wed, Jan 22, 2020 at 02:18:05PM -0800, Junio C Hamano wrote:
>> * dl/merge-autostash (2020-01-13) 17 commits
>> ..
>> What's the status of this one? Are people happy with the shape of
>> the code?
>
> I'm not quite happy with this yet. Phillip Wood pointed out that if we
> do `git reset --hard` mid-merge with a stash, the stash will pop _after_
> the reset, which is very surprising since it leaves a dirty tree.
>
> I think I will have time to reroll this on the weekend.
Show 11 quoted lines
>> * dl/test-must-fail-fixes-2 (2020-01-07) 16 commits
>> ...
>> - t2018: remove trailing space from test description
>>
>> Test updates.
>>
>> Will merge to 'next'.
>
> Eric Sunshine sent out a reworded version of "t2018: use
> test_expect_code for failing git commands"'s commit message. I'll send
> out that replacement patch later this weekend as well.
Thanks.
Good luck with your studies and have fun at school.
Junio C Hamano <gitster@pobox.com>