From: Sami Boukortt <sami@boukortt.com>
To: Elijah Newren <newren@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Michael Haggerty <mhagger@alum.mit.edu>
Subject: Re: New git-rebase backend: no way to drop already-empty commits
Date: Tue, 7 Apr 2020 20:16:47 +0200 [thread overview]
Message-ID: <CAAb+AL9KaFbOk2eMPbn0zCKC4KfX-chx4O3ndLz=zpdgpq_MVQ@mail.gmail.com> (raw)
In-Reply-To: <CABPp-BE1mDQYcj6nRfS4osn8-E_WdV-Nenn9dQSA+JCr+pjKLQ@mail.gmail.com>
Le mar. 7 avr. 2020 à 20:03, Elijah Newren <newren@gmail.com> a écrit :
>
> On Tue, Apr 7, 2020 at 10:28 AM Sami Boukortt <sami@boukortt.com> wrote:
> >
> > […]
> >
> > Sadly, that is somewhat inconvenient, as those commits are not
> > actually “intentional” from my viewpoint (though I understand that git
> > has no way of knowing this), but rather created by another tool
> > (git-imerge), which means that I have to check each commit
>
> git-imerge creates non-merge commits? Is this in the case when it is
> acting like rebase? If so, is this possibly a bug in git-imerge (in
> that it doesn't drop commits which become empty)?
It is indeed with `git imerge rebase`. I don’t know enough about
git-imerge’s internals to know how easy that would be to fix, but it
does seem as though that would be the ideal approach.
> > individually and risk mistakes. The old `rebase -i` behavior, where
> > such commits were automatically commented out, would be an acceptable
> > compromise, or even a comment added at the end of the commit line (so
> > that they are still kept if the editor is closed without changing the
> > rebase list). If there are plans to eventually remove the “apply”
> > backend, could that workaround be considered?
>
> Automatically commenting them out is bad; that causes frustration for
> people having to uncomment all the commits they intended to add.
>
> But we could add some kind of option.
Instead of automatically commenting them out, how about automatically
annotating them while leaving them in the rebase list, like so:
pick 8441f42 Commit A
pick e3fcaf8 Commit B # empty
pick af34c53 Commit C
> > Alternatively, I could also use `git filter-branch` (with
> > `--prune-empty`), but apparently, its use is heavily discouraged.
>
> You could use
> git filter-repo --prune-empty always
That does seem like it would work, but wouldn’t it process the entire
repository (as opposed to filter-branch which can take a list of
revisions)?
next prev parent reply other threads:[~2020-04-07 18:17 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-07 16:30 New git-rebase backend: no way to drop already-empty commits Sami Boukortt
2020-04-07 16:53 ` Elijah Newren
2020-04-07 17:27 ` Sami Boukortt
2020-04-07 18:03 ` Elijah Newren
2020-04-07 18:16 ` Sami Boukortt [this message]
2020-04-07 18:29 ` Elijah Newren
2020-04-07 17:58 ` Junio C Hamano
2020-04-07 19:43 ` Bryan Turner
2020-04-07 19:45 ` Elijah Newren
2020-04-07 21:55 ` Junio C Hamano
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='CAAb+AL9KaFbOk2eMPbn0zCKC4KfX-chx4O3ndLz=zpdgpq_MVQ@mail.gmail.com' \
--to=sami@boukortt.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--cc=newren@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 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 NNTP newsgroup(s).