From: Junio C Hamano <gitster@pobox.com>
To: Denton Liu <liu.denton@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Jan 2020, #04; Wed, 22)
Date: Wed, 22 Jan 2020 22:08:11 -0800 [thread overview]
Message-ID: <xmqqblqu66yc.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20200123042906.GA29009@generichostname> (Denton Liu's message of "Wed, 22 Jan 2020 23:29:06 -0500")
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.
> 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.
OK, no need for rush.
>> * 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.
next prev parent reply other threads:[~2020-01-23 6:08 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-22 22:18 What's cooking in git.git (Jan 2020, #04; Wed, 22) Junio C Hamano
2020-01-22 22:37 ` Elijah Newren
2020-01-22 22:45 ` Junio C Hamano
2020-01-22 23:53 ` SZEDER Gábor
2020-01-23 6:06 ` Junio C Hamano
2020-01-23 12:11 ` yz/p4-py3, was " Johannes Schindelin
2020-01-23 18:27 ` Yang Zhao
2020-01-27 12:55 ` SZEDER Gábor
2020-01-23 14:16 ` SZEDER Gábor
2020-01-23 17:56 ` SZEDER Gábor
2020-01-23 20:52 ` Junio C Hamano
2020-01-24 17:45 ` Yang Zhao
2020-01-25 0:13 ` Johannes Schindelin
2020-01-25 8:31 ` SZEDER Gábor
2020-01-26 9:21 ` Johannes Schindelin
2020-01-23 21:39 ` Johannes Schindelin
2020-01-24 12:02 ` SZEDER Gábor
2020-01-25 0:35 ` Johannes Schindelin
2020-02-05 21:01 ` Junio C Hamano
2020-02-06 0:27 ` SZEDER Gábor
2020-02-06 8:57 ` Johannes Schindelin
2020-02-06 9:06 ` SZEDER Gábor
2020-02-06 11:45 ` Johannes Schindelin
2020-01-23 11:56 ` Johannes Schindelin
2020-01-23 4:29 ` Denton Liu
2020-01-23 6:08 ` Junio C Hamano [this message]
2020-01-23 16:54 ` Christian Couder
2020-01-23 20:23 ` Junio C Hamano
2020-01-26 20:07 ` Denton Liu
2020-01-27 18:29 ` Junio C Hamano
2020-01-27 20:26 ` [PATCH] .mailmap: fix erroneous authorship for Derrick Stolee Denton Liu
2020-01-28 17:56 ` Junio C Hamano
2020-01-29 8:59 ` What's cooking in git.git (Jan 2020, #04; Wed, 22) Denton Liu
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=xmqqblqu66yc.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=liu.denton@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 NNTP newsgroup(s).