Merge branch 'mh/rebase-skip-hard'

* mh/rebase-skip-hard: Do git reset --hard HEAD when using git rebase --skip
git-mirror · Nov 25, 2007 · 25f3cd5 · 25f3cd5
2 parents faf8280 + fb6e4e1
commit 25f3cd5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/git-rebase.sh b/git-rebase.sh
@@ -179,6 +179,7 @@ do
 		exit
 		;;
 	--skip)
+		git reset --hard HEAD || exit $?
 		if test -d "$dotest"
 		then
 			git rerere clear

diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh
@@ -36,7 +36,6 @@ test_expect_failure 'rebase with git am -3 (default)' '
 '
 
 test_expect_success 'rebase --skip with am -3' '
-	git reset --hard HEAD &&
 	git rebase --skip
 	'
 
@@ -57,7 +56,6 @@ test_expect_success 'checkout skip-merge' 'git checkout -f skip-merge'
 test_expect_failure 'rebase with --merge' 'git rebase --merge master'
 
 test_expect_success 'rebase --skip with --merge' '
-	git reset --hard HEAD &&
 	git rebase --skip
 	'