Skip to content

Commit

Permalink
revert: accept arbitrary rev-list options
Browse files Browse the repository at this point in the history
This can be useful to do something like:

git rev-list --reverse master -- README | git cherry-pick -n --stdin

without using xargs.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Christian Couder authored and Junio C Hamano committed Jun 25, 2010
1 parent 18c8ff4 commit f873a27
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 1 deletion.
7 changes: 7 additions & 0 deletions Documentation/git-cherry-pick.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion builtin/revert.c
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ static void parse_args(int argc, const char **argv)
die("program error");
}

commit_argc = parse_options(argc, argv, NULL, options, usage_str, 0);
commit_argc = parse_options(argc, argv, NULL, options, usage_str,
PARSE_OPT_KEEP_UNKNOWN);
if (commit_argc < 1)
usage_with_options(usage_str, options);

Expand Down
10 changes: 10 additions & 0 deletions t/t3508-cherry-pick-many-commits.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit f873a27

Please sign in to comment.