From: Jeff King <peff@peff.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Tanushree Tumane" <tanushreetumane@gmail.com>,
git@vger.kernel.org, pclouds@gmail.com
Subject: Re: [PATCH v4] commit: add a commit.allowEmpty config variable
Date: Thu, 15 Nov 2018 04:41:01 -0500 [thread overview]
Message-ID: <20181115094101.GA15279@sigill.intra.peff.net> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.1811150938070.41@tvgsbejvaqbjf.bet>
On Thu, Nov 15, 2018 at 09:40:38AM +0100, Johannes Schindelin wrote:
> From @chucklu:
>
> > my user case is like this :
> >
> > When I want to cherr-pick commits from A to G (ABCDEFG), image C and E
> > are merge commits. Then I will get lots of popup like:
> >
> > The previous cherry-pick is now empty, possibly due to conflict
> > resolution.
> > If you wish to commit it anyway, use:
> >
> > git commit --allow-empty
> >
> > If you wish to skip this commit, use:
> >
> > git reset
> >
> > Then "git cherry-pick --continue" will resume cherry-picking
> > the remaining commits.
>
> My quick interpretation of this is that the user actually needs a way to
> skip silently commits which are now empty.
If it's always intended to be used with cherry-pick, shouldn't
cherry-pick learn a --keep-empty (like rebase has)? That would avoid
even stopping for this case in the first place.
-Peff
next prev parent reply other threads:[~2018-11-15 9:41 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-03 11:25 [PATCH] commit: add a commit.allowEmpty config variable tanushree27
2018-11-03 11:53 ` [[PATCH v2]] commit: add a commit.allowempty " tanushree27
2018-11-03 14:43 ` Duy Nguyen
2018-11-03 15:12 ` [PATCH v3] commit: add a commit.allowEmpty " tanushree27
2018-11-03 19:07 ` Ævar Arnfjörð Bjarmason
2018-11-05 0:30 ` Junio C Hamano
2018-11-13 15:56 ` [PATCH v4] " Tanushree Tumane
2018-11-13 19:24 ` Johannes Schindelin
2018-11-13 21:27 ` Ævar Arnfjörð Bjarmason
2018-11-14 4:16 ` Junio C Hamano
2018-11-14 14:04 ` Johannes Schindelin
2018-11-15 8:40 ` Johannes Schindelin
2018-11-15 9:41 ` Jeff King [this message]
2018-11-15 16:16 ` Johannes Schindelin
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181115094101.GA15279@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=tanushreetumane@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).