From: Jeff King <peff@peff.net>
To: Christian Couder <chriscool@tuxfamily.org>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH v2 05/10] replace: make sure --edit results in a different object
Date: Sat, 17 May 2014 03:03:40 -0400 [thread overview]
Message-ID: <20140517070339.GC13003@sigill.intra.peff.net> (raw)
In-Reply-To: <20140517064133.18932.27058.chriscool@tuxfamily.org>
On Sat, May 17, 2014 at 08:41:27AM +0200, Christian Couder wrote:
> It's a bad idea to create a replace ref for an object
> that points to the original object itself.
>
> That's why we have to check if the result from editing
> the original object is a different object and error out
> if it isn't.
I think that's reasonable.
Another option, which I think I mentioned earlier, would be to delete
any existing replacement ref, and return success. So you could use that
to "revert" a replaced object back to its original non-replaced form.
On a similar note, we might want to consider what happens when you
"--edit" an object which already has a replacement. Right now you end up
editing the _original_ object. I wonder if it would make sense to start
the editor with the contents of the replacement object (in which case
you might even "revert" without realizing it).
But those can easily come later if somebody feels like working on them.
Erroring out is not that bad an outcome, since the user can then "git
replace -d" themselves if they want to.
-Peff
next prev parent reply other threads:[~2014-05-17 7:03 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-17 6:41 [PATCH v2 00/10] replace: add option to edit a Git object Christian Couder
2014-05-17 6:41 ` [PATCH v2 01/10] replace: refactor command-mode determination Christian Couder
2014-05-17 6:41 ` [PATCH v2 02/10] replace: use OPT_CMDMODE to handle modes Christian Couder
2014-05-17 6:41 ` [PATCH v2 03/10] replace: factor object resolution out of replace_object Christian Couder
2014-05-17 6:41 ` [PATCH v2 04/10] replace: add --edit option Christian Couder
2014-05-17 6:41 ` [PATCH v2 05/10] replace: make sure --edit results in a different object Christian Couder
2014-05-17 7:03 ` Jeff King [this message]
2014-05-17 6:41 ` [PATCH v2 06/10] replace: refactor checking ref validity Christian Couder
2014-05-17 6:41 ` [PATCH v2 07/10] replace: die early if replace ref already exists Christian Couder
2014-05-17 7:05 ` Jeff King
2014-05-17 6:41 ` [PATCH v2 08/10] replace: add tests for --edit Christian Couder
2014-05-17 7:14 ` Jeff King
2014-05-17 6:41 ` [PATCH v2 09/10] replace: add --edit to usage string Christian Couder
2014-05-17 6:41 ` [PATCH v2 10/10] Documentation: replace: describe new --edit option Christian Couder
2014-05-17 7:23 ` Jeff King
2014-05-17 7:24 ` [PATCH v2 00/10] replace: add option to edit a Git object Jeff King
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=20140517070339.GC13003@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).