sequencer: load commit related config

Load default values for message cleanup and gpg signing of commits in
preparation for committing without forking 'git commit'. Note that we
interpret commit.cleanup=scissors to mean COMMIT_MSG_CLEANUP_SPACE to
be consistent with 'git commit'

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/rebase--helper.c b/builtin/rebase--helper.c
index f8519363a393862b6857acab037e74367c7f2134..68194d3aed950f327a8bc624fa1991478dfea01e 100644 (file)
--- a/builtin/rebase--helper.c
+++ b/builtin/rebase--helper.c
@@ -9,6 +9,17 @@ static const char * const builtin_rebase_helper_usage[] = {
        NULL
 };
 
        NULL
 };
 

+static int git_rebase_helper_config(const char *k, const char *v, void *cb)
+{
+       int status;
+
+       status = git_sequencer_config(k, v, NULL);
+       if (status)
+               return status;
+
+       return git_default_config(k, v, NULL);
+}
+

 int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
 {
        struct replay_opts opts = REPLAY_OPTS_INIT;
 int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
 {
        struct replay_opts opts = REPLAY_OPTS_INIT;


@@ -39,7 +50,7 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
                OPT_END()
        };
 
                OPT_END()
        };
 

-       git_config(git_default_config, NULL);
+       git_config(git_rebase_helper_config, NULL);

 
        opts.action = REPLAY_INTERACTIVE_REBASE;
        opts.allow_ff = 1;
 
        opts.action = REPLAY_INTERACTIVE_REBASE;
        opts.allow_ff = 1;

diff --git a/builtin/revert.c b/builtin/revert.c
index b9d927eb09c9ed87c84681df1396f4e6d9b13c97..1938825efa6ad20ede5aba57f097863aeb33d1d5 100644 (file)
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -31,6 +31,17 @@ static const char * const cherry_pick_usage[] = {
        NULL
 };
 
        NULL
 };
 

+static int common_config(const char *k, const char *v, void *cb)
+{
+       int status;
+
+       status = git_sequencer_config(k, v, NULL);
+       if (status)
+               return status;
+
+       return git_default_config(k, v, NULL);
+}
+

 static const char *action_name(const struct replay_opts *opts)
 {
        return opts->action == REPLAY_REVERT ? "revert" : "cherry-pick";
 static const char *action_name(const struct replay_opts *opts)
 {
        return opts->action == REPLAY_REVERT ? "revert" : "cherry-pick";


@@ -208,7 +219,7 @@ int cmd_revert(int argc, const char **argv, const char *prefix)
        if (isatty(0))
                opts.edit = 1;
        opts.action = REPLAY_REVERT;
        if (isatty(0))
                opts.edit = 1;
        opts.action = REPLAY_REVERT;

-       git_config(git_default_config, NULL);
+       git_config(common_config, NULL);

        res = run_sequencer(argc, argv, &opts);
        if (res < 0)
                die(_("revert failed"));
        res = run_sequencer(argc, argv, &opts);
        if (res < 0)
                die(_("revert failed"));


@@ -221,7 +232,7 @@ int cmd_cherry_pick(int argc, const char **argv, const char *prefix)
        int res;
 
        opts.action = REPLAY_PICK;
        int res;
 
        opts.action = REPLAY_PICK;

-       git_config(git_default_config, NULL);
+       git_config(common_config, NULL);

        res = run_sequencer(argc, argv, &opts);
        if (res < 0)
                die(_("cherry-pick failed"));
        res = run_sequencer(argc, argv, &opts);
        if (res < 0)
                die(_("cherry-pick failed"));

diff --git a/sequencer.c b/sequencer.c
index a9e0ad49fb1707077ba5261877d8f40d705ab2f4..22392d954bac237b3aedd99b68090069a0b27dc8 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -688,6 +688,40 @@ static int run_git_commit(const char *defmsg, struct replay_opts *opts,
        return run_command(&cmd);
 }
 
        return run_command(&cmd);
 }
 

+static enum commit_msg_cleanup_mode default_msg_cleanup =
+                                               COMMIT_MSG_CLEANUP_NONE;
+static char *default_gpg_sign;
+
+int git_sequencer_config(const char *k, const char *v, void *cb)
+{
+       if (!strcmp(k, "commit.cleanup")) {
+               int status;
+               const char *s;
+
+               status = git_config_string(&s, k, v);
+               if (status)
+                       return status;
+
+               if (!strcmp(s, "verbatim"))
+                       default_msg_cleanup = COMMIT_MSG_CLEANUP_NONE;
+               else if (!strcmp(s, "whitespace"))
+                       default_msg_cleanup = COMMIT_MSG_CLEANUP_SPACE;
+               else if (!strcmp(s, "strip"))
+                       default_msg_cleanup = COMMIT_MSG_CLEANUP_ALL;
+               else if (!strcmp(s, "scissors"))
+                       default_msg_cleanup = COMMIT_MSG_CLEANUP_SPACE;
+
+               return status;
+       }
+
+       if (!strcmp(k, "commit.gpgsign")) {
+               default_gpg_sign = git_config_bool(k, v) ? "" : NULL;
+               return 0;
+       }
+
+       return git_gpg_config(k, v, NULL);
+}
+

 static int rest_is_empty(const struct strbuf *sb, int start)
 {
        int i, eol;
 static int rest_is_empty(const struct strbuf *sb, int start)
 {
        int i, eol;

diff --git a/sequencer.h b/sequencer.h
index 4f616c61a3f3869daf9f427b978c308d6094a978..77cb174b2aaf3972ebb9e6ec379252be96dedd3d 100644 (file)
--- a/sequencer.h
+++ b/sequencer.h
@@ -57,6 +57,7 @@ extern const char sign_off_header[];
 
 void append_signoff(struct strbuf *msgbuf, int ignore_footer, unsigned flag);
 void append_conflicts_hint(struct strbuf *msgbuf);
 
 void append_signoff(struct strbuf *msgbuf, int ignore_footer, unsigned flag);
 void append_conflicts_hint(struct strbuf *msgbuf);

+int git_sequencer_config(const char *k, const char *v, void *cb);

 
 enum commit_msg_cleanup_mode {
        COMMIT_MSG_CLEANUP_SPACE,
 
 enum commit_msg_cleanup_mode {
        COMMIT_MSG_CLEANUP_SPACE,