diff options
| author |  Christian Couder <chriscool@tuxfamily.org> | 2010-06-14 00:29:38 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-06-25 08:55:48 -0700 |
| commit | f873a273d1381574fd9b2f3f613c0c7e40fe3a1c (patch) | |
| tree | db19a5352dfbe8eedb42dd42fa15534ac0a5e76b | |
| parent | t3508 (cherry-pick): futureproof against unmerged files (diff) | |
| download | tgif-f873a273d1381574fd9b2f3f613c0c7e40fe3a1c.tar.xz | |
revert: accept arbitrary rev-list options
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>
| -rw-r--r-- | Documentation/git-cherry-pick.txt | 7 | ||||
| -rw-r--r-- | builtin/revert.c | 3 | ||||
| -rwxr-xr-x | t/t3508-cherry-pick-many-commits.sh | 10 |
3 files changed, 19 insertions, 1 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index bcb4c758b7..ca485dbac1 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 853e9e406c..3f4a20edd0 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -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); diff --git a/t/t3508-cherry-pick-many-commits.sh b/t/t3508-cherry-pick-many-commits.sh index 26a873032d..93d7189fbc 100755 --- a/t/t3508-cherry-pick-many-commits.sh +++ b/t/t3508-cherry-pick-many-commits.sh @@ -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 |