From: Junio C Hamano <gitster@pobox.com>
To: "Devin J. Pohly" <djpohly@gmail.com>
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
Charles Bailey <cbailey32@bloomberg.net>,
Jeff King <peff@peff.net>,
git@vger.kernel.org
Subject: Re: [PATCH 3/4] filter-branch: fix --prune-empty on parentless commits
Date: Thu, 02 Mar 2017 11:36:18 -0800 [thread overview]
Message-ID: <xmqqshmvbhe5.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170223213333.GA3490@prospect.localdomain> (Devin J. Pohly's message of "Thu, 23 Feb 2017 15:33:33 -0600")
"Devin J. Pohly" <djpohly@gmail.com> writes:
> 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?
next prev parent reply other threads:[~2017-03-02 19:36 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-23 8:27 [PATCH 1/4] t7003: ensure --prune-empty can prune root commit Devin J. Pohly
2017-02-23 8:27 ` [PATCH 2/4] t7003: ensure --prune-empty removes entire branch when applicable Devin J. Pohly
2017-02-23 8:27 ` [PATCH 3/4] filter-branch: fix --prune-empty on parentless commits Devin J. Pohly
2017-02-23 21:17 ` Junio C Hamano
2017-02-23 21:33 ` Devin J. Pohly
2017-03-02 19:36 ` Junio C Hamano [this message]
2017-03-02 21:18 ` Devin J. Pohly
2017-03-02 21:39 ` Junio C Hamano
2017-03-02 23:28 ` Jacob Keller
2017-03-03 7:55 ` Jeff King
2017-03-03 20:30 ` Devin J. Pohly
2017-03-03 20:43 ` Junio C Hamano
2017-02-23 8:27 ` [PATCH 4/4] p7000: add test for filter-branch with --prune-empty Devin J. Pohly
2017-03-03 7:56 ` Jeff King
2017-03-03 20:34 ` Devin J. Pohly
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=xmqqshmvbhe5.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=cbailey32@bloomberg.net \
--cc=djpohly@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=peff@peff.net \
/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.