Subject: Re: [PATCH] Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"

From: Olivier Marin <[email-masked]>
Date: Mon, 21 Jul 2008 15:39:06 +0200

Junio C Hamano a écrit :
> 
> Anything that changes "am" to require a clean working tree will NEVER be
> accepted.  I personally rely on the ability for it to run in a dirty tree,
> so does Linus.
> 
> 	Side note.  Anything that changes "merge" to require a clean
> 	working tree is also unacceptable.  Cf.
> 
> 	http://thread.gmane.org/gmane.comp.version-control.git/9073/focus=9089
> 
> 	Linus talks about "patch" in the paragraph second to the last one
> 	in the message; back then he was talking about "git-applymbox" but
> 	the same argument there applies to its newer incarnation "git-am".
> 
> 	Side note #2.  It would have been nice if "rebase" were also
> 	written in such a way that it can work in a dirty tree as long as
> 	local changes did not interfere with the operation, but it is a
> 	lot more involved.

Thanks for the explanation and the really interesting pointer.

The last thing that still annoy me is the --skip that refuse to skip in 3-way
merge. Perhaps we can use the "git read-tree --reset -u" thing for skip too.

So, what about the following patch?

-- >8 --
From: Olivier Marin <[email-masked]>

git am --skip: clean the index while preserving local changes

In 3-way merge, "am" will let the index with unmerged path waiting
for us to resolve conflicts and continue. But if we want to --skip
instead, "am" refuses to continue because of the dirty index.

With this patch, "am" will clean the index without touching files
locally modified, before continue.

Signed-off-by: Olivier Marin <[email-masked]>
---
 git-am.sh           |   12 +++++++++---
 t/t4151-am-abort.sh |   11 +++++++++--
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/git-am.sh b/git-am.sh
index 60aaa4a..864c77e 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -202,8 +202,15 @@ then
 	die "previous rebase directory $dotest still exists but mbox given."
 	resume=yes
 
-	case "$abort" in
-	t)
+	case "$skip,$abort" in
+	t,)
+		git rerere clear
+		git read-tree --reset -u HEAD HEAD
+		orig_head=$(cat "$GIT_DIR/ORIG_HEAD")
+		git reset HEAD
+		git update-ref ORIG_HEAD $orig_head
+		;;
+	,t)
 		git rerere clear
 		git read-tree --reset -u HEAD ORIG_HEAD
 		git reset ORIG_HEAD
@@ -297,7 +304,6 @@ last=`cat "$dotest/last"`
 this=`cat "$dotest/next"`
 if test "$skip" = t
 then
-	git rerere clear
 	this=`expr "$this" + 1`
 	resume=
 fi
diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh
index dda7e2c..249093b 100755
--- a/t/t4151-am-abort.sh
+++ b/t/t4151-am-abort.sh
@@ -14,7 +14,7 @@ test_expect_success setup '
 	git add file-1 file-2 &&
 	git commit -m initial &&
 	git tag initial &&
-	for i in 2 3 4 5
+	for i in 2 3 4 5 6
 	do
 		echo $i >>file-1 &&
 		test_tick &&
@@ -32,7 +32,7 @@ do
 		git reset --hard initial &&
 		cp file-2-expect file-2 &&
 
-		test_must_fail git am$with3 000[124]-*.patch &&
+		test_must_fail git am$with3 000[1245]-*.patch &&
 		git log --pretty=tformat:%s >actual &&
 		for i in 3 2 initial
 		do
@@ -41,6 +41,13 @@ do
 		test_cmp expect actual
 	'
 
+	test_expect_success "am$with3 --skip continue after failed am$with3" '
+		test_must_fail git-am$with3 --skip >output &&
+		test "$(grep "^Applying" output)" = "Applying 6" &&
+		test_cmp file-2-expect file-2 &&
+		test ! -f .git/rr-cache/MERGE_RR
+	'
+
 	test_expect_success "am --abort goes back after failed am$with3" '
 		git-am --abort &&
 		git rev-parse HEAD >actual &&
-- 
1.5.6.4.570.g052e.dirty