summaryrefslogtreecommitdiff
path: root/builtin-revert.c
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-03-10 08:27:28 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-03-12 05:49:25 (GMT)
commit497bdc88d661b3da15fdd5365293381bd66010c9 (patch)
tree9dd080f5b50c2ca9eefdcc28cbbb0e17c0e92270 /builtin-revert.c
parent538778469ca267c8888bc659d20680c3a1e077fd (diff)
downloadgit-497bdc88d661b3da15fdd5365293381bd66010c9.zip
git-497bdc88d661b3da15fdd5365293381bd66010c9.tar.gz
git-497bdc88d661b3da15fdd5365293381bd66010c9.tar.bz2
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>
Diffstat (limited to 'builtin-revert.c')
-rw-r--r--builtin-revert.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/builtin-revert.c b/builtin-revert.c
index 2f2dc1b..652eece 100644
--- a/builtin-revert.c
+++ b/builtin-revert.c
@@ -207,6 +207,7 @@ static int merge_recursive(const char *base_sha1,
const char *next_sha1, const char *next_name)
{
char buffer[256];
+ const char *argv[6];
sprintf(buffer, "GITHEAD_%s", head_sha1);
setenv(buffer, head_name, 1);
@@ -219,10 +220,14 @@ static int merge_recursive(const char *base_sha1,
* and $prev on top of us (when reverting), or the change between
* $prev and $commit on top of us (when cherry-picking or replaying).
*/
-
- return run_command_opt(RUN_COMMAND_NO_STDIN | RUN_GIT_CMD,
- "merge-recursive", base_sha1, "--",
- head_sha1, next_sha1, NULL);
+ argv[0] = "merge-recursive";
+ argv[1] = base_sha1;
+ argv[2] = "--";
+ argv[3] = head_sha1;
+ argv[4] = next_sha1;
+ argv[5] = NULL;
+
+ return run_command_v_opt(argv, RUN_COMMAND_NO_STDIN | RUN_GIT_CMD);
}
static int revert_or_cherry_pick(int argc, const char **argv)