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

Junio C Hamano a écrit :

Olivier Marin [off-list ref] writes:

quoted

Junio C Hamano a écrit :

quoted

quoted

diff --git a/git-am.sh b/git-am.sh

...

quoted

@@ -202,8 +202,15 @@ then

...

quoted

+	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
+		;;

...

I add reset to unstage paths with no conflict that are left behind.

Does removing the last three lines (1) change the behaviour?  (2) break any test?

If the answers are "Yes and No", we would need a few more tests in the
testsuite.

The answers are "Yes and No" and test case update follow.

-- >8 --
From: Olivier Marin <redacted>
[PATCH] update test case to protect am --skip behaviour

Signed-off-by: Olivier Marin <redacted>
---
 t/t4151-am-abort.sh |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh
index f45ab0a..7d86cdf 100755
--- a/t/t4151-am-abort.sh
+++ b/t/t4151-am-abort.sh

@@ -17,6 +17,8 @@ test_expect_success setup '
 	for i in 2 3 4 5 6
 	do
 		echo $i >>file-1 &&
+		echo $i >otherfile-$i &&
+		git add otherfile-$i &&
 		test_tick &&
 		git commit -a -m $i || break
 	done &&

-- 
1.6.0.rc0.44.gd618.dirty