From: Junio C Hamano <gitster@pobox.com>
To: Christian Couder <chriscool@tuxfamily.org>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
Michael Haggerty <mhagger@alum.mit.edu>,
Jakub Narebski <jnareb@gmail.com>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH v6 09/10] replace: check mergetags when using --graft
Date: Mon, 07 Jul 2014 15:28:13 -0700 [thread overview]
Message-ID: <xmqqion8by82.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20140707063540.3708.29773.chriscool@tuxfamily.org> (Christian Couder's message of "Mon, 07 Jul 2014 08:35:38 +0200")
Christian Couder <chriscool@tuxfamily.org> writes:
> When using --graft, with a mergetag in the original
> commit, we should check that the commit pointed to by
> the mergetag is still a parent of then new commit we
> create, otherwise the mergetag could be misleading.
>
> If the commit pointed to by the mergetag is no more
> a parent of the new commit, we could remove the
> mergetag, but in this case there is a good chance
> that the title or other elements of the commit might
> also be misleading. So let's just error out and
> suggest to use --edit instead on the commit.
I do not quite understand the reasoning. If you have a merge you
earlier made with a signed tag, and then want to redo the merge with
an updated tip of that branch (perhaps the side branch was earlier
based on maint but now was rebased on master), it will perfectly be
normal to expect that the title or other elements of the resulting
merge to stay the same. Why is it a good idea to error it out?
If the argument were '"replace --graft" that changes the parents is
likely to affect merge summary message, so error out and suggest to
use --edit instead', regardless of the 'mergetag', I'd understand
it, but that would essentially mean that 'replace --graft' should
never be used, so...
next prev parent reply other threads:[~2014-07-07 22:28 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-07 6:35 [PATCH v6 00/10] Add --graft option to git replace Christian Couder
2014-07-07 6:35 ` [PATCH v6 01/10] replace: cleanup redirection style in tests Christian Couder
2014-07-07 6:35 ` [PATCH v6 02/10] replace: add --graft option Christian Couder
2014-07-09 14:59 ` Junio C Hamano
2014-07-10 9:30 ` Christian Couder
2014-07-10 16:51 ` Junio C Hamano
2014-07-10 17:36 ` Junio C Hamano
2014-07-11 8:59 ` Christian Couder
2014-07-11 14:22 ` Junio C Hamano
2014-07-11 16:24 ` Christian Couder
2014-07-11 18:25 ` Junio C Hamano
2014-07-11 18:29 ` Jeff King
2014-07-07 6:35 ` [PATCH v6 03/10] replace: add test for --graft Christian Couder
2014-07-07 22:16 ` Junio C Hamano
2014-07-08 5:36 ` Christian Couder
2014-07-07 6:35 ` [PATCH v6 04/10] Documentation: replace: add --graft option Christian Couder
2014-07-07 6:35 ` [PATCH v6 05/10] contrib: add convert-grafts-to-replace-refs.sh Christian Couder
2014-07-07 6:35 ` [PATCH v6 06/10] replace: remove signature when using --graft Christian Couder
2014-07-07 6:35 ` [PATCH v6 07/10] replace: add test for --graft with signed commit Christian Couder
2014-07-07 6:35 ` [PATCH v6 08/10] commit: add for_each_mergetag() Christian Couder
2014-07-07 22:30 ` Junio C Hamano
2014-07-08 5:53 ` Christian Couder
2014-07-07 6:35 ` [PATCH v6 09/10] replace: check mergetags when using --graft Christian Couder
2014-07-07 22:28 ` Junio C Hamano [this message]
2014-07-08 5:35 ` Christian Couder
2014-07-07 6:35 ` [PATCH v6 10/10] replace: add test for --graft with a mergetag Christian Couder
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=xmqqion8by82.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.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 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.