From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 25 Nov 2007 00:31:08 +0000 (-0800)
Subject: Merge branch 'mh/rebase-skip-hard'
X-Git-Tag: v1.5.4-rc0~155
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=25f3cd527dec9909322a0f76458a0b602de61141;p=git.git

Merge branch 'mh/rebase-skip-hard'

* mh/rebase-skip-hard:
  Do git reset --hard HEAD when using git rebase --skip
---

25f3cd527dec9909322a0f76458a0b602de61141
diff --cc t/t3403-rebase-skip.sh
index 2ee5a00ea,becabfc33..657f68104
--- a/t/t3403-rebase-skip.sh
+++ b/t/t3403-rebase-skip.sh
@@@ -36,22 -36,8 +36,21 @@@ test_expect_failure 'rebase with git a
  '
  
  test_expect_success 'rebase --skip with am -3' '
- 	git reset --hard HEAD &&
  	git rebase --skip
  	'
 +
 +test_expect_success 'rebase moves back to skip-reference' '
 +	test refs/heads/skip-reference = $(git symbolic-ref HEAD) &&
 +	git branch post-rebase &&
 +	git reset --hard pre-rebase &&
 +	! git rebase master &&
 +	echo "hello" > hello &&
 +	git add hello &&
 +	git rebase --continue &&
 +	test refs/heads/skip-reference = $(git symbolic-ref HEAD) &&
 +	git reset --hard post-rebase
 +'
 +
  test_expect_success 'checkout skip-merge' 'git checkout -f skip-merge'
  
  test_expect_failure 'rebase with --merge' 'git rebase --merge master'