mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-28 09:16:10 +02:00
Code

sequencer: use run_command() directly 

Instead of using the convenience function run_command_v_opt_cd_env(), we
now use the run_command() function. The former function is simply a
wrapper of the latter, trying to make it more convenient to use.

However, we already have to construct the argv and the env parameters,
and we will need even finer control e.g. over the output of the command,
so let's just stop using the convenience function.

Based on patches and suggestions by Johannes Sixt and Jeff King.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2017-01-02 16:35:29 +01:00 committed by Junio C Hamano
parent a2a20b0d5c
commit 07d968ef14
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sequencer.c
View File

@ -604,12 +604,13 @@ static int run_git_commit(const char *defmsg, struct replay_opts *opts,
int allow_empty, int edit, int amend,
int cleanup_commit_message)
{
struct argv_array env = ARGV_ARRAY_INIT, array;
int rc;
struct child_process cmd = CHILD_PROCESS_INIT;
const char *value;
cmd.git_cmd = 1;
if (is_rebase_i(opts)) {
if (!read_env_script(&env)) {
if (read_env_script(&cmd.env_array)) {
const char *gpg_opt = gpg_sign_opt_quoted(opts);
return error(_(staged_changes_advice),
@ -617,39 +618,34 @@ static int run_git_commit(const char *defmsg, struct replay_opts *opts,
}
}
argv_array_init(&array);
argv_array_push(&array, "commit");
argv_array_push(&array, "-n");
argv_array_push(&cmd.args, "commit");
argv_array_push(&cmd.args, "-n");
if (amend)
argv_array_push(&array, "--amend");
argv_array_push(&cmd.args, "--amend");
if (opts->gpg_sign)
argv_array_pushf(&array, "-S%s", opts->gpg_sign);
argv_array_pushf(&cmd.args, "-S%s", opts->gpg_sign);
if (opts->signoff)
argv_array_push(&array, "-s");
argv_array_push(&cmd.args, "-s");
if (defmsg)
argv_array_pushl(&array, "-F", defmsg, NULL);
argv_array_pushl(&cmd.args, "-F", defmsg, NULL);
if (cleanup_commit_message)
argv_array_push(&array, "--cleanup=strip");
argv_array_push(&cmd.args, "--cleanup=strip");
if (edit)
argv_array_push(&array, "-e");
argv_array_push(&cmd.args, "-e");
else if (!cleanup_commit_message &&
!opts->signoff && !opts->record_origin &&
git_config_get_value("commit.cleanup", &value))
argv_array_push(&array, "--cleanup=verbatim");
argv_array_push(&cmd.args, "--cleanup=verbatim");
if (allow_empty)
argv_array_push(&array, "--allow-empty");
argv_array_push(&cmd.args, "--allow-empty");
if (opts->allow_empty_message)
argv_array_push(&array, "--allow-empty-message");
argv_array_push(&cmd.args, "--allow-empty-message");
rc = run_command_v_opt_cd_env(array.argv, RUN_GIT_CMD, NULL,
(const char *const *)env.argv);
argv_array_clear(&array);
argv_array_clear(&env);
return rc;
return run_command(&cmd);
}
static int is_original_commit_empty(struct commit *commit)