@matheusbsbs / matheus-bagliano / commits / 497bdc88d6
Fork 0

Switch to run_command_v_opt in revert

Another change by me is removing the va_list variants of run_command, one of which is used by builtin-revert.c. To avoid compile errors I'm refactoring builtin-revert to use the char** variant instead, as that variant is staying. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Shawn O. Pearce committed Mar 10, 2007 at 03:27 UTC 497bdc88d661b3da15fdd5365293381bd66010c9
1 file changed +9 -4
builtin-revert.c
+9 -4
@@ -207,6 +207,7 @@ static int merge_recursive(const char *base_sha1,
207 const char *next_sha1, const char *next_name)
208 {
209 char buffer[256];
210 + const char *argv[6];
211
212 sprintf(buffer, "GITHEAD_%s", head_sha1);
213 setenv(buffer, head_name, 1);
@@ -219,10 +220,14 @@ static int merge_recursive(const char *base_sha1,
220 * and $prev on top of us (when reverting), or the change between
221 * $prev and $commit on top of us (when cherry-picking or replaying).
222 */
222 -
223 - return run_command_opt(RUN_COMMAND_NO_STDIN | RUN_GIT_CMD,
224 - "merge-recursive", base_sha1, "--",
225 - head_sha1, next_sha1, NULL);
223 + argv[0] = "merge-recursive";
224 + argv[1] = base_sha1;
225 + argv[2] = "--";
226 + argv[3] = head_sha1;
227 + argv[4] = next_sha1;
228 + argv[5] = NULL;
229 +
230 + return run_command_v_opt(argv, RUN_COMMAND_NO_STDIN | RUN_GIT_CMD);
231 }
232
233 static int revert_or_cherry_pick(int argc, const char **argv)