X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6022-merge-rename.sh;h=e3f7ae8120aa2a46b25dd3830597cb863a5f5e20;hb=8ed0a740dd42bd0724aebed6e3b07c4ea2a2d5e8;hp=5ac25647abd366f04867a5acec6a987f314c2ace;hpb=0081e36c9dc3c201e22f12ebebadfff88fa32b91;p=git.git

diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh
index 5ac25647a..e3f7ae812 100755
--- a/t/t6022-merge-rename.sh
+++ b/t/t6022-merge-rename.sh
@@ -3,12 +3,6 @@
 test_description='Merge-recursive merging renames'
 . ./test-lib.sh
 
-if test "$no_python"; then
-	echo "Skipping: no python => no recursive merge"
-	test_done
-	exit 0
-fi
-
 test_expect_success setup \
 '
 cat >A <<\EOF &&
@@ -48,15 +42,22 @@ O OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
 EOF
 
 git add A M &&
-git commit -m initial &&
+git commit -m "initial has A and M" &&
 git branch white &&
 git branch red &&
 git branch blue &&
+git branch yellow &&
+git branch change &&
+git branch change+rename &&
 
 sed -e "/^g /s/.*/g : master changes a line/" <A >A+ &&
 mv A+ A &&
 git commit -a -m "master updates A" &&
 
+git checkout yellow &&
+rm -f M &&
+git commit -a -m "yellow removes M" &&
+
 git checkout white &&
 sed -e "/^g /s/.*/g : white changes a line/" <A >B &&
 sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
@@ -78,6 +79,17 @@ rm -f A M &&
 git update-index --add --remove A C M N &&
 git commit -m "blue renames A->C, M->N" &&
 
+git checkout change &&
+sed -e "/^g /s/.*/g : changed line/" <A >A+ &&
+mv A+ A &&
+git commit -q -a -m "changed" &&
+
+git checkout change+rename &&
+sed -e "/^g /s/.*/g : changed line/" <A >B &&
+rm A &&
+git update-index --add B &&
+git commit -q -a -m "changed and renamed" &&
+
 git checkout master'
 
 test_expect_success 'pull renaming branch into unrenaming one' \
@@ -85,27 +97,27 @@ test_expect_success 'pull renaming branch into unrenaming one' \
 	git show-branch
 	git pull . white && {
 		echo "BAD: should have conflicted"
-		exit 1
+		return 1
 	}
 	git ls-files -s
 	test "$(git ls-files -u B | wc -l)" -eq 3 || {
 		echo "BAD: should have left stages for B"
-		exit 1	
+		return 1
 	}
 	test "$(git ls-files -s N | wc -l)" -eq 1 || {
 		echo "BAD: should have merged N"
-		exit 1	
+		return 1
 	}
 	sed -ne "/^g/{
 	p
 	q
 	}" B | grep master || {
 		echo "BAD: should have listed our change first"
-		exit 1
+		return 1
 	}
 	test "$(git diff white N | wc -l)" -eq 0 || {
 		echo "BAD: should have taken colored branch"
-		exit 1
+		return 1
 	}
 '
 
@@ -116,26 +128,26 @@ test_expect_success 'pull renaming branch into another renaming one' \
 	git checkout red
 	git pull . white && {
 		echo "BAD: should have conflicted"
-		exit 1
+		return 1
 	}
 	test "$(git ls-files -u B | wc -l)" -eq 3 || {
 		echo "BAD: should have left stages"
-		exit 1	
+		return 1
 	}
 	test "$(git ls-files -s N | wc -l)" -eq 1 || {
 		echo "BAD: should have merged N"
-		exit 1	
+		return 1
 	}
 	sed -ne "/^g/{
 	p
 	q
 	}" B | grep red || {
 		echo "BAD: should have listed our change first"
-		exit 1
+		return 1
 	}
 	test "$(git diff white N | wc -l)" -eq 0 || {
 		echo "BAD: should have taken colored branch"
-		exit 1
+		return 1
 	}
 '
 
@@ -145,26 +157,26 @@ test_expect_success 'pull unrenaming branch into renaming one' \
 	git show-branch
 	git pull . master && {
 		echo "BAD: should have conflicted"
-		exit 1
+		return 1
 	}
 	test "$(git ls-files -u B | wc -l)" -eq 3 || {
 		echo "BAD: should have left stages"
-		exit 1	
+		return 1
 	}
 	test "$(git ls-files -s N | wc -l)" -eq 1 || {
 		echo "BAD: should have merged N"
-		exit 1	
+		return 1
 	}
 	sed -ne "/^g/{
 	p
 	q
 	}" B | grep red || {
 		echo "BAD: should have listed our change first"
-		exit 1
+		return 1
 	}
 	test "$(git diff white N | wc -l)" -eq 0 || {
 		echo "BAD: should have taken colored branch"
-		exit 1
+		return 1
 	}
 '
 
@@ -174,35 +186,159 @@ test_expect_success 'pull conflicting renames' \
 	git show-branch
 	git pull . blue && {
 		echo "BAD: should have conflicted"
-		exit 1
+		return 1
 	}
 	test "$(git ls-files -u A | wc -l)" -eq 1 || {
 		echo "BAD: should have left a stage"
-		exit 1	
+		return 1
 	}
 	test "$(git ls-files -u B | wc -l)" -eq 1 || {
 		echo "BAD: should have left a stage"
-		exit 1	
+		return 1
 	}
 	test "$(git ls-files -u C | wc -l)" -eq 1 || {
 		echo "BAD: should have left a stage"
-		exit 1	
+		return 1
 	}
 	test "$(git ls-files -s N | wc -l)" -eq 1 || {
 		echo "BAD: should have merged N"
-		exit 1	
+		return 1
 	}
 	sed -ne "/^g/{
 	p
 	q
 	}" B | grep red || {
 		echo "BAD: should have listed our change first"
-		exit 1
+		return 1
 	}
 	test "$(git diff white N | wc -l)" -eq 0 || {
 		echo "BAD: should have taken colored branch"
-		exit 1
+		return 1
+	}
+'
+
+test_expect_success 'interference with untracked working tree file' '
+
+	git reset --hard
+	git show-branch
+	echo >A this file should not matter
+	git pull . white && {
+		echo "BAD: should have conflicted"
+		return 1
+	}
+	test -f A || {
+		echo "BAD: should have left A intact"
+		return 1
 	}
 '
 
+test_expect_success 'interference with untracked working tree file' '
+
+	git reset --hard
+	git checkout white
+	git show-branch
+	rm -f A
+	echo >A this file should not matter
+	git pull . red && {
+		echo "BAD: should have conflicted"
+		return 1
+	}
+	test -f A || {
+		echo "BAD: should have left A intact"
+		return 1
+	}
+'
+
+test_expect_success 'interference with untracked working tree file' '
+
+	git reset --hard
+	rm -f A M
+	git checkout -f master
+	git tag -f anchor
+	git show-branch
+	git pull . yellow || {
+		echo "BAD: should have cleanly merged"
+		return 1
+	}
+	test -f M && {
+		echo "BAD: should have removed M"
+		return 1
+	}
+	git reset --hard anchor
+'
+
+test_expect_success 'updated working tree file should prevent the merge' '
+
+	git reset --hard
+	rm -f A M
+	git checkout -f master
+	git tag -f anchor
+	git show-branch
+	echo >>M one line addition
+	cat M >M.saved
+	git pull . yellow && {
+		echo "BAD: should have complained"
+		return 1
+	}
+	diff M M.saved || {
+		echo "BAD: should have left M intact"
+		return 1
+	}
+	rm -f M.saved
+'
+
+test_expect_success 'updated working tree file should prevent the merge' '
+
+	git reset --hard
+	rm -f A M
+	git checkout -f master
+	git tag -f anchor
+	git show-branch
+	echo >>M one line addition
+	cat M >M.saved
+	git update-index M
+	git pull . yellow && {
+		echo "BAD: should have complained"
+		return 1
+	}
+	diff M M.saved || {
+		echo "BAD: should have left M intact"
+		return 1
+	}
+	rm -f M.saved
+'
+
+test_expect_success 'interference with untracked working tree file' '
+
+	git reset --hard
+	rm -f A M
+	git checkout -f yellow
+	git tag -f anchor
+	git show-branch
+	echo >M this file should not matter
+	git pull . master || {
+		echo "BAD: should have cleanly merged"
+		return 1
+	}
+	test -f M || {
+		echo "BAD: should have left M intact"
+		return 1
+	}
+	git ls-files -s | grep M && {
+		echo "BAD: M must be untracked in the result"
+		return 1
+	}
+	git reset --hard anchor
+'
+
+test_expect_success 'merge of identical changes in a renamed file' '
+	rm -f A M N
+	git reset --hard &&
+	git checkout change+rename &&
+	GIT_MERGE_VERBOSITY=3 git merge change | grep "^Skipped B" &&
+	git reset --hard HEAD^ &&
+	git checkout change &&
+	GIT_MERGE_VERBOSITY=3 git merge change+rename | grep "^Skipped B"
+'
+
 test_done