t/t2200-add-update.sh

   1 #!/bin/sh
   2
   3 test_description='git add -u
   4
   5 This test creates a working tree state with three files:
   6
   7   top (previously committed, modified)
   8   dir/sub (previously committed, modified)
   9   dir/other (untracked)
  10
  11 and issues a git add -u with path limiting on "dir" to add
  12 only the updates to dir/sub.
  13
  14 Also tested are "git add -u" without limiting, and "git add -u"
  15 without contents changes, and other conditions'
  16
  17 . ./test-lib.sh
  18
  19 test_expect_success setup '
  20         echo initial >check &&
  21         echo initial >top &&
  22         echo initial >foo &&
  23         mkdir dir1 dir2 &&
  24         echo initial >dir1/sub1 &&
  25         echo initial >dir1/sub2 &&
  26         echo initial >dir2/sub3 &&
  27         git add check dir1 dir2 top foo &&
  28         test_tick
  29         git commit -m initial &&
  30
  31         echo changed >check &&
  32         echo changed >top &&
  33         echo changed >dir2/sub3 &&
  34         rm -f dir1/sub1 &&
  35         echo other >dir2/other
  36 '
  37
  38 test_expect_success update '
  39         git add -u dir1 dir2
  40 '
  41
  42 test_expect_success 'update noticed a removal' '
  43         test "$(git ls-files dir1/sub1)" = ""
  44 '
  45
  46 test_expect_success 'update touched correct path' '
  47         test "$(git diff-files --name-status dir2/sub3)" = ""
  48 '
  49
  50 test_expect_success 'update did not touch other tracked files' '
  51         test "$(git diff-files --name-status check)" = "M       check" &&
  52         test "$(git diff-files --name-status top)" = "M top"
  53 '
  54
  55 test_expect_success 'update did not touch untracked files' '
  56         test "$(git ls-files dir2/other)" = ""
  57 '
  58
  59 test_expect_success 'cache tree has not been corrupted' '
  60
  61         git ls-files -s |
  62         sed -e "s/ 0    /       /" >expect &&
  63         git ls-tree -r $(git write-tree) |
  64         sed -e "s/ blob / /" >current &&
  65         test_cmp expect current
  66
  67 '
  68
  69 test_expect_success 'update from a subdirectory' '
  70         (
  71                 cd dir1 &&
  72                 echo more >sub2 &&
  73                 git add -u sub2
  74         )
  75 '
  76
  77 test_expect_success 'change gets noticed' '
  78
  79         test "$(git diff-files --name-status dir1)" = ""
  80
  81 '
  82
  83 test_expect_success SYMLINKS 'replace a file with a symlink' '
  84
  85         rm foo &&
  86         ln -s top foo &&
  87         git add -u -- foo
  88
  89 '
  90
  91 test_expect_success 'add everything changed' '
  92
  93         git add -u &&
  94         test -z "$(git diff-files)"
  95
  96 '
  97
  98 test_expect_success 'touch and then add -u' '
  99
 100         touch check &&
 101         git add -u &&
 102         test -z "$(git diff-files)"
 103
 104 '
 105
 106 test_expect_success 'touch and then add explicitly' '
 107
 108         touch check &&
 109         git add check &&
 110         test -z "$(git diff-files)"
 111
 112 '
 113
 114 test_expect_success 'add -n -u should not add but just report' '
 115
 116         (
 117                 echo "add '\''check'\''" &&
 118                 echo "remove '\''top'\''"
 119         ) >expect &&
 120         before=$(git ls-files -s check top) &&
 121         echo changed >>check &&
 122         rm -f top &&
 123         git add -n -u >actual &&
 124         after=$(git ls-files -s check top) &&
 125
 126         test "$before" = "$after" &&
 127         test_cmp expect actual
 128
 129 '
 130
 131 test_expect_success 'add -u resolves unmerged paths' '
 132         git reset --hard &&
 133         one=$(echo 1 | git hash-object -w --stdin) &&
 134         two=$(echo 2 | git hash-object -w --stdin) &&
 135         three=$(echo 3 | git hash-object -w --stdin) &&
 136         {
 137                 for path in path1 path2
 138                 do
 139                         echo "100644 $one 1     $path"
 140                         echo "100644 $two 2     $path"
 141                         echo "100644 $three 3   $path"
 142                 done
 143                 echo "100644 $one 1     path3"
 144                 echo "100644 $one 1     path4"
 145                 echo "100644 $one 3     path5"
 146                 echo "100644 $one 3     path6"
 147         } |
 148         git update-index --index-info &&
 149         echo 3 >path1 &&
 150         echo 2 >path3 &&
 151         echo 2 >path5 &&
 152         git add -u &&
 153         git ls-files -s path1 path2 path3 path4 path5 path6 >actual &&
 154         {
 155                 echo "100644 $three 0   path1"
 156                 echo "100644 $one 1     path3"
 157                 echo "100644 $one 1     path4"
 158                 echo "100644 $one 3     path5"
 159                 echo "100644 $one 3     path6"
 160         } >expect &&
 161         test_cmp expect actual &&
 162
 163         # Bonus tests.  Explicit resolving
 164         git add path3 path5 &&
 165         test_must_fail git add path4 &&
 166         test_must_fail git add path6 &&
 167         git rm path4 &&
 168         git rm path6 &&
 169
 170         git ls-files -s "path?" >actual &&
 171         {
 172                 echo "100644 $three 0   path1"
 173                 echo "100644 $two 0     path3"
 174                 echo "100644 $two 0     path5"
 175         } >expect
 176
 177 '
 178
 179 test_done