From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Jun 2010 13:02:50 +0000 (-0700)
Subject: Merge branch 'ic/maint-rebase-i-abort'
X-Git-Tag: v1.7.2-rc0~21
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9cb16a92d7c069b36f7b7b08557f779de499d3f7?hp=-c

Merge branch 'ic/maint-rebase-i-abort'

* ic/maint-rebase-i-abort:
rebase -i: Abort cleanly if new base cannot be checked out
---

9cb16a92d7c069b36f7b7b08557f779de499d3f7
diff --combined t/t3404-rebase-interactive.sh
index 6668907ec5,8d409156d2..ee9a1b25e6
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@@ -146,6 -146,16 +146,16 @@@ test_expect_success 'abort' 
  	! test -d .git/rebase-merge
  '
  
+ test_expect_success 'abort with error when new base cannot be checked out' '
+ 	git rm --cached file1 &&
+ 	git commit -m "remove file in base" &&
+ 	test_must_fail git rebase -i master > output 2>&1 &&
+ 	grep "Untracked working tree file .file1. would be overwritten" \
+ 		output &&
+ 	! test -d .git/rebase-merge &&
+ 	git reset --hard HEAD^
+ '
+ 
  test_expect_success 'retain authorship' '
  	echo A > file7 &&
  	git add file7 &&
@@@ -181,12 -191,6 +191,12 @@@ test_expect_success '-p handles "no cha
  	test $HEAD = $(git rev-parse HEAD)
  '
  
 +test_expect_failure 'exchange two commits with -p' '
 +	FAKE_LINES="2 1" git rebase -i -p HEAD~2 &&
 +	test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
 +	test G = $(git cat-file commit HEAD | sed -ne \$p)
 +'
 +
  test_expect_success 'preserve merges with -p' '
  	git checkout -b to-be-preserved master^ &&
  	: > unrelated-file &&