#!/bin/sh # # Copyright (c) 2006 Shawn Pearce # global test_description := ''git checkout-index --temp test. With --temp flag, git checkout-index writes to temporary merge files rather than the tracked path.'' source ./test-lib.sh test_expect_success 'setup' ' mkdir asubdir && echo tree1path0 >path0 && echo tree1path1 >path1 && echo tree1path3 >path3 && echo tree1path4 >path4 && echo tree1asubdir/path5 >asubdir/path5 && git update-index --add path0 path1 path3 path4 asubdir/path5 && t1=$(git write-tree) && rm -f path* .merge_* actual .git/index && echo tree2path0 >path0 && echo tree2path1 >path1 && echo tree2path2 >path2 && echo tree2path4 >path4 && git update-index --add path0 path1 path2 path4 && t2=$(git write-tree) && rm -f path* .merge_* actual .git/index && echo tree2path0 >path0 && echo tree3path1 >path1 && echo tree3path2 >path2 && echo tree3path3 >path3 && git update-index --add path0 path1 path2 path3 && t3=$(git write-tree) ' test_expect_success 'checkout one stage 0 to temporary file' ' rm -f path* .merge_* actual .git/index && git read-tree $t1 && git checkout-index --temp -- path1 >actual && test_line_count = 1 actual && test $(cut "-d " -f2 actual) = path1 && p=$(cut "-d " -f1 actual) && test -f $p && test $(cat $p) = tree1path1 ' test_expect_success 'checkout all stage 0 to temporary files' ' rm -f path* .merge_* actual .git/index && git read-tree $t1 && git checkout-index -a --temp >actual && test_line_count = 5 actual && for f in path0 path1 path3 path4 asubdir/path5 do test $(grep $f actual | cut "-d " -f2) = $f && p=$(grep $f actual | cut "-d " -f1) && test -f $p && test $(cat $p) = tree1$f done ' test_expect_success 'setup 3-way merge' ' rm -f path* .merge_* actual .git/index && git read-tree -m $t1 $t2 $t3 ' test_expect_success 'checkout one stage 2 to temporary file' ' rm -f path* .merge_* actual && git checkout-index --stage=2 --temp -- path1 >actual && test_line_count = 1 actual && test $(cut "-d " -f2 actual) = path1 && p=$(cut "-d " -f1 actual) && test -f $p && test $(cat $p) = tree2path1 ' test_expect_success 'checkout all stage 2 to temporary files' ' rm -f path* .merge_* actual && git checkout-index --all --stage=2 --temp >actual && test_line_count = 3 actual && for f in path1 path2 path4 do test $(grep $f actual | cut "-d " -f2) = $f && p=$(grep $f actual | cut "-d " -f1) && test -f $p && test $(cat $p) = tree2$f done ' test_expect_success 'checkout all stages/one file to nothing' ' rm -f path* .merge_* actual && git checkout-index --stage=all --temp -- path0 >actual && test_line_count = 0 actual ' test_expect_success 'checkout all stages/one file to temporary files' ' rm -f path* .merge_* actual && git checkout-index --stage=all --temp -- path1 >actual && test_line_count = 1 actual && test $(cut "-d " -f2 actual) = path1 && cut "-d " -f1 actual | (read s1 s2 s3 && test -f $s1 && test -f $s2 && test -f $s3 && test $(cat $s1) = tree1path1 && test $(cat $s2) = tree2path1 && test $(cat $s3) = tree3path1) ' test_expect_success 'checkout some stages/one file to temporary files' ' rm -f path* .merge_* actual && git checkout-index --stage=all --temp -- path2 >actual && test_line_count = 1 actual && test $(cut "-d " -f2 actual) = path2 && cut "-d " -f1 actual | (read s1 s2 s3 && test $s1 = . && test -f $s2 && test -f $s3 && test $(cat $s2) = tree2path2 && test $(cat $s3) = tree3path2) ' test_expect_success 'checkout all stages/all files to temporary files' ' rm -f path* .merge_* actual && git checkout-index -a --stage=all --temp >actual && test_line_count = 5 actual ' test_expect_success '-- path0: no entry' ' test x$(grep path0 actual | cut "-d " -f2) = x ' test_expect_success '-- path1: all 3 stages' ' test $(grep path1 actual | cut "-d " -f2) = path1 && grep path1 actual | cut "-d " -f1 | (read s1 s2 s3 && test -f $s1 && test -f $s2 && test -f $s3 && test $(cat $s1) = tree1path1 && test $(cat $s2) = tree2path1 && test $(cat $s3) = tree3path1) ' test_expect_success '-- path2: no stage 1, have stage 2 and 3' ' test $(grep path2 actual | cut "-d " -f2) = path2 && grep path2 actual | cut "-d " -f1 | (read s1 s2 s3 && test $s1 = . && test -f $s2 && test -f $s3 && test $(cat $s2) = tree2path2 && test $(cat $s3) = tree3path2) ' test_expect_success '-- path3: no stage 2, have stage 1 and 3' ' test $(grep path3 actual | cut "-d " -f2) = path3 && grep path3 actual | cut "-d " -f1 | (read s1 s2 s3 && test -f $s1 && test $s2 = . && test -f $s3 && test $(cat $s1) = tree1path3 && test $(cat $s3) = tree3path3) ' test_expect_success '-- path4: no stage 3, have stage 1 and 3' ' test $(grep path4 actual | cut "-d " -f2) = path4 && grep path4 actual | cut "-d " -f1 | (read s1 s2 s3 && test -f $s1 && test -f $s2 && test $s3 = . && test $(cat $s1) = tree1path4 && test $(cat $s2) = tree2path4) ' test_expect_success '-- asubdir/path5: no stage 2 and 3 have stage 1' ' test $(grep asubdir/path5 actual | cut "-d " -f2) = asubdir/path5 && grep asubdir/path5 actual | cut "-d " -f1 | (read s1 s2 s3 && test -f $s1 && test $s2 = . && test $s3 = . && test $(cat $s1) = tree1asubdir/path5) ' test_expect_success 'checkout --temp within subdir' ' ( cd asubdir && git checkout-index -a --stage=all >actual && test_line_count = 1 actual && test $(grep path5 actual | cut "-d " -f2) = path5 && grep path5 actual | cut "-d " -f1 | (read s1 s2 s3 && test -f ../$s1 && test $s2 = . && test $s3 = . && test $(cat ../$s1) = tree1asubdir/path5) ) ' test_expect_success 'checkout --temp symlink' ' rm -f path* .merge_* actual .git/index && test_ln_s_add path7 path6 && git checkout-index --temp -a >actual && test_line_count = 1 actual && test $(cut "-d " -f2 actual) = path6 && p=$(cut "-d " -f1 actual) && test -f $p && test $(cat $p) = path7 ' test_expect_success 'emit well-formed relative path' ' rm -f path* .merge_* actual .git/index && >path0123456789 && git update-index --add path0123456789 && ( cd asubdir && git checkout-index --temp -- ../path0123456789 >actual && test_line_count = 1 actual && test $(cut "-d " -f2 actual) = ../path0123456789 ) ' test_done (CommandList children: [ (Assignment keyword: Assign_None pairs: [ (assign_pair lhs: (LhsName name:test_description) op: Equal rhs: { (SQ <"git checkout-index --temp test.\n"> <"\n"> <"With --temp flag, git checkout-index writes to temporary merge files\n"> <"rather than the tracked path."> ) } spids: [13] ) ] spids: [13] ) (C {(.)} {(./test-lib.sh)}) (C {(test_expect_success)} {(SQ )} { (SQ <"\n"> <"\tmkdir asubdir &&\n"> <"\techo tree1path0 >path0 &&\n"> <"\techo tree1path1 >path1 &&\n"> <"\techo tree1path3 >path3 &&\n"> <"\techo tree1path4 >path4 &&\n"> <"\techo tree1asubdir/path5 >asubdir/path5 &&\n"> <"\tgit update-index --add path0 path1 path3 path4 asubdir/path5 &&\n"> <"\tt1=$(git write-tree) &&\n"> <"\trm -f path* .merge_* actual .git/index &&\n"> <"\techo tree2path0 >path0 &&\n"> <"\techo tree2path1 >path1 &&\n"> <"\techo tree2path2 >path2 &&\n"> <"\techo tree2path4 >path4 &&\n"> <"\tgit update-index --add path0 path1 path2 path4 &&\n"> <"\tt2=$(git write-tree) &&\n"> <"\trm -f path* .merge_* actual .git/index &&\n"> <"\techo tree2path0 >path0 &&\n"> <"\techo tree3path1 >path1 &&\n"> <"\techo tree3path2 >path2 &&\n"> <"\techo tree3path3 >path3 &&\n"> <"\tgit update-index --add path0 path1 path2 path3 &&\n"> <"\tt3=$(git write-tree)\n"> ) } ) (C {(test_expect_success)} {(SQ <"checkout one stage 0 to temporary file">)} { (SQ <"\n"> <"\trm -f path* .merge_* actual .git/index &&\n"> <"\tgit read-tree $t1 &&\n"> <"\tgit checkout-index --temp -- path1 >actual &&\n"> <"\ttest_line_count = 1 actual &&\n"> <"\ttest $(cut \"-d\t\" -f2 actual) = path1 &&\n"> <"\tp=$(cut \"-d\t\" -f1 actual) &&\n"> <"\ttest -f $p &&\n"> <"\ttest $(cat $p) = tree1path1\n"> ) } ) (C {(test_expect_success)} {(SQ <"checkout all stage 0 to temporary files">)} { (SQ <"\n"> <"\trm -f path* .merge_* actual .git/index &&\n"> <"\tgit read-tree $t1 &&\n"> <"\tgit checkout-index -a --temp >actual &&\n"> <"\ttest_line_count = 5 actual &&\n"> <"\tfor f in path0 path1 path3 path4 asubdir/path5\n"> <"\tdo\n"> <"\t\ttest $(grep $f actual | cut \"-d\t\" -f2) = $f &&\n"> <"\t\tp=$(grep $f actual | cut \"-d\t\" -f1) &&\n"> <"\t\ttest -f $p &&\n"> <"\t\ttest $(cat $p) = tree1$f\n"> <"\tdone\n"> ) } ) (C {(test_expect_success)} {(SQ <"setup 3-way merge">)} { (SQ <"\n"> <"\trm -f path* .merge_* actual .git/index &&\n"> <"\tgit read-tree -m $t1 $t2 $t3\n"> ) } ) (C {(test_expect_success)} {(SQ <"checkout one stage 2 to temporary file">)} { (SQ <"\n"> <"\trm -f path* .merge_* actual &&\n"> <"\tgit checkout-index --stage=2 --temp -- path1 >actual &&\n"> <"\ttest_line_count = 1 actual &&\n"> <"\ttest $(cut \"-d\t\" -f2 actual) = path1 &&\n"> <"\tp=$(cut \"-d\t\" -f1 actual) &&\n"> <"\ttest -f $p &&\n"> <"\ttest $(cat $p) = tree2path1\n"> ) } ) (C {(test_expect_success)} {(SQ <"checkout all stage 2 to temporary files">)} { (SQ <"\n"> <"\trm -f path* .merge_* actual &&\n"> <"\tgit checkout-index --all --stage=2 --temp >actual &&\n"> <"\ttest_line_count = 3 actual &&\n"> <"\tfor f in path1 path2 path4\n"> <"\tdo\n"> <"\t\ttest $(grep $f actual | cut \"-d\t\" -f2) = $f &&\n"> <"\t\tp=$(grep $f actual | cut \"-d\t\" -f1) &&\n"> <"\t\ttest -f $p &&\n"> <"\t\ttest $(cat $p) = tree2$f\n"> <"\tdone\n"> ) } ) (C {(test_expect_success)} {(SQ <"checkout all stages/one file to nothing">)} { (SQ <"\n"> <"\trm -f path* .merge_* actual &&\n"> <"\tgit checkout-index --stage=all --temp -- path0 >actual &&\n"> <"\ttest_line_count = 0 actual\n"> ) } ) (C {(test_expect_success)} {(SQ <"checkout all stages/one file to temporary files">)} { (SQ <"\n"> <"\trm -f path* .merge_* actual &&\n"> <"\tgit checkout-index --stage=all --temp -- path1 >actual &&\n"> <"\ttest_line_count = 1 actual &&\n"> <"\ttest $(cut \"-d\t\" -f2 actual) = path1 &&\n"> <"\tcut \"-d\t\" -f1 actual | (read s1 s2 s3 &&\n"> <"\ttest -f $s1 &&\n"> <"\ttest -f $s2 &&\n"> <"\ttest -f $s3 &&\n"> <"\ttest $(cat $s1) = tree1path1 &&\n"> <"\ttest $(cat $s2) = tree2path1 &&\n"> <"\ttest $(cat $s3) = tree3path1)\n"> ) } ) (C {(test_expect_success)} {(SQ <"checkout some stages/one file to temporary files">)} { (SQ <"\n"> <"\trm -f path* .merge_* actual &&\n"> <"\tgit checkout-index --stage=all --temp -- path2 >actual &&\n"> <"\ttest_line_count = 1 actual &&\n"> <"\ttest $(cut \"-d\t\" -f2 actual) = path2 &&\n"> <"\tcut \"-d\t\" -f1 actual | (read s1 s2 s3 &&\n"> <"\ttest $s1 = . &&\n"> <"\ttest -f $s2 &&\n"> <"\ttest -f $s3 &&\n"> <"\ttest $(cat $s2) = tree2path2 &&\n"> <"\ttest $(cat $s3) = tree3path2)\n"> ) } ) (C {(test_expect_success)} {(SQ <"checkout all stages/all files to temporary files">)} { (SQ <"\n"> <"\trm -f path* .merge_* actual &&\n"> <"\tgit checkout-index -a --stage=all --temp >actual &&\n"> <"\ttest_line_count = 5 actual\n"> ) } ) (C {(test_expect_success)} {(SQ <"-- path0: no entry">)} {(SQ <"\n"> <"\ttest x$(grep path0 actual | cut \"-d\t\" -f2) = x\n">)} ) (C {(test_expect_success)} {(SQ <"-- path1: all 3 stages">)} { (SQ <"\n"> <"\ttest $(grep path1 actual | cut \"-d\t\" -f2) = path1 &&\n"> <"\tgrep path1 actual | cut \"-d\t\" -f1 | (read s1 s2 s3 &&\n"> <"\ttest -f $s1 &&\n"> <"\ttest -f $s2 &&\n"> <"\ttest -f $s3 &&\n"> <"\ttest $(cat $s1) = tree1path1 &&\n"> <"\ttest $(cat $s2) = tree2path1 &&\n"> <"\ttest $(cat $s3) = tree3path1)\n"> ) } ) (C {(test_expect_success)} {(SQ <"-- path2: no stage 1, have stage 2 and 3">)} { (SQ <"\n"> <"\ttest $(grep path2 actual | cut \"-d\t\" -f2) = path2 &&\n"> <"\tgrep path2 actual | cut \"-d\t\" -f1 | (read s1 s2 s3 &&\n"> <"\ttest $s1 = . &&\n"> <"\ttest -f $s2 &&\n"> <"\ttest -f $s3 &&\n"> <"\ttest $(cat $s2) = tree2path2 &&\n"> <"\ttest $(cat $s3) = tree3path2)\n"> ) } ) (C {(test_expect_success)} {(SQ <"-- path3: no stage 2, have stage 1 and 3">)} { (SQ <"\n"> <"\ttest $(grep path3 actual | cut \"-d\t\" -f2) = path3 &&\n"> <"\tgrep path3 actual | cut \"-d\t\" -f1 | (read s1 s2 s3 &&\n"> <"\ttest -f $s1 &&\n"> <"\ttest $s2 = . &&\n"> <"\ttest -f $s3 &&\n"> <"\ttest $(cat $s1) = tree1path3 &&\n"> <"\ttest $(cat $s3) = tree3path3)\n"> ) } ) (C {(test_expect_success)} {(SQ <"-- path4: no stage 3, have stage 1 and 3">)} { (SQ <"\n"> <"\ttest $(grep path4 actual | cut \"-d\t\" -f2) = path4 &&\n"> <"\tgrep path4 actual | cut \"-d\t\" -f1 | (read s1 s2 s3 &&\n"> <"\ttest -f $s1 &&\n"> <"\ttest -f $s2 &&\n"> <"\ttest $s3 = . &&\n"> <"\ttest $(cat $s1) = tree1path4 &&\n"> <"\ttest $(cat $s2) = tree2path4)\n"> ) } ) (C {(test_expect_success)} {(SQ <"-- asubdir/path5: no stage 2 and 3 have stage 1">)} { (SQ <"\n"> <"\ttest $(grep asubdir/path5 actual | cut \"-d\t\" -f2) = asubdir/path5 &&\n"> <"\tgrep asubdir/path5 actual | cut \"-d\t\" -f1 | (read s1 s2 s3 &&\n"> <"\ttest -f $s1 &&\n"> <"\ttest $s2 = . &&\n"> <"\ttest $s3 = . &&\n"> <"\ttest $(cat $s1) = tree1asubdir/path5)\n"> ) } ) (C {(test_expect_success)} {(SQ <"checkout --temp within subdir">)} { (SQ <"\n"> <"\t(\n"> <"\t\tcd asubdir &&\n"> <"\t\tgit checkout-index -a --stage=all >actual &&\n"> <"\t\ttest_line_count = 1 actual &&\n"> <"\t\ttest $(grep path5 actual | cut \"-d\t\" -f2) = path5 &&\n"> <"\t\tgrep path5 actual | cut \"-d\t\" -f1 | (read s1 s2 s3 &&\n"> <"\t\ttest -f ../$s1 &&\n"> <"\t\ttest $s2 = . &&\n"> <"\t\ttest $s3 = . &&\n"> <"\t\ttest $(cat ../$s1) = tree1asubdir/path5)\n"> <"\t)\n"> ) } ) (C {(test_expect_success)} {(SQ <"checkout --temp symlink">)} { (SQ <"\n"> <"\trm -f path* .merge_* actual .git/index &&\n"> <"\ttest_ln_s_add path7 path6 &&\n"> <"\tgit checkout-index --temp -a >actual &&\n"> <"\ttest_line_count = 1 actual &&\n"> <"\ttest $(cut \"-d\t\" -f2 actual) = path6 &&\n"> <"\tp=$(cut \"-d\t\" -f1 actual) &&\n"> <"\ttest -f $p &&\n"> <"\ttest $(cat $p) = path7\n"> ) } ) (C {(test_expect_success)} {(SQ <"emit well-formed relative path">)} { (SQ <"\n"> <"\trm -f path* .merge_* actual .git/index &&\n"> <"\t>path0123456789 &&\n"> <"\tgit update-index --add path0123456789 &&\n"> <"\t(\n"> <"\t\tcd asubdir &&\n"> <"\t\tgit checkout-index --temp -- ../path0123456789 >actual &&\n"> <"\t\ttest_line_count = 1 actual &&\n"> <"\t\ttest $(cut \"-d\t\" -f2 actual) = ../path0123456789\n"> <"\t)\n"> ) } ) (C {(test_done)}) ] )