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 /t | |
| parent | 18c8ff46104302ea30e879a0f2cb5eefb94df1a4 (diff) | |
| download | git-f873a273d1381574fd9b2f3f613c0c7e40fe3a1c.tar.gz | |
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3508-cherry-pick-many-commits.sh | 10 |
1 files changed, 10 insertions, 0 deletions
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 |