From e0ef8495e98ae5ae796ec23bf438eef413557193 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Mon, 14 Jun 2010 00:32:09 -0500 Subject: [PATCH] revert: do not rebuild argv on heap Set options in struct rev_info directly so we can reuse the arguments collected from parse_options without modification. This is just a cleanup; no noticeable change is intended. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- builtin/revert.c | 32 ++++++++++++++++---------------- t/t3501-revert-cherry-pick.sh | 18 ++++++++++++++++++ 2 files changed, 34 insertions(+), 16 deletions(-) diff --git a/builtin/revert.c b/builtin/revert.c index 3f4a20edd0..8b9d829a73 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -50,10 +50,14 @@ static const char *strategy; static char *get_encoding(const char *message); +static const char * const *revert_or_cherry_pick_usage(void) +{ + return action == REVERT ? revert_usage : cherry_pick_usage; +} + static void parse_args(int argc, const char **argv) { - const char * const * usage_str = - action == REVERT ? revert_usage : cherry_pick_usage; + const char * const * usage_str = revert_or_cherry_pick_usage(); int noop; struct option options[] = { OPT_BOOLEAN('n', "no-commit", &no_commit, "don't automatically commit"), @@ -79,8 +83,9 @@ static void parse_args(int argc, const char **argv) } commit_argc = parse_options(argc, argv, NULL, options, usage_str, + PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN); - if (commit_argc < 1) + if (commit_argc < 2) usage_with_options(usage_str, options); commit_argv = argv; @@ -526,27 +531,22 @@ static int do_pick_commit(void) static void prepare_revs(struct rev_info *revs) { - int argc = 0; - int i; - const char **argv = xmalloc((commit_argc + 4) * sizeof(*argv)); + int argc; - argv[argc++] = NULL; - argv[argc++] = "--no-walk"; + init_revisions(revs, NULL); + revs->no_walk = 1; if (action != REVERT) - argv[argc++] = "--reverse"; - for (i = 0; i < commit_argc; i++) - argv[argc++] = commit_argv[i]; - argv[argc++] = NULL; + revs->reverse = 1; + + argc = setup_revisions(commit_argc, commit_argv, revs, NULL); + if (argc > 1) + usage(*revert_or_cherry_pick_usage()); - init_revisions(revs, NULL); - setup_revisions(argc - 1, argv, revs, NULL); if (prepare_revision_walk(revs)) die("revision walk setup failed"); if (!revs->commits) die("empty commit set passed"); - - free(argv); } static int revert_or_cherry_pick(int argc, const char **argv) diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh index 7f858151d4..f61c54dfe2 100755 --- a/t/t3501-revert-cherry-pick.sh +++ b/t/t3501-revert-cherry-pick.sh @@ -41,6 +41,24 @@ test_expect_success setup ' git tag rename2 ' +test_expect_success 'cherry-pick --nonsense' ' + + pos=$(git rev-parse HEAD) && + git diff --exit-code HEAD && + test_must_fail git cherry-pick --nonsense 2>msg && + git diff --exit-code HEAD "$pos" && + grep '[Uu]sage:' msg +' + +test_expect_success 'revert --nonsense' ' + + pos=$(git rev-parse HEAD) && + git diff --exit-code HEAD && + test_must_fail git revert --nonsense 2>msg && + git diff --exit-code HEAD "$pos" && + grep '[Uu]sage:' msg +' + test_expect_success 'cherry-pick after renaming branch' ' git checkout rename2 && -- 2.11.4.GIT