Shawn Pearce | de84f99 | 2006-03-05 03:24:15 -0500 | [diff] [blame] | 1 | #!/bin/sh |
| 2 | # |
| 3 | # Copyright (c) 2006 Shawn Pearce |
| 4 | # |
| 5 | |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 6 | test_description='git checkout-index --temp test. |
Shawn Pearce | de84f99 | 2006-03-05 03:24:15 -0500 | [diff] [blame] | 7 | |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 8 | With --temp flag, git checkout-index writes to temporary merge files |
Shawn Pearce | de84f99 | 2006-03-05 03:24:15 -0500 | [diff] [blame] | 9 | rather than the tracked path.' |
| 10 | |
| 11 | . ./test-lib.sh |
| 12 | |
Eric Sunshine | 9fb7b57 | 2014-12-24 04:43:12 -0500 | [diff] [blame] | 13 | test_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 | ' |
Shawn Pearce | de84f99 | 2006-03-05 03:24:15 -0500 | [diff] [blame] | 37 | |
Eric Sunshine | 9fb7b57 | 2014-12-24 04:43:12 -0500 | [diff] [blame] | 38 | test_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) && |
Shawn Pearce | de84f99 | 2006-03-05 03:24:15 -0500 | [diff] [blame] | 45 | test -f $p && |
Eric Sunshine | 9fb7b57 | 2014-12-24 04:43:12 -0500 | [diff] [blame] | 46 | test $(cat $p) = tree1path1 |
| 47 | ' |
Shawn Pearce | de84f99 | 2006-03-05 03:24:15 -0500 | [diff] [blame] | 48 | |
Eric Sunshine | 9fb7b57 | 2014-12-24 04:43:12 -0500 | [diff] [blame] | 49 | test_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 | ' |
Shawn Pearce | de84f99 | 2006-03-05 03:24:15 -0500 | [diff] [blame] | 62 | |
Eric Sunshine | 9fb7b57 | 2014-12-24 04:43:12 -0500 | [diff] [blame] | 63 | test_expect_success 'setup 3-way merge' ' |
| 64 | rm -f path* .merge_* actual .git/index && |
| 65 | git read-tree -m $t1 $t2 $t3 |
| 66 | ' |
Shawn Pearce | de84f99 | 2006-03-05 03:24:15 -0500 | [diff] [blame] | 67 | |
Eric Sunshine | 9fb7b57 | 2014-12-24 04:43:12 -0500 | [diff] [blame] | 68 | test_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) && |
Shawn Pearce | de84f99 | 2006-03-05 03:24:15 -0500 | [diff] [blame] | 74 | test -f $p && |
Eric Sunshine | 9fb7b57 | 2014-12-24 04:43:12 -0500 | [diff] [blame] | 75 | test $(cat $p) = tree2path1 |
| 76 | ' |
Shawn Pearce | de84f99 | 2006-03-05 03:24:15 -0500 | [diff] [blame] | 77 | |
Eric Sunshine | 9fb7b57 | 2014-12-24 04:43:12 -0500 | [diff] [blame] | 78 | test_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 | ' |
Shawn Pearce | de84f99 | 2006-03-05 03:24:15 -0500 | [diff] [blame] | 90 | |
Eric Sunshine | 9fb7b57 | 2014-12-24 04:43:12 -0500 | [diff] [blame] | 91 | test_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 | ' |
Shawn Pearce | de84f99 | 2006-03-05 03:24:15 -0500 | [diff] [blame] | 96 | |
Eric Sunshine | 9fb7b57 | 2014-12-24 04:43:12 -0500 | [diff] [blame] | 97 | test_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 | ' |
Shawn Pearce | de84f99 | 2006-03-05 03:24:15 -0500 | [diff] [blame] | 110 | |
Eric Sunshine | 9fb7b57 | 2014-12-24 04:43:12 -0500 | [diff] [blame] | 111 | test_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 | ' |
Shawn Pearce | de84f99 | 2006-03-05 03:24:15 -0500 | [diff] [blame] | 123 | |
Eric Sunshine | 9fb7b57 | 2014-12-24 04:43:12 -0500 | [diff] [blame] | 124 | test_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 | ' |
Shawn Pearce | de84f99 | 2006-03-05 03:24:15 -0500 | [diff] [blame] | 129 | |
Eric Sunshine | 9fb7b57 | 2014-12-24 04:43:12 -0500 | [diff] [blame] | 130 | test_expect_success '-- path0: no entry' ' |
| 131 | test x$(grep path0 actual | cut "-d " -f2) = x |
| 132 | ' |
Shawn Pearce | de84f99 | 2006-03-05 03:24:15 -0500 | [diff] [blame] | 133 | |
Eric Sunshine | 9fb7b57 | 2014-12-24 04:43:12 -0500 | [diff] [blame] | 134 | test_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 | ' |
Shawn Pearce | de84f99 | 2006-03-05 03:24:15 -0500 | [diff] [blame] | 144 | |
Eric Sunshine | 9fb7b57 | 2014-12-24 04:43:12 -0500 | [diff] [blame] | 145 | test_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 | ' |
Shawn Pearce | de84f99 | 2006-03-05 03:24:15 -0500 | [diff] [blame] | 154 | |
Eric Sunshine | 9fb7b57 | 2014-12-24 04:43:12 -0500 | [diff] [blame] | 155 | test_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 | ' |
Shawn Pearce | de84f99 | 2006-03-05 03:24:15 -0500 | [diff] [blame] | 164 | |
Eric Sunshine | 9fb7b57 | 2014-12-24 04:43:12 -0500 | [diff] [blame] | 165 | test_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 | ' |
Shawn Pearce | de84f99 | 2006-03-05 03:24:15 -0500 | [diff] [blame] | 174 | |
Eric Sunshine | 9fb7b57 | 2014-12-24 04:43:12 -0500 | [diff] [blame] | 175 | test_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 | ' |
Shawn Pearce | de84f99 | 2006-03-05 03:24:15 -0500 | [diff] [blame] | 183 | |
Eric Sunshine | 9fb7b57 | 2014-12-24 04:43:12 -0500 | [diff] [blame] | 184 | test_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 | |
| 198 | test_expect_success 'checkout --temp symlink' ' |
| 199 | rm -f path* .merge_* actual .git/index && |
Eric Sunshine | 66e28e9 | 2014-12-24 04:43:14 -0500 | [diff] [blame] | 200 | test_ln_s_add path7 path6 && |
Eric Sunshine | 9fb7b57 | 2014-12-24 04:43:12 -0500 | [diff] [blame] | 201 | git checkout-index --temp -a >actual && |
| 202 | test_line_count = 1 actual && |
Eric Sunshine | 66e28e9 | 2014-12-24 04:43:14 -0500 | [diff] [blame] | 203 | test $(cut "-d " -f2 actual) = path6 && |
Eric Sunshine | 9fb7b57 | 2014-12-24 04:43:12 -0500 | [diff] [blame] | 204 | p=$(cut "-d " -f1 actual) && |
| 205 | test -f $p && |
Eric Sunshine | 66e28e9 | 2014-12-24 04:43:14 -0500 | [diff] [blame] | 206 | test $(cat $p) = path7 |
Eric Sunshine | 9fb7b57 | 2014-12-24 04:43:12 -0500 | [diff] [blame] | 207 | ' |
Shawn Pearce | de84f99 | 2006-03-05 03:24:15 -0500 | [diff] [blame] | 208 | |
Eric Sunshine | 052b255 | 2014-12-24 04:43:15 -0500 | [diff] [blame^] | 209 | test_expect_failure '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 | |
Shawn Pearce | de84f99 | 2006-03-05 03:24:15 -0500 | [diff] [blame] | 221 | test_done |