From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Jun 2010 17:20:53 +0000 (-0700)
Subject: Merge commit 'v1.7.2-rc0~6^2' into cc/cherry-pick-stdin
X-Git-Tag: v1.7.2-rc1~4^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=65281b70caf9dcf926c6649c8c20ef8891d6f3c3;p=git.git

Merge commit 'v1.7.2-rc0~6^2' into cc/cherry-pick-stdin

* commit 'v1.7.2-rc0~6^2':
  DWIM 'git show -5' to 'git show --do-walk -5'
  Documentation/SubmittingPatches: Fix typo in GMail section
  Documentation/config: describe status.submodulesummary

This commit fixes one test in t3508 by making "cherry-pick -<num>"
walk the history.

A test update from Elijah Newren is squashed as an evil merge.
---

65281b70caf9dcf926c6649c8c20ef8891d6f3c3
diff --cc t/t3508-cherry-pick-many-commits.sh
index 93d7189fb,000000000..f90ed3da3
mode 100755,000000..100755
--- a/t/t3508-cherry-pick-many-commits.sh
+++ b/t/t3508-cherry-pick-many-commits.sh
@@@ -1,105 -1,0 +1,105 @@@
 +#!/bin/sh
 +
 +test_description='test cherry-picking many commits'
 +
 +. ./test-lib.sh
 +
 +test_expect_success setup '
 +	echo first > file1 &&
 +	git add file1 &&
 +	test_tick &&
 +	git commit -m "first" &&
 +	git tag first &&
 +
 +	git checkout -b other &&
 +	for val in second third fourth
 +	do
 +		echo $val >> file1 &&
 +		git add file1 &&
 +		test_tick &&
 +		git commit -m "$val" &&
 +		git tag $val
 +	done
 +'
 +
 +test_expect_success 'cherry-pick first..fourth works' '
 +	git checkout -f master &&
 +	git reset --hard first &&
 +	test_tick &&
 +	git cherry-pick first..fourth &&
 +	git diff --quiet other &&
 +	git diff --quiet HEAD other &&
 +	test "$(git rev-parse --verify HEAD)" != "$(git rev-parse --verify fourth)"
 +'
 +
 +test_expect_success 'cherry-pick --ff first..fourth works' '
 +	git checkout -f master &&
 +	git reset --hard first &&
 +	test_tick &&
 +	git cherry-pick --ff first..fourth &&
 +	git diff --quiet other &&
 +	git diff --quiet HEAD other &&
 +	test "$(git rev-parse --verify HEAD)" = "$(git rev-parse --verify fourth)"
 +'
 +
 +test_expect_success 'cherry-pick -n first..fourth works' '
 +	git checkout -f master &&
 +	git reset --hard first &&
 +	test_tick &&
 +	git cherry-pick -n first..fourth &&
 +	git diff --quiet other &&
 +	git diff --cached --quiet other &&
 +	git diff --quiet HEAD first
 +'
 +
 +test_expect_success 'revert first..fourth works' '
 +	git checkout -f master &&
 +	git reset --hard fourth &&
 +	test_tick &&
 +	git revert first..fourth &&
 +	git diff --quiet first &&
 +	git diff --cached --quiet first &&
 +	git diff --quiet HEAD first
 +'
 +
 +test_expect_success 'revert ^first fourth works' '
 +	git checkout -f master &&
 +	git reset --hard fourth &&
 +	test_tick &&
 +	git revert ^first fourth &&
 +	git diff --quiet first &&
 +	git diff --cached --quiet first &&
 +	git diff --quiet HEAD first
 +'
 +
 +test_expect_success 'revert fourth fourth~1 fourth~2 works' '
 +	git checkout -f master &&
 +	git reset --hard fourth &&
 +	test_tick &&
 +	git revert fourth fourth~1 fourth~2 &&
 +	git diff --quiet first &&
 +	git diff --cached --quiet first &&
 +	git diff --quiet HEAD first
 +'
 +
- test_expect_failure 'cherry-pick -3 fourth works' '
++test_expect_success 'cherry-pick -3 fourth works' '
 +	git checkout -f master &&
 +	git reset --hard first &&
 +	test_tick &&
 +	git cherry-pick -3 fourth &&
 +	git diff --quiet other &&
 +	git diff --quiet HEAD other &&
 +	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