t / t2004-checkout-cache-temp.shon commit range-diff: suppress line count in outer diff (430be36)
   1#!/bin/sh
   2#
   3# Copyright (c) 2006 Shawn Pearce
   4#
   5
   6test_description='git checkout-index --temp test.
   7
   8With --temp flag, git checkout-index writes to temporary merge files
   9rather than the tracked path.'
  10
  11. ./test-lib.sh
  12
  13test_expect_success 'setup' '
  14        mkdir asubdir &&
  15        echo tree1path0 >path0 &&
  16        echo tree1path1 >path1 &&
  17        echo tree1path3 >path3 &&
  18        echo tree1path4 >path4 &&
  19        echo tree1asubdir/path5 >asubdir/path5 &&
  20        git update-index --add path0 path1 path3 path4 asubdir/path5 &&
  21        t1=$(git write-tree) &&
  22        rm -f path* .merge_* actual .git/index &&
  23        echo tree2path0 >path0 &&
  24        echo tree2path1 >path1 &&
  25        echo tree2path2 >path2 &&
  26        echo tree2path4 >path4 &&
  27        git update-index --add path0 path1 path2 path4 &&
  28        t2=$(git write-tree) &&
  29        rm -f path* .merge_* actual .git/index &&
  30        echo tree2path0 >path0 &&
  31        echo tree3path1 >path1 &&
  32        echo tree3path2 >path2 &&
  33        echo tree3path3 >path3 &&
  34        git update-index --add path0 path1 path2 path3 &&
  35        t3=$(git write-tree)
  36'
  37
  38test_expect_success 'checkout one stage 0 to temporary file' '
  39        rm -f path* .merge_* actual .git/index &&
  40        git read-tree $t1 &&
  41        git checkout-index --temp -- path1 >actual &&
  42        test_line_count = 1 actual &&
  43        test $(cut "-d  " -f2 actual) = path1 &&
  44        p=$(cut "-d     " -f1 actual) &&
  45        test -f $p &&
  46        test $(cat $p) = tree1path1
  47'
  48
  49test_expect_success 'checkout all stage 0 to temporary files' '
  50        rm -f path* .merge_* actual .git/index &&
  51        git read-tree $t1 &&
  52        git checkout-index -a --temp >actual &&
  53        test_line_count = 5 actual &&
  54        for f in path0 path1 path3 path4 asubdir/path5
  55        do
  56                test $(grep $f actual | cut "-d " -f2) = $f &&
  57                p=$(grep $f actual | cut "-d    " -f1) &&
  58                test -f $p &&
  59                test $(cat $p) = tree1$f
  60        done
  61'
  62
  63test_expect_success 'setup 3-way merge' '
  64        rm -f path* .merge_* actual .git/index &&
  65        git read-tree -m $t1 $t2 $t3
  66'
  67
  68test_expect_success 'checkout one stage 2 to temporary file' '
  69        rm -f path* .merge_* actual &&
  70        git checkout-index --stage=2 --temp -- path1 >actual &&
  71        test_line_count = 1 actual &&
  72        test $(cut "-d  " -f2 actual) = path1 &&
  73        p=$(cut "-d     " -f1 actual) &&
  74        test -f $p &&
  75        test $(cat $p) = tree2path1
  76'
  77
  78test_expect_success 'checkout all stage 2 to temporary files' '
  79        rm -f path* .merge_* actual &&
  80        git checkout-index --all --stage=2 --temp >actual &&
  81        test_line_count = 3 actual &&
  82        for f in path1 path2 path4
  83        do
  84                test $(grep $f actual | cut "-d " -f2) = $f &&
  85                p=$(grep $f actual | cut "-d    " -f1) &&
  86                test -f $p &&
  87                test $(cat $p) = tree2$f
  88        done
  89'
  90
  91test_expect_success 'checkout all stages/one file to nothing' '
  92        rm -f path* .merge_* actual &&
  93        git checkout-index --stage=all --temp -- path0 >actual &&
  94        test_line_count = 0 actual
  95'
  96
  97test_expect_success 'checkout all stages/one file to temporary files' '
  98        rm -f path* .merge_* actual &&
  99        git checkout-index --stage=all --temp -- path1 >actual &&
 100        test_line_count = 1 actual &&
 101        test $(cut "-d  " -f2 actual) = path1 &&
 102        cut "-d " -f1 actual | (read s1 s2 s3 &&
 103        test -f $s1 &&
 104        test -f $s2 &&
 105        test -f $s3 &&
 106        test $(cat $s1) = tree1path1 &&
 107        test $(cat $s2) = tree2path1 &&
 108        test $(cat $s3) = tree3path1)
 109'
 110
 111test_expect_success 'checkout some stages/one file to temporary files' '
 112        rm -f path* .merge_* actual &&
 113        git checkout-index --stage=all --temp -- path2 >actual &&
 114        test_line_count = 1 actual &&
 115        test $(cut "-d  " -f2 actual) = path2 &&
 116        cut "-d " -f1 actual | (read s1 s2 s3 &&
 117        test $s1 = . &&
 118        test -f $s2 &&
 119        test -f $s3 &&
 120        test $(cat $s2) = tree2path2 &&
 121        test $(cat $s3) = tree3path2)
 122'
 123
 124test_expect_success 'checkout all stages/all files to temporary files' '
 125        rm -f path* .merge_* actual &&
 126        git checkout-index -a --stage=all --temp >actual &&
 127        test_line_count = 5 actual
 128'
 129
 130test_expect_success '-- path0: no entry' '
 131        test x$(grep path0 actual | cut "-d     " -f2) = x
 132'
 133
 134test_expect_success '-- path1: all 3 stages' '
 135        test $(grep path1 actual | cut "-d      " -f2) = path1 &&
 136        grep path1 actual | cut "-d     " -f1 | (read s1 s2 s3 &&
 137        test -f $s1 &&
 138        test -f $s2 &&
 139        test -f $s3 &&
 140        test $(cat $s1) = tree1path1 &&
 141        test $(cat $s2) = tree2path1 &&
 142        test $(cat $s3) = tree3path1)
 143'
 144
 145test_expect_success '-- path2: no stage 1, have stage 2 and 3' '
 146        test $(grep path2 actual | cut "-d      " -f2) = path2 &&
 147        grep path2 actual | cut "-d     " -f1 | (read s1 s2 s3 &&
 148        test $s1 = . &&
 149        test -f $s2 &&
 150        test -f $s3 &&
 151        test $(cat $s2) = tree2path2 &&
 152        test $(cat $s3) = tree3path2)
 153'
 154
 155test_expect_success '-- path3: no stage 2, have stage 1 and 3' '
 156        test $(grep path3 actual | cut "-d      " -f2) = path3 &&
 157        grep path3 actual | cut "-d     " -f1 | (read s1 s2 s3 &&
 158        test -f $s1 &&
 159        test $s2 = . &&
 160        test -f $s3 &&
 161        test $(cat $s1) = tree1path3 &&
 162        test $(cat $s3) = tree3path3)
 163'
 164
 165test_expect_success '-- path4: no stage 3, have stage 1 and 3' '
 166        test $(grep path4 actual | cut "-d      " -f2) = path4 &&
 167        grep path4 actual | cut "-d     " -f1 | (read s1 s2 s3 &&
 168        test -f $s1 &&
 169        test -f $s2 &&
 170        test $s3 = . &&
 171        test $(cat $s1) = tree1path4 &&
 172        test $(cat $s2) = tree2path4)
 173'
 174
 175test_expect_success '-- asubdir/path5: no stage 2 and 3 have stage 1' '
 176        test $(grep asubdir/path5 actual | cut "-d      " -f2) = asubdir/path5 &&
 177        grep asubdir/path5 actual | cut "-d     " -f1 | (read s1 s2 s3 &&
 178        test -f $s1 &&
 179        test $s2 = . &&
 180        test $s3 = . &&
 181        test $(cat $s1) = tree1asubdir/path5)
 182'
 183
 184test_expect_success 'checkout --temp within subdir' '
 185        (
 186                cd asubdir &&
 187                git checkout-index -a --stage=all >actual &&
 188                test_line_count = 1 actual &&
 189                test $(grep path5 actual | cut "-d      " -f2) = path5 &&
 190                grep path5 actual | cut "-d     " -f1 | (read s1 s2 s3 &&
 191                test -f ../$s1 &&
 192                test $s2 = . &&
 193                test $s3 = . &&
 194                test $(cat ../$s1) = tree1asubdir/path5)
 195        )
 196'
 197
 198test_expect_success 'checkout --temp symlink' '
 199        rm -f path* .merge_* actual .git/index &&
 200        test_ln_s_add path7 path6 &&
 201        git checkout-index --temp -a >actual &&
 202        test_line_count = 1 actual &&
 203        test $(cut "-d  " -f2 actual) = path6 &&
 204        p=$(cut "-d     " -f1 actual) &&
 205        test -f $p &&
 206        test $(cat $p) = path7
 207'
 208
 209test_expect_success 'emit well-formed relative path' '
 210        rm -f path* .merge_* actual .git/index &&
 211        >path0123456789 &&
 212        git update-index --add path0123456789 &&
 213        (
 214                cd asubdir &&
 215                git checkout-index --temp -- ../path0123456789 >actual &&
 216                test_line_count = 1 actual &&
 217                test $(cut "-d  " -f2 actual) = ../path0123456789
 218        )
 219'
 220
 221test_done