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>
This commit is contained in:
parent
18c8ff4610
commit
f873a273d1
@ -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>
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user