development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-02 14:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert: do not rebuild argv on heap

Browse source 
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>
This commit is contained in:
Jonathan Nieder 2010-06-14 00:32:09 -05:00 committed by Junio C Hamano
parent 65281b70ca
commit e0ef8495e9
2 changed files with 35 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
builtin/revert.c
View file

@ -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));
argv[argc++] = NULL;
argv[argc++] = "--no-walk";
if (action != REVERT)
argv[argc++] = "--reverse";
for (i = 0; i < commit_argc; i++)
argv[argc++] = commit_argv[i];
argv[argc++] = NULL;
int argc;
init_revisions(revs, NULL);
setup_revisions(argc - 1, argv, revs, NULL);
revs->no_walk = 1;
if (action != REVERT)
revs->reverse = 1;
argc = setup_revisions(commit_argc, commit_argv, revs, NULL);
if (argc > 1)
usage(*revert_or_cherry_pick_usage());
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)

18
t/t3501-revert-cherry-pick.sh
View file

@ -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 &&