From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 17 Aug 2018 20:09:57 +0000 (-0700)
Subject: Merge branch 'en/abort-df-conflict-fixes'
X-Git-Tag: v2.19.0-rc0~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8ba8642bd5d89629973268ff28bc5b0b3d45e35b;p=thirdparty%2Fgit.git

Merge branch 'en/abort-df-conflict-fixes'

"git merge --abort" etc. did not clean things up properly when
there were conflicted entries in the index in certain order that
are involved in D/F conflicts.  This has been corrected.

* en/abort-df-conflict-fixes:
  read-cache: fix directory/file conflict handling in read_index_unmerged()
  t1015: demonstrate directory/file conflict recovery failures
---

8ba8642bd5d89629973268ff28bc5b0b3d45e35b
diff --cc t/t6042-merge-rename-corner-cases.sh
index 07dd09d985,de77bfaf4f..b97aca7fa2
--- a/t/t6042-merge-rename-corner-cases.sh
+++ b/t/t6042-merge-rename-corner-cases.sh
@@@ -320,43 -258,33 +320,42 @@@ test_expect_success 'rename/directory c
  '
  
  test_expect_success 'rename/directory conflict + content merge conflict' '
 -	git reset --hard &&
 -	git clean -fdqx &&
 -
 -	git checkout left-conflict^0 &&
 -
 -	test_must_fail git merge -s recursive right^0 &&
 -
 -	test 4 -eq $(git ls-files -s | wc -l) &&
 -	test 3 -eq $(git ls-files -u | wc -l) &&
 -	test 1 -eq $(git ls-files -o | wc -l) &&
 -
 -	git cat-file -p left-conflict:newfile >left &&
 -	git cat-file -p base:file    >base &&
 -	git cat-file -p right:file   >right &&
 -	test_must_fail git merge-file \
 -		-L "HEAD:newfile" \
 -		-L "" \
 -		-L "right^0:file" \
 -		left base right &&
 -	test_cmp left newfile~HEAD &&
 -
 -	test $(git rev-parse :1:newfile) = $(git rev-parse base:file) &&
 -	test $(git rev-parse :2:newfile) = $(git rev-parse left-conflict:newfile) &&
 -	test $(git rev-parse :3:newfile) = $(git rev-parse right:file) &&
 -
 -	test -f newfile/realfile &&
 -	test -f newfile~HEAD
 +	(
 +		cd rename-directory-1 &&
 +
- 		git reset --hard &&
 +		git reset --hard &&
 +		git clean -fdqx &&
 +
 +		git checkout left-conflict^0 &&
 +
 +		test_must_fail git merge -s recursive right^0 &&
 +
 +		git ls-files -s >out &&
 +		test_line_count = 4 out &&
 +		git ls-files -u >out &&
 +		test_line_count = 3 out &&
 +		git ls-files -o >out &&
 +		test_line_count = 2 out &&
 +
 +		git cat-file -p left-conflict:newfile >left &&
 +		git cat-file -p base:file    >base &&
 +		git cat-file -p right:file   >right &&
 +		test_must_fail git merge-file \
 +			-L "HEAD:newfile" \
 +			-L "" \
 +			-L "right^0:file" \
 +			left base right &&
 +		test_cmp left newfile~HEAD &&
 +
 +		git rev-parse >expect                                 \
 +			base:file   left-conflict:newfile  right:file &&
 +		git rev-parse >actual                                 \
 +			:1:newfile  :2:newfile             :3:newfile &&
 +		test_cmp expect actual &&
 +
 +		test_path_is_file newfile/realfile &&
 +		test_path_is_file newfile~HEAD
 +	)
  '
  
  test_expect_success 'setup content merge + rename/directory conflict w/ disappearing dir' '