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 <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder committed
Jun 14, 2010 at 00:32 UTC
e0ef8495e98ae5ae796ec23bf438eef413557193
2 files changed
+34
-16
builtin/revert.c
+16
-16
@@ -50,10 +50,14 @@ static const char *strategy;
50
51
static char *get_encoding(const char *message);
52
53
+static const char * const *revert_or_cherry_pick_usage(void)
54
+{
55
+ return action == REVERT ? revert_usage : cherry_pick_usage;
56
+}
57
+
58
static void parse_args(int argc, const char **argv)
59
{
55
- const char * const * usage_str =
56
- action == REVERT ? revert_usage : cherry_pick_usage;
60
+ const char * const * usage_str = revert_or_cherry_pick_usage();
61
int noop;
62
struct option options[] = {
63
OPT_BOOLEAN('n', "no-commit", &no_commit, "don't automatically commit"),
@@ -79,8 +83,9 @@ static void parse_args(int argc, const char **argv)
83
}
84
85
commit_argc = parse_options(argc, argv, NULL, options, usage_str,
86
+ PARSE_OPT_KEEP_ARGV0 |
87
PARSE_OPT_KEEP_UNKNOWN);
83
- if (commit_argc < 1)
88
+ if (commit_argc < 2)
89
usage_with_options(usage_str, options);
90
91
commit_argv = argv;
@@ -526,27 +531,22 @@ static int do_pick_commit(void)
531
532
static void prepare_revs(struct rev_info *revs)
533
{
529
- int argc = 0;
530
- int i;
531
- const char **argv = xmalloc((commit_argc + 4) * sizeof(*argv));
534
+ int argc;
535
533
- argv[argc++] = NULL;
534
- argv[argc++] = "--no-walk";
536
+ init_revisions(revs, NULL);
537
+ revs->no_walk = 1;
538
if (action != REVERT)
536
- argv[argc++] = "--reverse";
537
- for (i = 0; i < commit_argc; i++)
538
- argv[argc++] = commit_argv[i];
539
- argv[argc++] = NULL;
539
+ revs->reverse = 1;
540
+
541
+ argc = setup_revisions(commit_argc, commit_argv, revs, NULL);
542
+ if (argc > 1)
543
+ usage(*revert_or_cherry_pick_usage());
544
541
- init_revisions(revs, NULL);
542
- setup_revisions(argc - 1, argv, revs, NULL);
545
if (prepare_revision_walk(revs))
546
die("revision walk setup failed");
547
548
if (!revs->commits)
549
die("empty commit set passed");
548
-
549
- free(argv);
550
}
551
552
static int revert_or_cherry_pick(int argc, const char **argv)
t/t3501-revert-cherry-pick.sh
+18
@@ -41,6 +41,24 @@ test_expect_success setup '
41
git tag rename2
42
'
43
44
+test_expect_success 'cherry-pick --nonsense' '
45
+
46
+ pos=$(git rev-parse HEAD) &&
47
+ git diff --exit-code HEAD &&
48
+ test_must_fail git cherry-pick --nonsense 2>msg &&
49
+ git diff --exit-code HEAD "$pos" &&
50
+ grep '[Uu]sage:' msg
51
+'
52
+
53
+test_expect_success 'revert --nonsense' '
54
+
55
+ pos=$(git rev-parse HEAD) &&
56
+ git diff --exit-code HEAD &&
57
+ test_must_fail git revert --nonsense 2>msg &&
58
+ git diff --exit-code HEAD "$pos" &&
59
+ grep '[Uu]sage:' msg
60
+'
61
+
62
test_expect_success 'cherry-pick after renaming branch' '
63
64
git checkout rename2 &&