From: Jeff King <peff@peff.net>
To: Francis Moreau <francis.moro@gmail.com>
Cc: John Keeping <john@keeping.me.uk>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Transfer notes when rebasing
Date: Wed, 4 Sep 2013 04:49:45 -0400 [thread overview]
Message-ID: <20130904084945.GA22470@sigill.intra.peff.net> (raw)
In-Reply-To: <CAC9WiBg+0PkEeBst6sw5uuCb4-21=zj+XCcjwKWSfAYi-ciqDA@mail.gmail.com>
On Wed, Sep 04, 2013 at 10:47:22AM +0200, Francis Moreau wrote:
> > However, if the commit is dropped because we find while applying that it
> > becomes empty, there is not much we can do. It may have been obsoleted
> > by its counterpart patch that had a different patch-id, or it may even
> > have been obsoleted by unrelated patches. In the latter case, there is
> > nothing to copy to. In the former, you would have to trying to match up
> > the commit messages or similar to guess that the two commits correspond.
>
> Can't git-rebase at least handle the case where a patch and its
> counterpart have the same patch-id ?
Certainly it could. My point was only that it doesn't currently (and it
does not even know what the counterpart is, only that there is one).
> Also maybe git-rebase should warn when dropping a commit having a note
> to tell the user that the note is dropped too.
That might end up annoying, depending on what you use notes for. But
I think if it were restricted to notes that would be rewritten via
notes.rewriteRef, it probably makes sense.
Patches welcome.
-Peff
prev parent reply other threads:[~2013-09-04 8:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-04 7:51 Transfer notes when rebasing Francis Moreau
2013-09-04 7:53 ` Jeff King
2013-09-04 7:59 ` John Keeping
2013-09-04 8:03 ` Francis Moreau
2013-09-04 8:28 ` Jeff King
2013-09-04 8:47 ` Francis Moreau
2013-09-04 8:49 ` Jeff King [this message]
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=20130904084945.GA22470@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=francis.moro@gmail.com \
--cc=git@vger.kernel.org \
--cc=john@keeping.me.uk \
/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).