git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v4] commit: add a commit.allowEmpty config variable

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Nov 15, 2018, 08:40 UTC
Message-ID
<nycvar.QRO.7.76.6.1811150938070.41@tvgsbejvaqbjf.bet>
In-Reply-To
<xmqqzhucpa37.fsf@gitster-ct.c.googlers.com>
Hi,
On Wed, 14 Nov 2018, Junio C Hamano wrote:
Show 10 quoted lines
> Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
> 
> > Agreed. I'm happy to see the test for-loop gone as I noted in
> > https://public-inbox.org/git/87d0rm7zeo.fsf@evledraar.gmail.com/ but as
> > noted in that v3 feedback the whole "why would anyone want this?"
> > explanation is still missing, and this still smells like a workaround
> > for a bug we should be fixing elsewhere in the sequencing code.
> 
> Thanks.  I share the same impression that this is sweeping a bug
> under a wrong rug.

I asked for clarification at https://github.com/git-for-windows/git/issues/1854 and in my best imitation of Lt Tawney Madison, I report back:

From @chucklu:
Show 17 quoted lines
> 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.

Ciao, Dscho

Previous: Johannes SchindelinNext: Jeff King
Message 12 of 14 in “commit: add a commit.allowEmpty config variable”
  1. commit: add a commit.allowEmpty config variabletanushree27, Nov 3, 2018
  2. ] commit: add a commit.allowempty config variabletanushree27, Nov 3, 2018
  3. Duy NguyenNov 3, 2018
  4. commit: add a commit.allowEmpty config variabletanushree27, Nov 3, 2018
  5. Ævar Arnfjörð BjarmasonNov 3, 2018
  6. Junio C HamanoNov 5, 2018
  7. commit: add a commit.allowEmpty config variableTanushree Tumane, Nov 13, 2018
  8. Johannes SchindelinNov 13, 2018
  9. Ævar Arnfjörð BjarmasonNov 13, 2018
  10. Junio C HamanoNov 14, 2018
  11. Johannes SchindelinNov 14, 2018
  12. Johannes SchindelinNov 15, 2018
  13. Jeff KingNov 15, 2018
  14. Johannes SchindelinNov 15, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.