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

Re: [PATCH 3/4] filter-branch: fix --prune-empty on parentless commits

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 2, 2017, 19:36 UTC
Message-ID
<xmqqshmvbhe5.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<20170223213333.GA3490@prospect.localdomain>
"Devin J. Pohly" <djpohly@gmail.com> writes:
Show 5 quoted lines
> I think your point is interesting too, though.  If a commit is also
> TREESAME to its parent(s?) in the _pre-filtered_ branch, it seems
> reasonable that someone might want to leave it in the filtered branch as
> an empty commit while pruning empt*ied* commits.  I would imagine that
> as another option (--prune-newly-empty?).

I was hoping to hear from others who may care about filter-branch to comment on this topic to help me decide, but I haven't heard anything, so here is my tentative thinking.

I am leaning to:
 * Take your series as-is, which would mean --prune-empty will
   change the behaviour to unconditionally lose the empty root.
 * Then, people who care deeply about it can add a new option that
   prunes commits that become empty while keeping the originally
   empty ones.
Thoughts?
Previous: Devin J. PohlyNext: Devin J. Pohly
Message 6 of 15 in “t7003: ensure --prune-empty can prune root commit”
  1. 1/4 t7003: ensure --prune-empty can prune root commitDevin J. Pohly, Feb 23, 2017
  2. 2/4 t7003: ensure --prune-empty removes entire branch when applicableDevin J. Pohly, Feb 23, 2017
  3. 3/4 filter-branch: fix --prune-empty on parentless commitsDevin J. Pohly, Feb 23, 2017
  4. Junio C HamanoFeb 23, 2017
  5. Devin J. PohlyFeb 23, 2017
  6. Junio C HamanoMar 2, 2017
  7. Devin J. PohlyMar 2, 2017
  8. Junio C HamanoMar 2, 2017
  9. Jacob KellerMar 2, 2017
  10. Jeff KingMar 3, 2017
  11. Devin J. PohlyMar 3, 2017
  12. Junio C HamanoMar 3, 2017
  13. 4/4 p7000: add test for filter-branch with --prune-emptyDevin J. Pohly, Feb 23, 2017
  14. Jeff KingMar 3, 2017
  15. Devin J. PohlyMar 3, 2017

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.