summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-30 18:55:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-30 18:55:39 (GMT)
commit01aedc930b6c3b46d229e33ac6f70b3d91fc1d2b (patch)
tree8df2b7b5111d783da4acad2d304341e108889ca3
parenta76b2084fb9c7e788108717fdce4c91227808980 (diff)
parente0ef8495e98ae5ae796ec23bf438eef413557193 (diff)
downloadgit-01aedc930b6c3b46d229e33ac6f70b3d91fc1d2b.zip
git-01aedc930b6c3b46d229e33ac6f70b3d91fc1d2b.tar.gz
git-01aedc930b6c3b46d229e33ac6f70b3d91fc1d2b.tar.bz2
Merge branch 'cc/cherry-pick-stdin'
* cc/cherry-pick-stdin: revert: do not rebuild argv on heap revert: accept arbitrary rev-list options t3508 (cherry-pick): futureproof against unmerged files
-rw-r--r--Documentation/git-cherry-pick.txt7
-rw-r--r--builtin/revert.c35
-rwxr-xr-xt/t3501-revert-cherry-pick.sh18
-rwxr-xr-xt/t3508-cherry-pick-many-commits.sh26
4 files changed, 61 insertions, 25 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index bcb4c75..ca485db 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -113,6 +113,13 @@ git cherry-pick --ff ..next::
are in next but not HEAD to the current branch, creating a new
commit for each new change.
+git rev-list --reverse master \-- README | git cherry-pick -n --stdin::
+
+ Apply the changes introduced by all commits on the master
+ branch that touched README to the working tree and index,
+ so the result can be inspected and made into a single new
+ commit if suitable.
+
Author
------
Written by Junio C Hamano <gitster@pobox.com>
diff --git a/builtin/revert.c b/builtin/revert.c
index 853e9e4..8b9d829 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"),
@@ -78,8 +82,10 @@ static void parse_args(int argc, const char **argv)
die("program error");
}
- commit_argc = parse_options(argc, argv, NULL, options, usage_str, 0);
- if (commit_argc < 1)
+ commit_argc = parse_options(argc, argv, NULL, options, usage_str,
+ PARSE_OPT_KEEP_ARGV0 |
+ PARSE_OPT_KEEP_UNKNOWN);
+ if (commit_argc < 2)
usage_with_options(usage_str, options);
commit_argv = argv;
@@ -525,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 e4fbf7a..bc7aedd 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 &&
diff --git a/t/t3508-cherry-pick-many-commits.sh b/t/t3508-cherry-pick-many-commits.sh
index 3b87efe..f90ed3d 100755
--- a/t/t3508-cherry-pick-many-commits.sh
+++ b/t/t3508-cherry-pick-many-commits.sh
@@ -23,7 +23,7 @@ test_expect_success setup '
'
test_expect_success 'cherry-pick first..fourth works' '
- git checkout master &&
+ git checkout -f master &&
git reset --hard first &&
test_tick &&
git cherry-pick first..fourth &&
@@ -33,7 +33,7 @@ test_expect_success 'cherry-pick first..fourth works' '
'
test_expect_success 'cherry-pick --ff first..fourth works' '
- git checkout master &&
+ git checkout -f master &&
git reset --hard first &&
test_tick &&
git cherry-pick --ff first..fourth &&
@@ -43,7 +43,7 @@ test_expect_success 'cherry-pick --ff first..fourth works' '
'
test_expect_success 'cherry-pick -n first..fourth works' '
- git checkout master &&
+ git checkout -f master &&
git reset --hard first &&
test_tick &&
git cherry-pick -n first..fourth &&
@@ -53,7 +53,7 @@ test_expect_success 'cherry-pick -n first..fourth works' '
'
test_expect_success 'revert first..fourth works' '
- git checkout master &&
+ git checkout -f master &&
git reset --hard fourth &&
test_tick &&
git revert first..fourth &&
@@ -63,7 +63,7 @@ test_expect_success 'revert first..fourth works' '
'
test_expect_success 'revert ^first fourth works' '
- git checkout master &&
+ git checkout -f master &&
git reset --hard fourth &&
test_tick &&
git revert ^first fourth &&
@@ -73,7 +73,7 @@ test_expect_success 'revert ^first fourth works' '
'
test_expect_success 'revert fourth fourth~1 fourth~2 works' '
- git checkout master &&
+ git checkout -f master &&
git reset --hard fourth &&
test_tick &&
git revert fourth fourth~1 fourth~2 &&
@@ -82,8 +82,8 @@ test_expect_success 'revert fourth fourth~1 fourth~2 works' '
git diff --quiet HEAD first
'
-test_expect_failure 'cherry-pick -3 fourth works' '
- git checkout master &&
+test_expect_success 'cherry-pick -3 fourth works' '
+ git checkout -f master &&
git reset --hard first &&
test_tick &&
git cherry-pick -3 fourth &&
@@ -92,4 +92,14 @@ test_expect_failure 'cherry-pick -3 fourth works' '
test "$(git rev-parse --verify HEAD)" != "$(git rev-parse --verify fourth)"
'
+test_expect_success 'cherry-pick --stdin works' '
+ git checkout -f master &&
+ git reset --hard first &&
+ test_tick &&
+ git rev-list --reverse first..fourth | git cherry-pick --stdin &&
+ git diff --quiet other &&
+ git diff --quiet HEAD other &&
+ test "$(git rev-parse --verify HEAD)" != "$(git rev-parse --verify fourth)"
+'
+
test_done