commit dc2a05aa2111fe14be0f0c3e025337dc9340b111
from: Stefan Sperling <stsp@stsp.name>
via: Thomas Adam <thomas@xteddy.org>
date: Fri Oct 08 12:21:56 2021 UTC

add an xfail test for a bug in merging content with a dot on a line by itself

commit - 66eecf0df5e997194c448a2134bb59067ce1da17
commit + dc2a05aa2111fe14be0f0c3e025337dc9340b111
blob - f231cd39fabd9b35e18d1a94dd8af5b2c6f2c86f
blob + de766918c8635621d36ab23903abad2ef769e5bc
--- regress/cmdline/cherrypick.sh
+++ regress/cmdline/cherrypick.sh
@@ -1424,7 +1424,45 @@ test_cherrypick_same_branch() {
 	test_done "$testroot" "$ret"
 }
 
+test_cherrypick_dot_on_a_line_by_itself() {
+	local testroot=`test_init cherrypick_dot_on_a_line_by_itself`
 
+	got checkout $testroot/repo $testroot/wt > /dev/null
+	ret="$?"
+	if [ "$ret" != "0" ]; then
+		test_done "$testroot" "$ret"
+		return 1
+	fi
+
+	(cd $testroot/repo && git checkout -q -b newbranch)
+	printf "modified\ndelta\n.\non\nbranch\n" > $testroot/repo/gamma/delta
+	git_commit $testroot/repo -m "committing to delta on newbranch"
+	local branch_rev=`git_show_head $testroot/repo`
+
+	(cd $testroot/wt && got cherrypick newbranch > $testroot/stdout)
+
+	echo "G  gamma/delta" >> $testroot/stdout.expected
+	echo "Merged commit $branch_rev" >> $testroot/stdout.expected
+
+	cmp -s $testroot/stdout.expected $testroot/stdout
+	ret="$?"
+	if [ "$ret" != "0" ]; then
+		diff -u $testroot/stdout.expected $testroot/stdout
+		test_done "$testroot" "$ret"
+		return 1
+	fi
+
+	printf "modified\ndelta\n.\non\nbranch\n" > $testroot/content.expected
+	cat $testroot/wt/gamma/delta > $testroot/content
+	cmp -s $testroot/content.expected $testroot/content
+	ret="$?"
+	if [ "$ret" != "0" ]; then
+		#diff -u $testroot/content.expected $testroot/content
+		ret="xfail (badly merged content)"
+	fi
+	test_done "$testroot" "$ret"
+}
+
 test_parseargs "$@"
 run_test test_cherrypick_basic
 run_test test_cherrypick_root_commit
@@ -1440,3 +1478,4 @@ run_test test_cherrypick_conflict_no_eol
 run_test test_cherrypick_conflict_no_eol2
 run_test test_cherrypick_unrelated_changes
 run_test test_cherrypick_same_branch
+run_test test_cherrypick_dot_on_a_line_by_itself