global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-29 19:10:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cc/cherry-pick-stdin' into next

Browse Source 
* cc/cherry-pick-stdin:
  revert: accept arbitrary rev-list options
  t3508 (cherry-pick): futureproof against unmerged files
This commit is contained in:
Junio C Hamano
2010-06-27 12:16:35 -07:00
parent 24ce8c2609 f873a273d1
commit 3af0bba8bf
3 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/git-cherry-pick.txt
View File

@@ -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>

3
builtin/revert.c
View File

@@ -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);

24
t/t3508-cherry-pick-many-commits.sh
View File

@@ -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 &&
@@ -83,7 +83,7 @@ test_expect_success 'revert fourth fourth~1 fourth~2 works' '
'
test_expect_failure 'cherry-pick -3 fourth works' '
git checkout master &&
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