From: Emily Shaffer <emilyshaffer@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Taylor Blau <me@ttaylorr.com>, Derrick Stolee <stolee@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH 2/2] progress: remove redundant null-checking
Date: Fri, 10 Jul 2020 12:27:31 -0700 [thread overview]
Message-ID: <20200710192731.GE3189386@google.com> (raw)
In-Reply-To: <xmqq1rljurvj.fsf@gitster.c.googlers.com>
On Fri, Jul 10, 2020 at 11:50:08AM -0700, Junio C Hamano wrote:
>
> Taylor Blau <me@ttaylorr.com> writes:
>
> > To me too, although note that this will generate merge conflicts with
> > Szeder's patch from earlier today[1].
> >
> > Unfortunately, the conflicts are a little deeper than "we both removed
> > an unnecessary 'if' statement", since Szeder's patch moves the
> > 'stop_progress()' call earlier to avoid a bug that I introduced.
> >
> > This is just something for Junio to look out for while queuing,
>
> Actually that is something contributors learn to play better with
> each other ;-)
Yeah, I was worried about the nature of this series in general. Sorry to
have missed Szeder's change.
>
> Thanks for a heads-up.
Will it make your life easier if I base this series on the other topic?
Or would you rather I leave it to you?
- Emily
next prev parent reply other threads:[~2020-07-10 19:27 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-10 1:42 [PATCH 0/2] enable progress traces even when quiet Emily Shaffer
2020-07-10 1:42 ` [PATCH 1/2] progress: create progress struct in 'verbose' mode Emily Shaffer
2020-07-10 2:00 ` Derrick Stolee
2020-07-10 2:17 ` Taylor Blau
2020-07-10 19:21 ` Emily Shaffer
2020-07-10 2:14 ` brian m. carlson
2020-07-10 19:24 ` Emily Shaffer
2020-07-10 21:09 ` Junio C Hamano
2020-07-10 22:00 ` Emily Shaffer
2020-07-10 22:40 ` Junio C Hamano
2020-07-14 0:15 ` Emily Shaffer
2020-08-17 22:19 ` Emily Shaffer
2020-08-17 22:44 ` Junio C Hamano
2020-08-17 22:49 ` Junio C Hamano
2020-09-09 22:42 ` Jonathan Tan
2020-09-09 22:36 ` Jonathan Tan
2020-09-09 23:06 ` Junio C Hamano
2020-09-10 0:31 ` Jonathan Nieder
2020-09-10 5:09 ` Junio C Hamano
2020-07-10 1:42 ` [PATCH 2/2] progress: remove redundant null-checking Emily Shaffer
2020-07-10 2:01 ` Derrick Stolee
2020-07-10 2:20 ` Taylor Blau
2020-07-10 18:50 ` Junio C Hamano
2020-07-10 19:27 ` Emily Shaffer [this message]
2020-07-10 19:58 ` Junio C Hamano
2020-07-10 20:29 ` Emily Shaffer
2020-07-10 23:03 ` Emily Shaffer
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=20200710192731.GE3189386@google.com \
--to=emilyshaffer@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=me@ttaylorr.com \
--cc=stolee@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.