t/t2203-add-intent.sh

   1 #!/bin/sh
   2
   3 test_description='Intent to add'
   4
   5 . ./test-lib.sh
   6
   7 test_expect_success 'intent to add' '
   8         echo hello >file &&
   9         echo hello >elif &&
  10         git add -N file &&
  11         git add elif
  12 '
  13
  14 test_expect_success 'check result of "add -N"' '
  15         git ls-files -s file >actual &&
  16         empty=$(git hash-object --stdin </dev/null) &&
  17         echo "100644 $empty 0   file" >expect &&
  18         test_cmp expect actual
  19 '
  20
  21 test_expect_success 'intent to add is just an ordinary empty blob' '
  22         git add -u &&
  23         git ls-files -s file >actual &&
  24         git ls-files -s elif | sed -e "s/elif/file/" >expect &&
  25         test_cmp expect actual
  26 '
  27
  28 test_expect_success 'intent to add does not clobber existing paths' '
  29         git add -N file elif &&
  30         empty=$(git hash-object --stdin </dev/null) &&
  31         git ls-files -s >actual &&
  32         ! grep "$empty" actual
  33 '
  34
  35 test_expect_success 'i-t-a entry is simply ignored' '
  36         test_tick &&
  37         git commit -a -m initial &&
  38         git reset --hard &&
  39
  40         echo xyzzy >rezrov &&
  41         echo frotz >nitfol &&
  42         git add rezrov &&
  43         git add -N nitfol &&
  44         git commit -m second &&
  45         test $(git ls-tree HEAD -- nitfol | wc -l) = 0 &&
  46         test $(git diff --name-only HEAD -- nitfol | wc -l) = 1
  47 '
  48
  49 test_expect_success 'can commit with an unrelated i-t-a entry in index' '
  50         git reset --hard &&
  51         echo bozbar >rezrov &&
  52         echo frotz >nitfol &&
  53         git add rezrov &&
  54         git add -N nitfol &&
  55         git commit -m partial rezrov
  56 '
  57
  58 test_expect_success 'can "commit -a" with an i-t-a entry' '
  59         git reset --hard &&
  60         : >nitfol &&
  61         git add -N nitfol &&
  62         git commit -a -m all
  63 '
  64
  65 test_expect_success 'cache-tree invalidates i-t-a paths' '
  66         git reset --hard &&
  67         mkdir dir &&
  68         : >dir/foo &&
  69         git add dir/foo &&
  70         git commit -m foo &&
  71
  72         : >dir/bar &&
  73         git add -N dir/bar &&
  74         git diff --cached --name-only >actual &&
  75         echo dir/bar >expect &&
  76         test_cmp expect actual &&
  77
  78         git write-tree >/dev/null &&
  79
  80         git diff --cached --name-only >actual &&
  81         echo dir/bar >expect &&
  82         test_cmp expect actual
  83 '
  84
  85 test_expect_success 'cache-tree does not ignore dir that has i-t-a entries' '
  86         git init ita-in-dir &&
  87         (
  88                 cd ita-in-dir &&
  89                 mkdir 2 &&
  90                 for f in 1 2/1 2/2 3
  91                 do
  92                         echo "$f" >"$f"
  93                 done &&
  94                 git add 1 2/2 3 &&
  95                 git add -N 2/1 &&
  96                 git commit -m committed &&
  97                 git ls-tree -r HEAD >actual &&
  98                 grep 2/2 actual
  99         )
 100 '
 101
 102 test_expect_success 'cache-tree does skip dir that becomes empty' '
 103         rm -fr ita-in-dir &&
 104         git init ita-in-dir &&
 105         (
 106                 cd ita-in-dir &&
 107                 mkdir -p 1/2/3 &&
 108                 echo 4 >1/2/3/4 &&
 109                 git add -N 1/2/3/4 &&
 110                 git write-tree >actual &&
 111                 echo $EMPTY_TREE >expected &&
 112                 test_cmp expected actual
 113         )
 114 '
 115
 116 test_done
 117