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 v5 5/7] replace: refactor replacing parents
Date: Wed, 02 Jul 2014 14:05:49 -0700 [thread overview]
Message-ID: <xmqqtx6zfp3m.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20140628181117.5687.43446.chriscool@tuxfamily.org> (Christian Couder's message of "Sat, 28 Jun 2014 20:11:14 +0200")
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?
> {
> - unsigned char old[20], new[20];
> - const char *old_ref = argv[0];
> - struct commit *commit;
> - struct strbuf buf = STRBUF_INIT;
> struct strbuf new_parents = STRBUF_INIT;
> const char *parent_start, *parent_end;
> - const char *buffer;
> - unsigned long size;
> int i;
>
> - if (get_sha1(old_ref, old) < 0)
> - die(_("Not a valid object name: '%s'"), old_ref);
> - commit = lookup_commit_or_die(old, old_ref);
> -
> /* find existing parents */
> - buffer = get_commit_buffer(commit, &size);
> - strbuf_add(&buf, buffer, size);
> - unuse_commit_buffer(commit, buffer);
> - parent_start = buf.buf;
> + parent_start = buf->buf;
> parent_start += 46; /* "tree " + "hex sha1" + "\n" */
> parent_end = parent_start;
>
> @@ -332,13 +319,34 @@ static int create_graft(int argc, const char **argv, int force)
> }
>
> /* replace existing parents with new ones */
> - strbuf_splice(&buf, parent_start - buf.buf, parent_end - parent_start,
> + strbuf_splice(buf, parent_start - buf->buf, parent_end - parent_start,
> new_parents.buf, new_parents.len);
>
> + strbuf_release(&new_parents);
> +}
> +
> +static int create_graft(int argc, const char **argv, int force)
> +{
> + unsigned char old[20], new[20];
> + const char *old_ref = argv[0];
> + struct commit *commit;
> + struct strbuf buf = STRBUF_INIT;
> + const char *buffer;
> + unsigned long size;
> +
> + if (get_sha1(old_ref, old) < 0)
> + die(_("Not a valid object name: '%s'"), old_ref);
> + commit = lookup_commit_or_die(old, old_ref);
> +
> + buffer = get_commit_buffer(commit, &size);
> + strbuf_add(&buf, buffer, size);
> + unuse_commit_buffer(commit, buffer);
> +
> + replace_parents(&buf, argc, argv);
> +
> if (write_sha1_file(buf.buf, buf.len, commit_type, new))
> die(_("could not write replacement commit for: '%s'"), old_ref);
>
> - strbuf_release(&new_parents);
> strbuf_release(&buf);
>
> if (!hashcmp(old, new))
next prev parent reply other threads:[~2014-07-02 21:06 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-28 18:11 [PATCH v5 0/7] Add --graft option to git replace Christian Couder
2014-06-28 18:11 ` [PATCH v5 1/7] replace: add --graft option Christian Couder
2014-06-28 18:11 ` [PATCH v5 2/7] replace: add test for --graft Christian Couder
2014-07-02 20:49 ` Junio C Hamano
2014-07-03 13:39 ` Christian Couder
2014-07-03 18:45 ` Junio C Hamano
2014-06-28 18:11 ` [PATCH v5 3/7] Documentation: replace: add --graft option Christian Couder
2014-06-28 18:11 ` [PATCH v5 4/7] contrib: add convert-grafts-to-replace-refs.sh Christian Couder
2014-06-28 18:11 ` [PATCH v5 5/7] replace: refactor replacing parents Christian Couder
2014-07-02 21:05 ` Junio C Hamano [this message]
2014-07-03 13:42 ` Christian Couder
2014-06-28 18:11 ` [PATCH v5 6/7] replace: remove signature when using --graft Christian Couder
2014-07-02 21:19 ` Junio C Hamano
2014-07-03 14:09 ` Christian Couder
2014-06-28 18:11 ` [PATCH v5 7/7] replace: add test for --graft with signed commit Christian Couder
2014-07-02 21:22 ` Junio C Hamano
2014-07-03 14:17 ` 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=xmqqtx6zfp3m.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=chriscool@tuxfamily$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=jnareb@gmail$(echo .)com \
--cc=mhagger@alum$(echo .)mit.edu \
--cc=peff@peff$(echo .)net \
--cc=sunshine@sunshineco$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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