cherry-pick, revert: add the --gpg-sign option

Signed-off-by: Nicolas Vigier <boklm@mars-attacks.org>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index c205d2363e426ed6b1a91df2b8d9b4a3c576a5ea..f1e6b2fd6d15809f5180fe705c3d571bf247ff1d 100644 (file)
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -8,7 +8,8 @@ git-cherry-pick - Apply the changes introduced by some existing commits
 SYNOPSIS
 --------
 [verse]
 SYNOPSIS
 --------
 [verse]

-'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] <commit>...
+'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]
+                 [-S[<keyid>]] <commit>...

 'git cherry-pick' --continue
 'git cherry-pick' --quit
 'git cherry-pick' --abort
 'git cherry-pick' --continue
 'git cherry-pick' --quit
 'git cherry-pick' --abort


@@ -100,6 +101,10 @@ effect to your index in a row.
 --signoff::
        Add Signed-off-by line at the end of the commit message.
 
 --signoff::
        Add Signed-off-by line at the end of the commit message.
 

+-S[<keyid>]::
+--gpg-sign[=<keyid>]::
+       GPG-sign commits.
+

 --ff::
        If the current HEAD is the same as the parent of the
        cherry-pick'ed commit, then a fast forward to this commit will
 --ff::
        If the current HEAD is the same as the parent of the
        cherry-pick'ed commit, then a fast forward to this commit will

diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index 2de67a54962b2f04f1f497344286fd17918433f3..9eb83f01a4513ae3503258067133cae99189d39e 100644 (file)
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt
@@ -8,7 +8,7 @@ git-revert - Revert some existing commits
 SYNOPSIS
 --------
 [verse]
 SYNOPSIS
 --------
 [verse]

-'git revert' [--[no-]edit] [-n] [-m parent-number] [-s] <commit>...
+'git revert' [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<keyid>]] <commit>...

 'git revert' --continue
 'git revert' --quit
 'git revert' --abort
 'git revert' --continue
 'git revert' --quit
 'git revert' --abort


@@ -80,6 +80,10 @@ more details.
 This is useful when reverting more than one commits'
 effect to your index in a row.
 
 This is useful when reverting more than one commits'
 effect to your index in a row.
 

+-S[<keyid>]::
+--gpg-sign[=<keyid>]::
+       GPG-sign commits.
+

 -s::
 --signoff::
        Add Signed-off-by line at the end of the commit message.
 -s::
 --signoff::
        Add Signed-off-by line at the end of the commit message.

diff --git a/builtin/revert.c b/builtin/revert.c
index 87659c9fdb749bf8cbf33ce71391fdfe284edd6d..065d88dd05ea65d6e53e617417555399920f8afd 100644 (file)
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -89,6 +89,8 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts)
                OPT_STRING(0, "strategy", &opts->strategy, N_("strategy"), N_("merge strategy")),
                OPT_CALLBACK('X', "strategy-option", &opts, N_("option"),
                        N_("option for merge strategy"), option_parse_x),
                OPT_STRING(0, "strategy", &opts->strategy, N_("strategy"), N_("merge strategy")),
                OPT_CALLBACK('X', "strategy-option", &opts, N_("option"),
                        N_("option for merge strategy"), option_parse_x),

+               { OPTION_STRING, 'S', "gpg-sign", &opts->gpg_sign, N_("key id"),
+                 N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },

                OPT_END(),
                OPT_END(),
                OPT_END(),
                OPT_END(),
                OPT_END(),
                OPT_END(),

diff --git a/sequencer.c b/sequencer.c
index 90cac7b02eef1e9f681f5dc58bc26becaaf5ac12..bde5f047b01376e05255a55516d3bdd261f497ea 100644 (file)
--- 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;
 {
        struct argv_array array;
        int rc;

+       char *gpg_sign;

 
        argv_array_init(&array);
        argv_array_push(&array, "commit");
        argv_array_push(&array, "-n");
 
 
        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->signoff)
                argv_array_push(&array, "-s");
        if (!opts->edit) {
        if (opts->signoff)
                argv_array_push(&array, "-s");
        if (!opts->edit) {


@@ -808,6 +815,8 @@ static int populate_opts_cb(const char *key, const char *value, void *data)
                opts->mainline = git_config_int(key, value);
        else if (!strcmp(key, "options.strategy"))
                git_config_string(&opts->strategy, key, value);
                opts->mainline = git_config_int(key, value);
        else if (!strcmp(key, "options.strategy"))
                git_config_string(&opts->strategy, key, value);

+       else if (!strcmp(key, "options.gpg-sign"))
+               git_config_string(&opts->gpg_sign, key, value);

        else if (!strcmp(key, "options.strategy-option")) {
                ALLOC_GROW(opts->xopts, opts->xopts_nr + 1, opts->xopts_alloc);
                opts->xopts[opts->xopts_nr++] = xstrdup(value);
        else if (!strcmp(key, "options.strategy-option")) {
                ALLOC_GROW(opts->xopts, opts->xopts_nr + 1, opts->xopts_alloc);
                opts->xopts[opts->xopts_nr++] = xstrdup(value);


@@ -981,6 +990,8 @@ static void save_opts(struct replay_opts *opts)
        }
        if (opts->strategy)
                git_config_set_in_file(opts_file, "options.strategy", opts->strategy);
        }
        if (opts->strategy)
                git_config_set_in_file(opts_file, "options.strategy", opts->strategy);

+       if (opts->gpg_sign)
+               git_config_set_in_file(opts_file, "options.gpg-sign", opts->gpg_sign);

        if (opts->xopts) {
                int i;
                for (i = 0; i < opts->xopts_nr; i++)
        if (opts->xopts) {
                int i;
                for (i = 0; i < opts->xopts_nr; i++)

diff --git a/sequencer.h b/sequencer.h
index 1fc22dcabe132cd437e7b0d3c56588c8cd7e63f2..db43e9cf86dcc0914a674adca63303c44e2ccc24 100644 (file)
--- a/sequencer.h
+++ b/sequencer.h
@@ -37,6 +37,8 @@ struct replay_opts {
 
        int mainline;
 
 
        int mainline;
 

+       const char *gpg_sign;
+

        /* Merge strategy */
        const char *strategy;
        const char **xopts;
        /* Merge strategy */
        const char *strategy;
        const char **xopts;