From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Jul 2012 04:38:41 +0000 (-0700)
Subject: Merge branch 'cw/rebase-i-root'
X-Git-Tag: v1.7.12-rc0~32
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0cd993a778d7c14bed34f624fce46724242557ed;p=git.git

Merge branch 'cw/rebase-i-root'

"git rebase [-i] --root $tip" can now be used to rewrite all the
history down to the root.

* cw/rebase-i-root:
  t3404: make test 57 work with dash and others
  Add tests for rebase -i --root without --onto
  rebase -i: support --root without --onto
---

0cd993a778d7c14bed34f624fce46724242557ed
diff --cc Documentation/git-rebase.txt
index 2d71e4b97,85b5e4425..b30ed352e
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@@ -8,9 -8,9 +8,9 @@@ git-rebase - Forward-port local commit
  SYNOPSIS
  --------
  [verse]
 -'git rebase' [-i | --interactive] [options] [--onto <newbase>]
 +'git rebase' [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>]
  	[<upstream>] [<branch>]
- 'git rebase' [-i | --interactive] [options] [--exec <cmd>] --onto <newbase>
 -'git rebase' [-i | --interactive] [options] [--onto <newbase>]
++'git rebase' [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>]
  	--root [<branch>]
  'git rebase' --continue | --skip | --abort
  
diff --cc git-rebase.sh
index 5bddfa969,bde2be88a..1cd0633b8
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@@ -31,8 -30,8 +31,8 @@@ Example:       git-rebase master~1 topi
  SUBDIRECTORY_OK=Yes
  OPTIONS_KEEPDASHDASH=
  OPTIONS_SPEC="\
 -git rebase [-i] [options] [--onto <newbase>] [<upstream>] [<branch>]
 -git rebase [-i] [options] [--onto <newbase>] --root [<branch>]
 +git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
- git rebase [-i] [options] [--exec <cmd>] --onto <newbase> --root [<branch>]
++git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
  git-rebase [-i] --continue | --abort | --skip
  --
   Available options are
@@@ -411,10 -402,14 +416,15 @@@ the
  	die "invalid upstream $upstream_name"
  	upstream_arg="$upstream_name"
  else
- 	test -z "$onto" && die "You must specify --onto when using --root"
+ 	if test -z "$onto"
+ 	then
+ 		empty_tree=`git hash-object -t tree /dev/null`
+ 		onto=`git commit-tree $empty_tree </dev/null`
+ 		squash_onto="$onto"
+ 	fi
  	unset upstream_name
  	unset upstream
 +	test $# -gt 1 && usage
  	upstream_arg=--root
  fi
  
diff --cc t/t3404-rebase-interactive.sh
index 68d61480f,060f9d87d..8078db685
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@@ -755,121 -755,35 +755,152 @@@ test_expect_success 'rebase-i history w
  	test_cmp expect actual
  '
  
 +
 +test_expect_success 'prepare for rebase -i --exec' '
 +	git checkout master &&
 +	git checkout -b execute &&
 +	test_commit one_exec main.txt one_exec &&
 +	test_commit two_exec main.txt two_exec &&
 +	test_commit three_exec main.txt three_exec
 +'
 +
 +
 +test_expect_success 'running "git rebase -i --exec git show HEAD"' '
 +	git rebase -i --exec "git show HEAD" HEAD~2 >actual &&
 +	(
 +		FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
 +		export FAKE_LINES &&
 +		git rebase -i HEAD~2 >expect
 +	) &&
 +	sed -e "1,9d" expect >expected &&
 +	test_cmp expected actual
 +'
 +
 +
 +test_expect_success 'running "git rebase --exec git show HEAD -i"' '
 +	git reset --hard execute &&
 +	git rebase --exec "git show HEAD" -i HEAD~2 >actual &&
 +	(
 +		FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
 +		export FAKE_LINES &&
 +		git rebase -i HEAD~2 >expect
 +	) &&
 +	sed -e "1,9d" expect >expected &&
 +	test_cmp expected actual
 +'
 +
 +
 +test_expect_success 'running "git rebase -ix git show HEAD"' '
 +	git reset --hard execute &&
 +	git rebase -ix "git show HEAD" HEAD~2 >actual &&
 +	(
 +		FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
 +		export FAKE_LINES &&
 +		git rebase -i HEAD~2 >expect
 +	) &&
 +	sed -e "1,9d" expect >expected &&
 +	test_cmp expected actual
 +'
 +
 +
 +test_expect_success 'rebase -ix with several <CMD>' '
 +	git reset --hard execute &&
 +	git rebase -ix "git show HEAD; pwd" HEAD~2 >actual &&
 +	(
 +		FAKE_LINES="1 exec_git_show_HEAD;_pwd 2 exec_git_show_HEAD;_pwd" &&
 +		export FAKE_LINES &&
 +		git rebase -i HEAD~2 >expect
 +	) &&
 +	sed -e "1,9d" expect >expected &&
 +	test_cmp expected actual
 +'
 +
 +
 +test_expect_success 'rebase -ix with several instances of --exec' '
 +	git reset --hard execute &&
 +	git rebase -i --exec "git show HEAD" --exec "pwd" HEAD~2 >actual &&
 +	(
 +		FAKE_LINES="1 exec_git_show_HEAD exec_pwd 2
 +				exec_git_show_HEAD exec_pwd" &&
 +		export FAKE_LINES &&
 +		git rebase -i HEAD~2 >expect
 +	) &&
 +	sed -e "1,11d" expect >expected &&
 +	test_cmp expected actual
 +'
 +
 +
 +test_expect_success 'rebase -ix with --autosquash' '
 +	git reset --hard execute &&
 +	git checkout -b autosquash &&
 +	echo second >second.txt &&
 +	git add second.txt &&
 +	git commit -m "fixup! two_exec" &&
 +	echo bis >bis.txt &&
 +	git add bis.txt &&
 +	git commit -m "fixup! two_exec" &&
 +	(
 +		git checkout -b autosquash_actual &&
 +		git rebase -i --exec "git show HEAD" --autosquash HEAD~4 >actual
 +	) &&
 +	git checkout autosquash &&
 +	(
 +		git checkout -b autosquash_expected &&
 +		FAKE_LINES="1 fixup 3 fixup 4 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
 +		export FAKE_LINES &&
 +		git rebase -i HEAD~4 >expect
 +	) &&
 +	sed -e "1,13d" expect >expected &&
 +	test_cmp expected actual
 +'
 +
 +
 +test_expect_success 'rebase --exec without -i shows error message' '
 +	git reset --hard execute &&
 +	test_must_fail git rebase --exec "git show HEAD" HEAD~2 2>actual &&
 +	echo "--exec option must be used with --interactive option" >expected &&
 +	test_i18ncmp expected actual
 +'
 +
 +
 +test_expect_success 'rebase -i --exec without <CMD>' '
 +	git reset --hard execute &&
 +	test_must_fail git rebase -i --exec 2>tmp &&
 +	sed -e "1d" tmp >actual &&
 +	test_must_fail git rebase -h >expected &&
 +	test_cmp expected actual &&
 +	git checkout master
 +'
 +
+ test_expect_success 'rebase -i --root re-order and drop commits' '
+ 	git checkout E &&
+ 	FAKE_LINES="3 1 2 5" git rebase -i --root &&
+ 	test E = $(git cat-file commit HEAD | sed -ne \$p) &&
+ 	test B = $(git cat-file commit HEAD^ | sed -ne \$p) &&
+ 	test A = $(git cat-file commit HEAD^^ | sed -ne \$p) &&
+ 	test C = $(git cat-file commit HEAD^^^ | sed -ne \$p) &&
+ 	test 0 = $(git cat-file commit HEAD^^^ | grep -c ^parent\ )
+ '
+ 
+ test_expect_success 'rebase -i --root retain root commit author and message' '
+ 	git checkout A &&
+ 	echo B >file7 &&
+ 	git add file7 &&
+ 	GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
+ 	FAKE_LINES="2" git rebase -i --root &&
+ 	git cat-file commit HEAD | grep -q "^author Twerp Snog" &&
+ 	git cat-file commit HEAD | grep -q "^different author$"
+ '
+ 
+ test_expect_success 'rebase -i --root temporary sentinel commit' '
+ 	git checkout B &&
+ 	(
+ 		FAKE_LINES="2" &&
+ 		export FAKE_LINES &&
+ 		test_must_fail git rebase -i --root
+ 	) &&
+ 	git cat-file commit HEAD | grep "^tree 4b825dc642cb" &&
+ 	git rebase --abort
+ '
+ 
  test_done
diff --cc t/t3412-rebase-root.sh
index 1e9d1a737,e4f9da853..0b5210572
--- a/t/t3412-rebase-root.sh
+++ b/t/t3412-rebase-root.sh
@@@ -22,16 -22,6 +22,11 @@@ test_expect_success 'prepare repository
  	test_commit 4 B
  '
  
- test_expect_success 'rebase --root expects --onto' '
- 	git checkout -B fail other &&
- 	test_must_fail git rebase --root
- '
- 
 +test_expect_success 'rebase --root fails with too many args' '
 +	git checkout -B fail other &&
 +	test_must_fail git rebase --onto master --root fail fail
 +'
 +
  test_expect_success 'setup pre-rebase hook' '
  	mkdir -p .git/hooks &&
  	cat >.git/hooks/pre-rebase <<EOF &&