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

Re: [PATCH v5 5/7] replace: refactor replacing parents

From
Christian Couder <christian.couder@gmail.com>
Date
Jul 3, 2014, 13:42 UTC
Message-ID
<CAP8UFD3wSxYVuwSLApQikEbXgsvU2H=6PQ-tmvRjdBinDNmGVA@mail.gmail.com>
In-Reply-To
<xmqqtx6zfp3m.fsf@gitster.dls.corp.google.com>
On Wed, Jul 2, 2014 at 11:05 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 21 quoted lines
> Christian Couder <chriscool@tuxfamily.org> writes:
>
>> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
>> ---
>>  builtin/replace.c | 42 +++++++++++++++++++++++++-----------------
>>  1 file changed, 25 insertions(+), 17 deletions(-)
>>
>> diff --git a/builtin/replace.c b/builtin/replace.c
>> index 3515979..ad47237 100644
>> --- a/builtin/replace.c
>> +++ b/builtin/replace.c
>> @@ -295,27 +295,14 @@ static int edit_and_replace(const char *object_ref, int force)
>>       return replace_object_sha1(object_ref, old, "replacement", new, force);
>>  }
>>
>> -static int create_graft(int argc, const char **argv, int force)
>> +static void replace_parents(struct strbuf *buf, int argc, const char **argv)
>
> It is somewhat strange to see that a new function introduced earlier
> in the series is rewritten with a "refactoring".  Shouldn't the new
> function have been done right from the beginning instead?
Yeah, I will do it right from the beginning in the next patch series.
Previous: Junio C HamanoNext: Christian Couder
Message 11 of 17 in “Add --graft option to git replace”
  1. 0/7 Add --graft option to git replaceChristian Couder, Jun 28, 2014
  2. 1/7 replace: add --graft optionChristian Couder, Jun 28, 2014
  3. 2/7 replace: add test for --graftChristian Couder, Jun 28, 2014
  4. Junio C HamanoJul 2, 2014
  5. Christian CouderJul 3, 2014
  6. Junio C HamanoJul 3, 2014
  7. 3/7 Documentation: replace: add --graft optionChristian Couder, Jun 28, 2014
  8. 4/7 contrib: add convert-grafts-to-replace-refs.shChristian Couder, Jun 28, 2014
  9. 5/7 replace: refactor replacing parentsChristian Couder, Jun 28, 2014
  10. Junio C HamanoJul 2, 2014
  11. Christian CouderJul 3, 2014
  12. 6/7 replace: remove signature when using --graftChristian Couder, Jun 28, 2014
  13. Junio C HamanoJul 2, 2014
  14. Christian CouderJul 3, 2014
  15. 7/7 replace: add test for --graft with signed commitChristian Couder, Jun 28, 2014
  16. Junio C HamanoJul 2, 2014
  17. Christian CouderJul 3, 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.