undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert: use run_command_v_opt() instead of execv_git_cmd()

Browse Source 
This is needed by the following commits, because we are going
to cherry pick many commits instead of just one.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder 2010-06-02 07:58:35 +02:00 committed by Junio C Hamano
parent 831244bd0d
commit 2fb0e14f40
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builtin/revert.c
View File

@ -508,6 +508,8 @@ static int revert_or_cherry_pick(int argc, const char **argv)
} }
} }
free_message(&msg);
/* /*
* *
* If we are cherry-pick, and if the merge did not result in * If we are cherry-pick, and if the merge did not result in
@ -520,7 +522,9 @@ static int revert_or_cherry_pick(int argc, const char **argv)
if (!no_commit) { if (!no_commit) {
/* 6 is max possible length of our args array including NULL */ /* 6 is max possible length of our args array including NULL */
const char *args[6]; const char *args[6];
int res;
int i = 0; int i = 0;
args[i++] = "commit"; args[i++] = "commit";
args[i++] = "-n"; args[i++] = "-n";
if (signoff) if (signoff)
@ -530,9 +534,12 @@ static int revert_or_cherry_pick(int argc, const char **argv)
args[i++] = defmsg; args[i++] = defmsg;
} }
args[i] = NULL; args[i] = NULL;
return execv_git_cmd(args); res = run_command_v_opt(args, RUN_GIT_CMD);
free(defmsg);
return res;
} }
free_message(&msg);
free(defmsg); free(defmsg);
return 0; return 0;