[thirdparty/git.git] / t / t1001-read-tree-m-2way.sh

#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#

test_description='Two way merge with read-tree -m $H $M

This test tries two-way merge (aka fast-forward with carry forward).

There is the head (called H) and another commit (called M), which is
simply ahead of H.  The index and the work tree contains a state that
is derived from H, but may also have local changes.  This test checks
all the combinations described in the two-tree merge "carry forward"
rules, found in <Documentation/git read-tree.txt>.

In the test, these paths are used:
        bozbar  - in H, stays in M, modified from bozbar to gnusto
        frotz   - not in H added in M
        nitfol  - in H, stays in M unmodified
        rezrov  - in H, deleted in M
        yomin   - not in H nor M
'
. ./test-lib.sh

read_tree_twoway () {
    git read-tree -m "$1" "$2" && git ls-files --stage
}

compare_change () {
	sed -n >current \
	    -e '/^--- /d; /^+++ /d; /^@@ /d;' \
	    -e 's/^\([-+][0-7][0-7][0-7][0-7][0-7][0-7]\) '"$_x40"' /\1 X /p' \
	    "$1"
	test_cmp expected current
}

check_cache_at () {
	clean_if_empty=`git diff-files -- "$1"`
	case "$clean_if_empty" in
	'')  echo "$1: clean" ;;
	?*)  echo "$1: dirty" ;;
	esac
	case "$2,$clean_if_empty" in
	clean,)		:     ;;
	clean,?*)	false ;;
	dirty,)		false ;;
	dirty,?*)	:     ;;
	esac
}

cat >bozbar-old <<\EOF
This is a sample file used in two-way fast-forward merge
tests.  Its second line ends with a magic word bozbar
which will be modified by the merged head to gnusto.
It has some extra lines so that external tools can
successfully merge independent changes made to later
lines (such as this one), avoiding line conflicts.
EOF

sed -e 's/bozbar/gnusto (earlier bozbar)/' bozbar-old >bozbar-new

test_expect_success \
    setup \
    'echo frotz >frotz &&
     echo nitfol >nitfol &&
     cat bozbar-old >bozbar &&
     echo rezrov >rezrov &&
     echo yomin >yomin &&
     git update-index --add nitfol bozbar rezrov &&
     treeH=`git write-tree` &&
     echo treeH $treeH &&
     git ls-tree $treeH &&

     cat bozbar-new >bozbar &&
     git update-index --add frotz bozbar --force-remove rezrov &&
     git ls-files --stage >M.out &&
     treeM=`git write-tree` &&
     echo treeM $treeM &&
     git ls-tree $treeM &&
     git diff-tree $treeH $treeM'

test_expect_success \
    '1, 2, 3 - no carry forward' \
    'rm -f .git/index &&
     read_tree_twoway $treeH $treeM &&
     git ls-files --stage >1-3.out &&
     test_cmp M.out 1-3.out &&
     check_cache_at bozbar dirty &&
     check_cache_at frotz dirty &&
     check_cache_at nitfol dirty'

echo '+100644 X 0	yomin' >expected

test_expect_success \
    '4 - carry forward local addition.' \
    'rm -f .git/index &&
     git read-tree $treeH &&
     git checkout-index -u -f -q -a &&
     git update-index --add yomin &&
     read_tree_twoway $treeH $treeM &&
     git ls-files --stage >4.out &&
     test_must_fail git diff --no-index M.out 4.out >4diff.out &&
     compare_change 4diff.out expected &&
     check_cache_at yomin clean'

test_expect_success \
    '5 - carry forward local addition.' \
    'rm -f .git/index &&
     git read-tree $treeH &&
     git checkout-index -u -f -q -a &&
     echo yomin >yomin &&
     git update-index --add yomin &&
     echo yomin yomin >yomin &&
     read_tree_twoway $treeH $treeM &&
     git ls-files --stage >5.out &&
     test_must_fail git diff --no-index M.out 5.out >5diff.out &&
     compare_change 5diff.out expected &&
     check_cache_at yomin dirty'

test_expect_success \
    '6 - local addition already has the same.' \
    'rm -f .git/index &&
     git read-tree $treeH &&
     git checkout-index -u -f -q -a &&
     git update-index --add frotz &&
     read_tree_twoway $treeH $treeM &&
     git ls-files --stage >6.out &&
     test_cmp M.out 6.out &&
     check_cache_at frotz clean'

test_expect_success \
    '7 - local addition already has the same.' \
    'rm -f .git/index &&
     git read-tree $treeH &&
     git checkout-index -u -f -q -a &&
     echo frotz >frotz &&
     git update-index --add frotz &&
     echo frotz frotz >frotz &&
     read_tree_twoway $treeH $treeM &&
     git ls-files --stage >7.out &&
     test_cmp M.out 7.out &&
     check_cache_at frotz dirty'

test_expect_success \
    '8 - conflicting addition.' \
    'rm -f .git/index &&
     git read-tree $treeH &&
     git checkout-index -u -f -q -a &&
     echo frotz frotz >frotz &&
     git update-index --add frotz &&
     if read_tree_twoway $treeH $treeM; then false; else :; fi'

test_expect_success \
    '9 - conflicting addition.' \
    'rm -f .git/index &&
     git read-tree $treeH &&
     git checkout-index -u -f -q -a &&
     echo frotz frotz >frotz &&
     git update-index --add frotz &&
     echo frotz >frotz &&
     if read_tree_twoway $treeH $treeM; then false; else :; fi'

test_expect_success \
    '10 - path removed.' \
    'rm -f .git/index &&
     git read-tree $treeH &&
     git checkout-index -u -f -q -a &&
     echo rezrov >rezrov &&
     git update-index --add rezrov &&
     read_tree_twoway $treeH $treeM &&
     git ls-files --stage >10.out &&
     test_cmp M.out 10.out'

test_expect_success \
    '11 - dirty path removed.' \
    'rm -f .git/index &&
     git read-tree $treeH &&
     git checkout-index -u -f -q -a &&
     echo rezrov >rezrov &&
     git update-index --add rezrov &&
     echo rezrov rezrov >rezrov &&
     if read_tree_twoway $treeH $treeM; then false; else :; fi'

test_expect_success \
    '12 - unmatching local changes being removed.' \
    'rm -f .git/index &&
     git read-tree $treeH &&
     git checkout-index -u -f -q -a &&
     echo rezrov rezrov >rezrov &&
     git update-index --add rezrov &&
     if read_tree_twoway $treeH $treeM; then false; else :; fi'

test_expect_success \
    '13 - unmatching local changes being removed.' \
    'rm -f .git/index &&
     git read-tree $treeH &&
     git checkout-index -u -f -q -a &&
     echo rezrov rezrov >rezrov &&
     git update-index --add rezrov &&
     echo rezrov >rezrov &&
     if read_tree_twoway $treeH $treeM; then false; else :; fi'

cat >expected <<EOF
-100644 X 0	nitfol
+100644 X 0	nitfol
EOF

test_expect_success \
    '14 - unchanged in two heads.' \
    'rm -f .git/index &&
     git read-tree $treeH &&
     git checkout-index -u -f -q -a &&
     echo nitfol nitfol >nitfol &&
     git update-index --add nitfol &&
     read_tree_twoway $treeH $treeM &&
     git ls-files --stage >14.out &&
     test_must_fail git diff --no-index M.out 14.out >14diff.out &&
     compare_change 14diff.out expected &&
     check_cache_at nitfol clean'

test_expect_success \
    '15 - unchanged in two heads.' \
    'rm -f .git/index &&
     git read-tree $treeH &&
     git checkout-index -u -f -q -a &&
     echo nitfol nitfol >nitfol &&
     git update-index --add nitfol &&
     echo nitfol nitfol nitfol >nitfol &&
     read_tree_twoway $treeH $treeM &&
     git ls-files --stage >15.out &&
     test_must_fail git diff --no-index M.out 15.out >15diff.out &&
     compare_change 15diff.out expected &&
     check_cache_at nitfol dirty'

test_expect_success \
    '16 - conflicting local change.' \
    'rm -f .git/index &&
     git read-tree $treeH &&
     git checkout-index -u -f -q -a &&
     echo bozbar bozbar >bozbar &&
     git update-index --add bozbar &&
     if read_tree_twoway $treeH $treeM; then false; else :; fi'

test_expect_success \
    '17 - conflicting local change.' \
    'rm -f .git/index &&
     git read-tree $treeH &&
     git checkout-index -u -f -q -a &&
     echo bozbar bozbar >bozbar &&
     git update-index --add bozbar &&
     echo bozbar bozbar bozbar >bozbar &&
     if read_tree_twoway $treeH $treeM; then false; else :; fi'

test_expect_success \
    '18 - local change already having a good result.' \
    'rm -f .git/index &&
     git read-tree $treeH &&
     git checkout-index -u -f -q -a &&
     cat bozbar-new >bozbar &&
     git update-index --add bozbar &&
     read_tree_twoway $treeH $treeM &&
     git ls-files --stage >18.out &&
     test_cmp M.out 18.out &&
     check_cache_at bozbar clean'

test_expect_success \
    '19 - local change already having a good result, further modified.' \
    'rm -f .git/index &&
     git read-tree $treeH &&
     git checkout-index -u -f -q -a &&
     cat bozbar-new >bozbar &&
     git update-index --add bozbar &&
     echo gnusto gnusto >bozbar &&
     read_tree_twoway $treeH $treeM &&
     git ls-files --stage >19.out &&
     test_cmp M.out 19.out &&
     check_cache_at bozbar dirty'

test_expect_success \
    '20 - no local change, use new tree.' \
    'rm -f .git/index &&
     git read-tree $treeH &&
     git checkout-index -u -f -q -a &&
     cat bozbar-old >bozbar &&
     git update-index --add bozbar &&
     read_tree_twoway $treeH $treeM &&
     git ls-files --stage >20.out &&
     test_cmp M.out 20.out &&
     check_cache_at bozbar dirty'

test_expect_success \
    '21 - no local change, dirty cache.' \
    'rm -f .git/index &&
     git read-tree $treeH &&
     git checkout-index -u -f -q -a &&
     cat bozbar-old >bozbar &&
     git update-index --add bozbar &&
     echo gnusto gnusto >bozbar &&
     if read_tree_twoway $treeH $treeM; then false; else :; fi'

# This fails with straight two-way fast-forward.
test_expect_success \
    '22 - local change cache updated.' \
    'rm -f .git/index &&
     git read-tree $treeH &&
     git checkout-index -u -f -q -a &&
     sed -e "s/such as/SUCH AS/" bozbar-old >bozbar &&
     git update-index --add bozbar &&
     if read_tree_twoway $treeH $treeM; then false; else :; fi'

# Also make sure we did not break DF vs DF/DF case.
test_expect_success \
    'DF vs DF/DF case setup.' \
    'rm -f .git/index &&
     echo DF >DF &&
     git update-index --add DF &&
     treeDF=`git write-tree` &&
     echo treeDF $treeDF &&
     git ls-tree $treeDF &&

     rm -f DF &&
     mkdir DF &&
     echo DF/DF >DF/DF &&
     git update-index --add --remove DF DF/DF &&
     treeDFDF=`git write-tree` &&
     echo treeDFDF $treeDFDF &&
     git ls-tree $treeDFDF &&
     git ls-files --stage >DFDF.out'

test_expect_success \
    'DF vs DF/DF case test.' \
    'rm -f .git/index &&
     rm -fr DF &&
     echo DF >DF &&
     git update-index --add DF &&
     read_tree_twoway $treeDF $treeDFDF &&
     git ls-files --stage >DFDFcheck.out &&
     test_cmp DFDF.out DFDFcheck.out &&
     check_cache_at DF/DF dirty &&
     :'

test_expect_success \
    'a/b (untracked) vs a case setup.' \
    'rm -f .git/index &&
     : >a &&
     git update-index --add a &&
     treeM=`git write-tree` &&
     echo treeM $treeM &&
     git ls-tree $treeM &&
     git ls-files --stage >treeM.out &&

     rm -f a &&
     git update-index --remove a &&
     mkdir a &&
     : >a/b &&
     treeH=`git write-tree` &&
     echo treeH $treeH &&
     git ls-tree $treeH'

test_expect_success \
    'a/b (untracked) vs a, plus c/d case test.' \
    'test_must_fail git read-tree -u -m "$treeH" "$treeM" &&
     git ls-files --stage &&
     test -f a/b'

test_expect_success \
    'a/b vs a, plus c/d case setup.' \
    'rm -f .git/index &&
     rm -fr a &&
     : >a &&
     mkdir c &&
     : >c/d &&
     git update-index --add a c/d &&
     treeM=`git write-tree` &&
     echo treeM $treeM &&
     git ls-tree $treeM &&
     git ls-files --stage >treeM.out &&

     rm -f a &&
     mkdir a &&
     : >a/b &&
     git update-index --add --remove a a/b &&
     treeH=`git write-tree` &&
     echo treeH $treeH &&
     git ls-tree $treeH'

test_expect_success \
    'a/b vs a, plus c/d case test.' \
    'git read-tree -u -m "$treeH" "$treeM" &&
     git ls-files --stage | tee >treeMcheck.out &&
     test_cmp treeM.out treeMcheck.out'

test_expect_success '-m references the correct modified tree' '
	echo >file-a &&
	echo >file-b &&
	git add file-a file-b &&
	git commit -a -m "test for correct modified tree" &&
	git branch initial-mod &&
	echo b >file-b &&
	git commit -a -m "B" &&
	echo a >file-a &&
	git add file-a &&
	git ls-tree $(git write-tree) file-a >expect &&
	git read-tree -m HEAD initial-mod &&
	git ls-tree $(git write-tree) file-a >actual &&
	test_cmp expect actual
'

test_done
Commit	Line	Data
c8596009 JH	1	#!/bin/sh
	2	#
	3	# Copyright (c) 2005 Junio C Hamano
	4	#
	5
	6	test_description='Two way merge with read-tree -m $H $M
	7
a75d7b54	8	This test tries two-way merge (aka fast-forward with carry forward).
c8596009 JH	9
	10	There is the head (called H) and another commit (called M), which is
	11	simply ahead of H. The index and the work tree contains a state that
	12	is derived from H, but may also have local changes. This test checks
	13	all the combinations described in the two-tree merge "carry forward"
5be60078	14	rules, found in <Documentation/git read-tree.txt>.
c8596009 JH	15
	16	In the test, these paths are used:
	17	bozbar - in H, stays in M, modified from bozbar to gnusto
	18	frotz - not in H added in M
	19	nitfol - in H, stays in M unmodified
	20	rezrov - in H, deleted in M
	21	yomin - not in H nor M
	22	'
	23	. ./test-lib.sh
	24
76bc82ca	25	read_tree_twoway () {
5be60078	26	git read-tree -m "$1" "$2" && git ls-files --stage
76bc82ca JH	27	}
76bc82ca JH	28
c8596009	29	compare_change () {
76bc82ca	30	sed -n >current \
c8596009	31	-e '/^--- /d; /^+++ /d; /^@@ /d;' \
76bc82ca JH	32	-e 's/^\([-+][0-7][0-7][0-7][0-7][0-7][0-7]\) '"$_x40"' /\1 X /p' \
76bc82ca JH	33	"$1"
3af82863	34	test_cmp expected current
c8596009 JH	35	}
	36
	37	check_cache_at () {
5be60078	38	clean_if_empty=`git diff-files -- "$1"`
c8596009 JH	39	case "$clean_if_empty" in
	40	'') echo "$1: clean" ;;
	41	?*) echo "$1: dirty" ;;
	42	esac
	43	case "$2,$clean_if_empty" in
	44	clean,) : ;;
	45	clean,?*) false ;;
	46	dirty,) false ;;
	47	dirty,?*) : ;;
	48	esac
	49	}
	50
1abb3f14	51	cat >bozbar-old <<\EOF
a75d7b54	52	This is a sample file used in two-way fast-forward merge
1abb3f14 JH	53	tests. Its second line ends with a magic word bozbar
	54	which will be modified by the merged head to gnusto.
	55	It has some extra lines so that external tools can
	56	successfully merge independent changes made to later
	57	lines (such as this one), avoiding line conflicts.
	58	EOF
	59
	60	sed -e 's/bozbar/gnusto (earlier bozbar)/' bozbar-old >bozbar-new
	61
c8596009 JH	62	test_expect_success \
	63	setup \
	64	'echo frotz >frotz &&
	65	echo nitfol >nitfol &&
1abb3f14	66	cat bozbar-old >bozbar &&
c8596009 JH	67	echo rezrov >rezrov &&
c8596009 JH	68	echo yomin >yomin &&
5be60078 JH	69	git update-index --add nitfol bozbar rezrov &&
5be60078 JH	70	treeH=`git write-tree` &&
c8596009	71	echo treeH $treeH &&
5be60078	72	git ls-tree $treeH &&
c8596009	73
1abb3f14	74	cat bozbar-new >bozbar &&
5be60078 JH	75	git update-index --add frotz bozbar --force-remove rezrov &&
	76	git ls-files --stage >M.out &&
	77	treeM=`git write-tree` &&
c8596009	78	echo treeM $treeM &&
5be60078 JH	79	git ls-tree $treeM &&
5be60078 JH	80	git diff-tree $treeH $treeM'
c8596009 JH	81
	82	test_expect_success \
	83	'1, 2, 3 - no carry forward' \
	84	'rm -f .git/index &&
76bc82ca	85	read_tree_twoway $treeH $treeM &&
5be60078	86	git ls-files --stage >1-3.out &&
3af82863	87	test_cmp M.out 1-3.out &&
c8596009 JH	88	check_cache_at bozbar dirty &&
	89	check_cache_at frotz dirty &&
	90	check_cache_at nitfol dirty'
	91
	92	echo '+100644 X 0 yomin' >expected
	93
	94	test_expect_success \
	95	'4 - carry forward local addition.' \
	96	'rm -f .git/index &&
5be60078 JH	97	git read-tree $treeH &&
	98	git checkout-index -u -f -q -a &&
	99	git update-index --add yomin &&
76bc82ca	100	read_tree_twoway $treeH $treeM &&
315e7654 EN	101	git ls-files --stage >4.out &&
315e7654 EN	102	test_must_fail git diff --no-index M.out 4.out >4diff.out &&
c8596009 JH	103	compare_change 4diff.out expected &&
	104	check_cache_at yomin clean'
	105
	106	test_expect_success \
	107	'5 - carry forward local addition.' \
	108	'rm -f .git/index &&
5be60078 JH	109	git read-tree $treeH &&
5be60078 JH	110	git checkout-index -u -f -q -a &&
c8596009	111	echo yomin >yomin &&
5be60078	112	git update-index --add yomin &&
c8596009	113	echo yomin yomin >yomin &&
76bc82ca	114	read_tree_twoway $treeH $treeM &&
315e7654 EN	115	git ls-files --stage >5.out &&
315e7654 EN	116	test_must_fail git diff --no-index M.out 5.out >5diff.out &&
c8596009 JH	117	compare_change 5diff.out expected &&
	118	check_cache_at yomin dirty'
	119
	120	test_expect_success \
	121	'6 - local addition already has the same.' \
	122	'rm -f .git/index &&
5be60078 JH	123	git read-tree $treeH &&
	124	git checkout-index -u -f -q -a &&
	125	git update-index --add frotz &&
76bc82ca	126	read_tree_twoway $treeH $treeM &&
5be60078	127	git ls-files --stage >6.out &&
3af82863	128	test_cmp M.out 6.out &&
c8596009 JH	129	check_cache_at frotz clean'
	130
	131	test_expect_success \
	132	'7 - local addition already has the same.' \
	133	'rm -f .git/index &&
5be60078 JH	134	git read-tree $treeH &&
5be60078 JH	135	git checkout-index -u -f -q -a &&
c8596009	136	echo frotz >frotz &&
5be60078	137	git update-index --add frotz &&
c8596009	138	echo frotz frotz >frotz &&
76bc82ca	139	read_tree_twoway $treeH $treeM &&
5be60078	140	git ls-files --stage >7.out &&
3af82863	141	test_cmp M.out 7.out &&
c8596009 JH	142	check_cache_at frotz dirty'
	143
	144	test_expect_success \
	145	'8 - conflicting addition.' \
	146	'rm -f .git/index &&
5be60078 JH	147	git read-tree $treeH &&
5be60078 JH	148	git checkout-index -u -f -q -a &&
c8596009	149	echo frotz frotz >frotz &&
5be60078	150	git update-index --add frotz &&
76bc82ca	151	if read_tree_twoway $treeH $treeM; then false; else :; fi'
c8596009 JH	152
	153	test_expect_success \
	154	'9 - conflicting addition.' \
	155	'rm -f .git/index &&
5be60078 JH	156	git read-tree $treeH &&
5be60078 JH	157	git checkout-index -u -f -q -a &&
c8596009	158	echo frotz frotz >frotz &&
5be60078	159	git update-index --add frotz &&
c8596009	160	echo frotz >frotz &&
76bc82ca	161	if read_tree_twoway $treeH $treeM; then false; else :; fi'
c8596009 JH	162
	163	test_expect_success \
	164	'10 - path removed.' \
	165	'rm -f .git/index &&
5be60078 JH	166	git read-tree $treeH &&
5be60078 JH	167	git checkout-index -u -f -q -a &&
c8596009	168	echo rezrov >rezrov &&
5be60078	169	git update-index --add rezrov &&
76bc82ca	170	read_tree_twoway $treeH $treeM &&
5be60078	171	git ls-files --stage >10.out &&
3af82863	172	test_cmp M.out 10.out'
c8596009 JH	173
	174	test_expect_success \
	175	'11 - dirty path removed.' \
	176	'rm -f .git/index &&
5be60078 JH	177	git read-tree $treeH &&
5be60078 JH	178	git checkout-index -u -f -q -a &&
c8596009	179	echo rezrov >rezrov &&
5be60078	180	git update-index --add rezrov &&
c8596009	181	echo rezrov rezrov >rezrov &&
76bc82ca	182	if read_tree_twoway $treeH $treeM; then false; else :; fi'
c8596009 JH	183
	184	test_expect_success \
	185	'12 - unmatching local changes being removed.' \
	186	'rm -f .git/index &&
5be60078 JH	187	git read-tree $treeH &&
5be60078 JH	188	git checkout-index -u -f -q -a &&
c8596009	189	echo rezrov rezrov >rezrov &&
5be60078	190	git update-index --add rezrov &&
76bc82ca	191	if read_tree_twoway $treeH $treeM; then false; else :; fi'
c8596009 JH	192
	193	test_expect_success \
	194	'13 - unmatching local changes being removed.' \
	195	'rm -f .git/index &&
5be60078 JH	196	git read-tree $treeH &&
5be60078 JH	197	git checkout-index -u -f -q -a &&
c8596009	198	echo rezrov rezrov >rezrov &&
5be60078	199	git update-index --add rezrov &&
c8596009	200	echo rezrov >rezrov &&
76bc82ca	201	if read_tree_twoway $treeH $treeM; then false; else :; fi'
c8596009 JH	202
	203	cat >expected <<EOF
	204	-100644 X 0 nitfol
	205	+100644 X 0 nitfol
	206	EOF
	207
	208	test_expect_success \
	209	'14 - unchanged in two heads.' \
	210	'rm -f .git/index &&
5be60078 JH	211	git read-tree $treeH &&
5be60078 JH	212	git checkout-index -u -f -q -a &&
c8596009	213	echo nitfol nitfol >nitfol &&
5be60078	214	git update-index --add nitfol &&
76bc82ca	215	read_tree_twoway $treeH $treeM &&
315e7654 EN	216	git ls-files --stage >14.out &&
315e7654 EN	217	test_must_fail git diff --no-index M.out 14.out >14diff.out &&
c8596009 JH	218	compare_change 14diff.out expected &&
	219	check_cache_at nitfol clean'
	220
	221	test_expect_success \
	222	'15 - unchanged in two heads.' \
	223	'rm -f .git/index &&
5be60078 JH	224	git read-tree $treeH &&
5be60078 JH	225	git checkout-index -u -f -q -a &&
c8596009	226	echo nitfol nitfol >nitfol &&
5be60078	227	git update-index --add nitfol &&
c8596009	228	echo nitfol nitfol nitfol >nitfol &&
76bc82ca	229	read_tree_twoway $treeH $treeM &&
315e7654 EN	230	git ls-files --stage >15.out &&
315e7654 EN	231	test_must_fail git diff --no-index M.out 15.out >15diff.out &&
c8596009 JH	232	compare_change 15diff.out expected &&
	233	check_cache_at nitfol dirty'
	234
	235	test_expect_success \
	236	'16 - conflicting local change.' \
	237	'rm -f .git/index &&
5be60078 JH	238	git read-tree $treeH &&
5be60078 JH	239	git checkout-index -u -f -q -a &&
c8596009	240	echo bozbar bozbar >bozbar &&
5be60078	241	git update-index --add bozbar &&
76bc82ca	242	if read_tree_twoway $treeH $treeM; then false; else :; fi'
c8596009 JH	243
	244	test_expect_success \
	245	'17 - conflicting local change.' \
	246	'rm -f .git/index &&
5be60078 JH	247	git read-tree $treeH &&
5be60078 JH	248	git checkout-index -u -f -q -a &&
c8596009	249	echo bozbar bozbar >bozbar &&
5be60078	250	git update-index --add bozbar &&
c8596009	251	echo bozbar bozbar bozbar >bozbar &&
76bc82ca	252	if read_tree_twoway $treeH $treeM; then false; else :; fi'
c8596009 JH	253
	254	test_expect_success \
	255	'18 - local change already having a good result.' \
	256	'rm -f .git/index &&
5be60078 JH	257	git read-tree $treeH &&
5be60078 JH	258	git checkout-index -u -f -q -a &&
1abb3f14	259	cat bozbar-new >bozbar &&
5be60078	260	git update-index --add bozbar &&
76bc82ca	261	read_tree_twoway $treeH $treeM &&
5be60078	262	git ls-files --stage >18.out &&
3af82863	263	test_cmp M.out 18.out &&
c8596009 JH	264	check_cache_at bozbar clean'
	265
	266	test_expect_success \
	267	'19 - local change already having a good result, further modified.' \
	268	'rm -f .git/index &&
5be60078 JH	269	git read-tree $treeH &&
5be60078 JH	270	git checkout-index -u -f -q -a &&
1abb3f14	271	cat bozbar-new >bozbar &&
5be60078	272	git update-index --add bozbar &&
c8596009	273	echo gnusto gnusto >bozbar &&
76bc82ca	274	read_tree_twoway $treeH $treeM &&
5be60078	275	git ls-files --stage >19.out &&
3af82863	276	test_cmp M.out 19.out &&
c8596009 JH	277	check_cache_at bozbar dirty'
	278
	279	test_expect_success \
	280	'20 - no local change, use new tree.' \
	281	'rm -f .git/index &&
5be60078 JH	282	git read-tree $treeH &&
5be60078 JH	283	git checkout-index -u -f -q -a &&
1abb3f14	284	cat bozbar-old >bozbar &&
5be60078	285	git update-index --add bozbar &&
76bc82ca	286	read_tree_twoway $treeH $treeM &&
5be60078	287	git ls-files --stage >20.out &&
3af82863	288	test_cmp M.out 20.out &&
c8596009 JH	289	check_cache_at bozbar dirty'
	290
	291	test_expect_success \
	292	'21 - no local change, dirty cache.' \
	293	'rm -f .git/index &&
5be60078 JH	294	git read-tree $treeH &&
5be60078 JH	295	git checkout-index -u -f -q -a &&
1abb3f14	296	cat bozbar-old >bozbar &&
5be60078	297	git update-index --add bozbar &&
c8596009	298	echo gnusto gnusto >bozbar &&
76bc82ca	299	if read_tree_twoway $treeH $treeM; then false; else :; fi'
c8596009	300
a75d7b54	301	# This fails with straight two-way fast-forward.
1abb3f14 JH	302	test_expect_success \
	303	'22 - local change cache updated.' \
	304	'rm -f .git/index &&
5be60078 JH	305	git read-tree $treeH &&
5be60078 JH	306	git checkout-index -u -f -q -a &&
1abb3f14	307	sed -e "s/such as/SUCH AS/" bozbar-old >bozbar &&
5be60078	308	git update-index --add bozbar &&
1abb3f14 JH	309	if read_tree_twoway $treeH $treeM; then false; else :; fi'
1abb3f14 JH	310
c8596009 JH	311	# Also make sure we did not break DF vs DF/DF case.
	312	test_expect_success \
	313	'DF vs DF/DF case setup.' \
	314	'rm -f .git/index &&
	315	echo DF >DF &&
5be60078 JH	316	git update-index --add DF &&
5be60078 JH	317	treeDF=`git write-tree` &&
c8596009	318	echo treeDF $treeDF &&
5be60078	319	git ls-tree $treeDF &&
c8596009 JH	320
	321	rm -f DF &&
	322	mkdir DF &&
	323	echo DF/DF >DF/DF &&
5be60078 JH	324	git update-index --add --remove DF DF/DF &&
5be60078 JH	325	treeDFDF=`git write-tree` &&
c8596009	326	echo treeDFDF $treeDFDF &&
5be60078 JH	327	git ls-tree $treeDFDF &&
5be60078 JH	328	git ls-files --stage >DFDF.out'
c8596009 JH	329
	330	test_expect_success \
	331	'DF vs DF/DF case test.' \
	332	'rm -f .git/index &&
	333	rm -fr DF &&
	334	echo DF >DF &&
5be60078	335	git update-index --add DF &&
76bc82ca	336	read_tree_twoway $treeDF $treeDFDF &&
5be60078	337	git ls-files --stage >DFDFcheck.out &&
3af82863	338	test_cmp DFDF.out DFDFcheck.out &&
76bc82ca JH	339	check_cache_at DF/DF dirty &&
76bc82ca JH	340	:'
c8596009	341
6b9315d5 CB	342	test_expect_success \
	343	'a/b (untracked) vs a case setup.' \
	344	'rm -f .git/index &&
	345	: >a &&
	346	git update-index --add a &&
	347	treeM=`git write-tree` &&
	348	echo treeM $treeM &&
	349	git ls-tree $treeM &&
	350	git ls-files --stage >treeM.out &&
	351
	352	rm -f a &&
	353	git update-index --remove a &&
	354	mkdir a &&
	355	: >a/b &&
	356	treeH=`git write-tree` &&
	357	echo treeH $treeH &&
	358	git ls-tree $treeH'
	359
	360	test_expect_success \
	361	'a/b (untracked) vs a, plus c/d case test.' \
ce14e0b2	362	'test_must_fail git read-tree -u -m "$treeH" "$treeM" &&
6b9315d5 CB	363	git ls-files --stage &&
	364	test -f a/b'
	365
837e5fe9 CB	366	test_expect_success \
	367	'a/b vs a, plus c/d case setup.' \
	368	'rm -f .git/index &&
	369	rm -fr a &&
	370	: >a &&
	371	mkdir c &&
	372	: >c/d &&
	373	git update-index --add a c/d &&
	374	treeM=`git write-tree` &&
	375	echo treeM $treeM &&
	376	git ls-tree $treeM &&
	377	git ls-files --stage >treeM.out &&
	378
	379	rm -f a &&
315e7654	380	mkdir a &&
837e5fe9 CB	381	: >a/b &&
	382	git update-index --add --remove a a/b &&
	383	treeH=`git write-tree` &&
	384	echo treeH $treeH &&
	385	git ls-tree $treeH'
	386
	387	test_expect_success \
	388	'a/b vs a, plus c/d case test.' \
	389	'git read-tree -u -m "$treeH" "$treeM" &&
	390	git ls-files --stage \| tee >treeMcheck.out &&
	391	test_cmp treeM.out treeMcheck.out'
	392
b1f47514 JH	393	test_expect_success '-m references the correct modified tree' '
	394	echo >file-a &&
	395	echo >file-b &&
	396	git add file-a file-b &&
a48fcd83	397	git commit -a -m "test for correct modified tree" &&
b1f47514 JH	398	git branch initial-mod &&
	399	echo b >file-b &&
	400	git commit -a -m "B" &&
	401	echo a >file-a &&
	402	git add file-a &&
	403	git ls-tree $(git write-tree) file-a >expect &&
	404	git read-tree -m HEAD initial-mod &&
	405	git ls-tree $(git write-tree) file-a >actual &&
	406	test_cmp expect actual
	407	'
	408
c8596009	409	test_done