mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sequencer: load commit related config

Browse Source 
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>
This commit is contained in:
Phillip Wood
2017-11-24 11:07:56 +00:00
committed by Junio C Hamano
parent b34eeea352
commit b36c590813
4 changed files with 60 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
builtin/rebase--helper.c
View File

@ -9,6 +9,17 @@ static const char * const builtin_rebase_helper_usage[] = {
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;
@ -39,7 +50,7 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
OPT_END()
};
git_config(git_default_config, NULL);
git_config(git_rebase_helper_config, NULL);
opts.action = REPLAY_INTERACTIVE_REBASE;
opts.allow_ff = 1;