From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Christian Couder <chriscool@tuxfamily.org>, git@vger.kernel.org
Subject: Re: [PATCH v1 0/4] replace: add option to edit a Git object
Date: Tue, 29 Apr 2014 14:43:54 -0700 [thread overview]
Message-ID: <xmqqvbtrizfp.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20140429023629.GB11730@sigill.intra.peff.net> (Jeff King's message of "Mon, 28 Apr 2014 22:36:29 -0400")
Jeff King <peff@peff.net> writes:
> On Sat, Apr 26, 2014 at 10:00:53PM +0200, Christian Couder wrote:
>
>> This patch series comes from what Peff sent in the following thread:
>>
>> http://thread.gmane.org/gmane.comp.version-control.git/243361/focus=243528
>
> Thanks. As I recall, these were in pretty good shape, and I just read
> over them again and didn't see anything wrong.
>
>> I added the following fixes:
>>
>> - add "strbuf_release(&result);" in import_object(); this was suggested
>> by Eric Sunshine
>> - use MODE_LIST instead of MODE_DELETE if no arguments are passed; this
>> makes the test suite pass
>> - add "--no-replace-objects" when calling "git cat-file" in export_object();
>> so that we edit the original object if an object is already replaced
>
> All sensible, I think.
>
>> I am not happy with the fact that if the user doesn't modify the object when
>> editing it, then a replace ref can still be created that points to the
>> original object. I think something should be done to avoid that.
>
> Yeah, it should be easy to just hashcmp the sha1s after calling
> import_object. In fact, I think we can just erase any existing replace
> ref in that case (the user might have started with a replace ref and
> converted it _back_ to the original object, for example).
>
>> Once that is fixed, I plan to add some tests and documentation, but I wanted
>> first to let you know that I am looking at this.
>
> Great. Thanks for working on this.
>
> -Peff
Thanks. In the meantime, I'll queue these as-is and push the result
out.
prev parent reply other threads:[~2014-04-29 21:44 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-26 20:00 [PATCH v1 0/4] replace: add option to edit a Git object Christian Couder
2014-04-26 20:00 ` [PATCH v1 1/4] replace: refactor command-mode determination Christian Couder
2014-04-26 20:00 ` [PATCH v1 2/4] replace: use OPT_CMDMODE to handle modes Christian Couder
2014-04-26 20:00 ` [PATCH v1 3/4] replace: factor object resolution out of replace_object Christian Couder
2014-04-26 20:00 ` [PATCH v1 4/4] replace: add --edit option Christian Couder
2014-04-29 2:36 ` [PATCH v1 0/4] replace: add option to edit a Git object Jeff King
2014-04-29 21:43 ` Junio C Hamano [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=xmqqvbtrizfp.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--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.