git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v1 0/4] replace: add option to edit a Git object

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 29, 2014, 21:43 UTC
Message-ID
<xmqqvbtrizfp.fsf@gitster.dls.corp.google.com>
In-Reply-To
<20140429023629.GB11730@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
Show 35 quoted lines
> 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.

Previous: Jeff King
Message 7 of 7 in “replace: add option to edit a Git object”
  1. 0/4 replace: add option to edit a Git objectChristian Couder, Apr 26, 2014
  2. 1/4 replace: refactor command-mode determinationChristian Couder, Apr 26, 2014
  3. 2/4 replace: use OPT_CMDMODE to handle modesChristian Couder, Apr 26, 2014
  4. 3/4 replace: factor object resolution out of replace_objectChristian Couder, Apr 26, 2014
  5. 4/4 replace: add --edit optionChristian Couder, Apr 26, 2014
  6. Jeff KingApr 29, 2014
  7. Junio C HamanoApr 29, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.