diff options
Diffstat (limited to 't/t1001-read-tree-m-2way.sh')
| -rwxr-xr-x | t/t1001-read-tree-m-2way.sh | 70 |
1 files changed, 63 insertions, 7 deletions
diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh index 309baa5ae2..b3e6bd57d0 100755 --- a/t/t1001-read-tree-m-2way.sh +++ b/t/t1001-read-tree-m-2way.sh @@ -29,7 +29,6 @@ read_tree_twoway () { _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40" compare_change () { - cat current 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' \ @@ -51,11 +50,22 @@ check_cache_at () { 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 && - echo bozbar >bozbar && + cat bozbar-old >bozbar && echo rezrov >rezrov && echo yomin >yomin && git-update-cache --add nitfol bozbar rezrov && @@ -63,7 +73,7 @@ test_expect_success \ echo treeH $treeH && git-ls-tree $treeH && - echo gnusto >bozbar && + cat bozbar-new >bozbar && git-update-cache --add frotz bozbar --force-remove rezrov && git-ls-files --stage >M.out && treeM=`git-write-tree` && @@ -86,6 +96,8 @@ echo '+100644 X 0 yomin' >expected test_expect_success \ '4 - carry forward local addition.' \ 'rm -f .git/index && + git-read-tree $treeH && + git-checkout-cache -u -f -q -a && git-update-cache --add yomin && read_tree_twoway $treeH $treeM && git-ls-files --stage >4.out || exit @@ -96,6 +108,8 @@ test_expect_success \ test_expect_success \ '5 - carry forward local addition.' \ 'rm -f .git/index && + git-read-tree $treeH && + git-checkout-cache -u -f -q -a && echo yomin >yomin && git-update-cache --add yomin && echo yomin yomin >yomin && @@ -108,6 +122,8 @@ test_expect_success \ test_expect_success \ '6 - local addition already has the same.' \ 'rm -f .git/index && + git-read-tree $treeH && + git-checkout-cache -u -f -q -a && git-update-cache --add frotz && read_tree_twoway $treeH $treeM && git-ls-files --stage >6.out && @@ -117,6 +133,8 @@ test_expect_success \ test_expect_success \ '7 - local addition already has the same.' \ 'rm -f .git/index && + git-read-tree $treeH && + git-checkout-cache -u -f -q -a && echo frotz >frotz && git-update-cache --add frotz && echo frotz frotz >frotz && @@ -128,6 +146,8 @@ test_expect_success \ test_expect_success \ '8 - conflicting addition.' \ 'rm -f .git/index && + git-read-tree $treeH && + git-checkout-cache -u -f -q -a && echo frotz frotz >frotz && git-update-cache --add frotz && if read_tree_twoway $treeH $treeM; then false; else :; fi' @@ -135,6 +155,8 @@ test_expect_success \ test_expect_success \ '9 - conflicting addition.' \ 'rm -f .git/index && + git-read-tree $treeH && + git-checkout-cache -u -f -q -a && echo frotz frotz >frotz && git-update-cache --add frotz && echo frotz >frotz && @@ -143,6 +165,8 @@ test_expect_success \ test_expect_success \ '10 - path removed.' \ 'rm -f .git/index && + git-read-tree $treeH && + git-checkout-cache -u -f -q -a && echo rezrov >rezrov && git-update-cache --add rezrov && read_tree_twoway $treeH $treeM && @@ -152,6 +176,8 @@ test_expect_success \ test_expect_success \ '11 - dirty path removed.' \ 'rm -f .git/index && + git-read-tree $treeH && + git-checkout-cache -u -f -q -a && echo rezrov >rezrov && git-update-cache --add rezrov && echo rezrov rezrov >rezrov && @@ -160,6 +186,8 @@ test_expect_success \ test_expect_success \ '12 - unmatching local changes being removed.' \ 'rm -f .git/index && + git-read-tree $treeH && + git-checkout-cache -u -f -q -a && echo rezrov rezrov >rezrov && git-update-cache --add rezrov && if read_tree_twoway $treeH $treeM; then false; else :; fi' @@ -167,6 +195,8 @@ test_expect_success \ test_expect_success \ '13 - unmatching local changes being removed.' \ 'rm -f .git/index && + git-read-tree $treeH && + git-checkout-cache -u -f -q -a && echo rezrov rezrov >rezrov && git-update-cache --add rezrov && echo rezrov >rezrov && @@ -180,6 +210,8 @@ EOF test_expect_success \ '14 - unchanged in two heads.' \ 'rm -f .git/index && + git-read-tree $treeH && + git-checkout-cache -u -f -q -a && echo nitfol nitfol >nitfol && git-update-cache --add nitfol && read_tree_twoway $treeH $treeM && @@ -191,6 +223,8 @@ test_expect_success \ test_expect_success \ '15 - unchanged in two heads.' \ 'rm -f .git/index && + git-read-tree $treeH && + git-checkout-cache -u -f -q -a && echo nitfol nitfol >nitfol && git-update-cache --add nitfol && echo nitfol nitfol nitfol >nitfol && @@ -203,6 +237,8 @@ test_expect_success \ test_expect_success \ '16 - conflicting local change.' \ 'rm -f .git/index && + git-read-tree $treeH && + git-checkout-cache -u -f -q -a && echo bozbar bozbar >bozbar && git-update-cache --add bozbar && if read_tree_twoway $treeH $treeM; then false; else :; fi' @@ -210,6 +246,8 @@ test_expect_success \ test_expect_success \ '17 - conflicting local change.' \ 'rm -f .git/index && + git-read-tree $treeH && + git-checkout-cache -u -f -q -a && echo bozbar bozbar >bozbar && git-update-cache --add bozbar && echo bozbar bozbar bozbar >bozbar && @@ -218,7 +256,9 @@ test_expect_success \ test_expect_success \ '18 - local change already having a good result.' \ 'rm -f .git/index && - echo gnusto >bozbar && + git-read-tree $treeH && + git-checkout-cache -u -f -q -a && + cat bozbar-new >bozbar && git-update-cache --add bozbar && read_tree_twoway $treeH $treeM && git-ls-files --stage >18.out && @@ -228,7 +268,9 @@ test_expect_success \ test_expect_success \ '19 - local change already having a good result, further modified.' \ 'rm -f .git/index && - echo gnusto >bozbar && + git-read-tree $treeH && + git-checkout-cache -u -f -q -a && + cat bozbar-new >bozbar && git-update-cache --add bozbar && echo gnusto gnusto >bozbar && read_tree_twoway $treeH $treeM && @@ -239,7 +281,9 @@ test_expect_success \ test_expect_success \ '20 - no local change, use new tree.' \ 'rm -f .git/index && - echo bozbar >bozbar && + git-read-tree $treeH && + git-checkout-cache -u -f -q -a && + cat bozbar-old >bozbar && git-update-cache --add bozbar && read_tree_twoway $treeH $treeM && git-ls-files --stage >20.out && @@ -249,11 +293,23 @@ test_expect_success \ test_expect_success \ '21 - no local change, dirty cache.' \ 'rm -f .git/index && - echo bozbar >bozbar && + git-read-tree $treeH && + git-checkout-cache -u -f -q -a && + cat bozbar-old >bozbar && git-update-cache --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-cache -u -f -q -a && + sed -e "s/such as/SUCH AS/" bozbar-old >bozbar && + git-update-cache --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.' \ |