Re: [PATCH v3 1/9] cherry-pick, revert: add the --gpg-sign option

[Junio C Hamano]

"brian m. carlson" <sand...@crustytoothpaste.net> writes:

> diff --git a/sequencer.c b/sequencer.c
> index 90cac7b..bde5f04 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -392,11 +392,18 @@ static int run_git_commit(const char *defmsg, struct 
> replay_opts *opts,
>  {
>       struct argv_array array;
>       int rc;
> +     char *gpg_sign;
>  
>       argv_array_init(&array);
>       argv_array_push(&array, "commit");
>       argv_array_push(&array, "-n");
>  
> +     if (opts->gpg_sign) {
> +             gpg_sign = xmalloc(3 + strlen(opts->gpg_sign));
> +             sprintf(gpg_sign, "-S%s", opts->gpg_sign);
> +             argv_array_push(&array, gpg_sign);
> +             free(gpg_sign);

Perhaps

        argv_array_pushf(&array, "-S%s", opts->gpg_sign);

without any temporary?  That would save 5 lines in total.

> +     }
>       if (opts->signoff)
>               argv_array_push(&array, "-s");
>       if (!opts->edit) {


diff --git a/sequencer.c b/sequencer.c
index bde5f04..b200dce 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -392,18 +392,13 @@ static int run_git_commit(const char *defmsg, struct 
replay_opts *opts,
 {
        struct argv_array array;
        int rc;
-       char *gpg_sign;
 
        argv_array_init(&array);
        argv_array_push(&array, "commit");
        argv_array_push(&array, "-n");
 
-       if (opts->gpg_sign) {
-               gpg_sign = xmalloc(3 + strlen(opts->gpg_sign));
-               sprintf(gpg_sign, "-S%s", opts->gpg_sign);
-               argv_array_push(&array, gpg_sign);
-               free(gpg_sign);
-       }
+       if (opts->gpg_sign)
+               argv_array_pushf(&array, "-S%s", opts->gpg_sign);
        if (opts->signoff)
                argv_array_push(&array, "-s");
        if (!opts->edit) {
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html