X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=t%2Flib-read-tree-m-3way.sh;h=d6645b4f42f287c7572f0f868868739eb9908fb6;hb=b893f09104ee5f1d8710dfe17cdf1cbac995f17a;hp=d920c6b3a3bfbb5994244a78d1ad99ce02748122;hpb=63713028cd2c747b225c110193f63caff0f58aeb;p=git.git diff --git a/t/lib-read-tree-m-3way.sh b/t/lib-read-tree-m-3way.sh old mode 100644 new mode 100755 index d920c6b3..d6645b4f --- a/t/lib-read-tree-m-3way.sh +++ b/t/lib-read-tree-m-3way.sh @@ -142,3 +142,17 @@ test_expect_success \ 'recording branch B tree' \ 'tree_B=$(git-write-tree)' +test_expect_success \ + 'keep contents of 3 trees for easy access' \ + 'rm -f .git/index && + git-read-tree $tree_O && + mkdir .orig-O && + git-checkout-cache --prefix=.orig-O/ -f -q -a && + rm -f .git/index && + git-read-tree $tree_A && + mkdir .orig-A && + git-checkout-cache --prefix=.orig-A/ -f -q -a && + rm -f .git/index && + git-read-tree $tree_B && + mkdir .orig-B && + git-checkout-cache --prefix=.orig-B/ -f -q -a'