Andrew's git - gitweb.git/blob

   1#!/bin/sh
   2#
   3# Copyright (c) 2006 Carl D. Worth
   4#
   5
   6test_description='Test of git add, including the -- option.'
   7
   8. ./test-lib.sh
   9
  10# Test the file mode "$1" of the file "$2" in the index.
  11test_mode_in_index () {
  12        case "$(git ls-files -s "$2")" in
  13        "$1 "*" $2")
  14                echo pass
  15                ;;
  16        *)
  17                echo fail
  18                git ls-files -s "$2"
  19                return 1
  20                ;;
  21        esac
  22}
  23
  24test_expect_success \
  25    'Test of git add' \
  26    'touch foo && git add foo'
  27
  28test_expect_success \
  29    'Post-check that foo is in the index' \
  30    'git ls-files foo | grep foo'
  31
  32test_expect_success \
  33    'Test that "git add -- -q" works' \
  34    'touch -- -q && git add -- -q'
  35
  36test_expect_success \
  37        'git add: Test that executable bit is not used if core.filemode=0' \
  38        'git config core.filemode 0 &&
  39         echo foo >xfoo1 &&
  40         chmod 755 xfoo1 &&
  41         git add xfoo1 &&
  42         test_mode_in_index 100644 xfoo1'
  43
  44test_expect_success 'git add: filemode=0 should not get confused by symlink' '
  45        rm -f xfoo1 &&
  46        test_ln_s_add foo xfoo1 &&
  47        test_mode_in_index 120000 xfoo1
  48'
  49
  50test_expect_success \
  51        'git update-index --add: Test that executable bit is not used...' \
  52        'git config core.filemode 0 &&
  53         echo foo >xfoo2 &&
  54         chmod 755 xfoo2 &&
  55         git update-index --add xfoo2 &&
  56         test_mode_in_index 100644 xfoo2'
  57
  58test_expect_success 'git add: filemode=0 should not get confused by symlink' '
  59        rm -f xfoo2 &&
  60        test_ln_s_add foo xfoo2 &&
  61        test_mode_in_index 120000 xfoo2
  62'
  63
  64test_expect_success \
  65        'git update-index --add: Test that executable bit is not used...' \
  66        'git config core.filemode 0 &&
  67         test_ln_s_add xfoo2 xfoo3 &&   # runs git update-index --add
  68         test_mode_in_index 120000 xfoo3'
  69
  70test_expect_success '.gitignore test setup' '
  71        echo "*.ig" >.gitignore &&
  72        mkdir c.if d.ig &&
  73        >a.ig && >b.if &&
  74        >c.if/c.if && >c.if/c.ig &&
  75        >d.ig/d.if && >d.ig/d.ig
  76'
  77
  78test_expect_success '.gitignore is honored' '
  79        git add . &&
  80        ! (git ls-files | grep "\\.ig")
  81'
  82
  83test_expect_success 'error out when attempting to add ignored ones without -f' '
  84        test_must_fail git add a.?? &&
  85        ! (git ls-files | grep "\\.ig")
  86'
  87
  88test_expect_success 'error out when attempting to add ignored ones without -f' '
  89        test_must_fail git add d.?? &&
  90        ! (git ls-files | grep "\\.ig")
  91'
  92
  93test_expect_success 'error out when attempting to add ignored ones but add others' '
  94        touch a.if &&
  95        test_must_fail git add a.?? &&
  96        ! (git ls-files | grep "\\.ig") &&
  97        (git ls-files | grep a.if)
  98'
  99
 100test_expect_success 'add ignored ones with -f' '
 101        git add -f a.?? &&
 102        git ls-files --error-unmatch a.ig
 103'
 104
 105test_expect_success 'add ignored ones with -f' '
 106        git add -f d.??/* &&
 107        git ls-files --error-unmatch d.ig/d.if d.ig/d.ig
 108'
 109
 110test_expect_success 'add ignored ones with -f' '
 111        rm -f .git/index &&
 112        git add -f d.?? &&
 113        git ls-files --error-unmatch d.ig/d.if d.ig/d.ig
 114'
 115
 116test_expect_success '.gitignore with subdirectory' '
 117
 118        rm -f .git/index &&
 119        mkdir -p sub/dir &&
 120        echo "!dir/a.*" >sub/.gitignore &&
 121        >sub/a.ig &&
 122        >sub/dir/a.ig &&
 123        git add sub/dir &&
 124        git ls-files --error-unmatch sub/dir/a.ig &&
 125        rm -f .git/index &&
 126        (
 127                cd sub/dir &&
 128                git add .
 129        ) &&
 130        git ls-files --error-unmatch sub/dir/a.ig
 131'
 132
 133mkdir 1 1/2 1/3
 134touch 1/2/a 1/3/b 1/2/c
 135test_expect_success 'check correct prefix detection' '
 136        rm -f .git/index &&
 137        git add 1/2/a 1/3/b 1/2/c
 138'
 139
 140test_expect_success 'git add with filemode=0, symlinks=0, and unmerged entries' '
 141        for s in 1 2 3
 142        do
 143                echo $s > stage$s
 144                echo "100755 $(git hash-object -w stage$s) $s   file"
 145                echo "120000 $(printf $s | git hash-object -w -t blob --stdin) $s       symlink"
 146        done | git update-index --index-info &&
 147        git config core.filemode 0 &&
 148        git config core.symlinks 0 &&
 149        echo new > file &&
 150        echo new > symlink &&
 151        git add file symlink &&
 152        git ls-files --stage | grep "^100755 .* 0       file$" &&
 153        git ls-files --stage | grep "^120000 .* 0       symlink$"
 154'
 155
 156test_expect_success 'git add with filemode=0, symlinks=0 prefers stage 2 over stage 1' '
 157        git rm --cached -f file symlink &&
 158        (
 159                echo "100644 $(git hash-object -w stage1) 1     file"
 160                echo "100755 $(git hash-object -w stage2) 2     file"
 161                echo "100644 $(printf 1 | git hash-object -w -t blob --stdin) 1 symlink"
 162                echo "120000 $(printf 2 | git hash-object -w -t blob --stdin) 2 symlink"
 163        ) | git update-index --index-info &&
 164        git config core.filemode 0 &&
 165        git config core.symlinks 0 &&
 166        echo new > file &&
 167        echo new > symlink &&
 168        git add file symlink &&
 169        git ls-files --stage | grep "^100755 .* 0       file$" &&
 170        git ls-files --stage | grep "^120000 .* 0       symlink$"
 171'
 172
 173test_expect_success 'git add --refresh' '
 174        >foo && git add foo && git commit -a -m "commit all" &&
 175        test -z "$(git diff-index HEAD -- foo)" &&
 176        git read-tree HEAD &&
 177        case "$(git diff-index HEAD -- foo)" in
 178        :100644" "*"M   foo") echo pass;;
 179        *) echo fail; (exit 1);;
 180        esac &&
 181        git add --refresh -- foo &&
 182        test -z "$(git diff-index HEAD -- foo)"
 183'
 184
 185test_expect_success 'git add --refresh with pathspec' '
 186        git reset --hard &&
 187        echo >foo && echo >bar && echo >baz &&
 188        git add foo bar baz && H=$(git rev-parse :foo) && git rm -f foo &&
 189        echo "100644 $H 3       foo" | git update-index --index-info &&
 190        test-chmtime -60 bar baz &&
 191        >expect &&
 192        git add --refresh bar >actual &&
 193        test_cmp expect actual &&
 194
 195        git diff-files --name-only >actual &&
 196        ! grep bar actual&&
 197        grep baz actual
 198'
 199
 200test_expect_success POSIXPERM,SANITY 'git add should fail atomically upon an unreadable file' '
 201        git reset --hard &&
 202        date >foo1 &&
 203        date >foo2 &&
 204        chmod 0 foo2 &&
 205        test_must_fail git add --verbose . &&
 206        ! ( git ls-files foo1 | grep foo1 )
 207'
 208
 209rm -f foo2
 210
 211test_expect_success POSIXPERM,SANITY 'git add --ignore-errors' '
 212        git reset --hard &&
 213        date >foo1 &&
 214        date >foo2 &&
 215        chmod 0 foo2 &&
 216        test_must_fail git add --verbose --ignore-errors . &&
 217        git ls-files foo1 | grep foo1
 218'
 219
 220rm -f foo2
 221
 222test_expect_success POSIXPERM,SANITY 'git add (add.ignore-errors)' '
 223        git config add.ignore-errors 1 &&
 224        git reset --hard &&
 225        date >foo1 &&
 226        date >foo2 &&
 227        chmod 0 foo2 &&
 228        test_must_fail git add --verbose . &&
 229        git ls-files foo1 | grep foo1
 230'
 231rm -f foo2
 232
 233test_expect_success POSIXPERM,SANITY 'git add (add.ignore-errors = false)' '
 234        git config add.ignore-errors 0 &&
 235        git reset --hard &&
 236        date >foo1 &&
 237        date >foo2 &&
 238        chmod 0 foo2 &&
 239        test_must_fail git add --verbose . &&
 240        ! ( git ls-files foo1 | grep foo1 )
 241'
 242rm -f foo2
 243
 244test_expect_success POSIXPERM,SANITY '--no-ignore-errors overrides config' '
 245       git config add.ignore-errors 1 &&
 246       git reset --hard &&
 247       date >foo1 &&
 248       date >foo2 &&
 249       chmod 0 foo2 &&
 250       test_must_fail git add --verbose --no-ignore-errors . &&
 251       ! ( git ls-files foo1 | grep foo1 ) &&
 252       git config add.ignore-errors 0
 253'
 254rm -f foo2
 255
 256test_expect_success BSLASHPSPEC "git add 'fo\\[ou\\]bar' ignores foobar" '
 257        git reset --hard &&
 258        touch fo\[ou\]bar foobar &&
 259        git add '\''fo\[ou\]bar'\'' &&
 260        git ls-files fo\[ou\]bar | fgrep fo\[ou\]bar &&
 261        ! ( git ls-files foobar | grep foobar )
 262'
 263
 264test_expect_success 'git add to resolve conflicts on otherwise ignored path' '
 265        git reset --hard &&
 266        H=$(git rev-parse :1/2/a) &&
 267        (
 268                echo "100644 $H 1       track-this"
 269                echo "100644 $H 3       track-this"
 270        ) | git update-index --index-info &&
 271        echo track-this >>.gitignore &&
 272        echo resolved >track-this &&
 273        git add track-this
 274'
 275
 276test_expect_success '"add non-existent" should fail' '
 277        test_must_fail git add non-existent &&
 278        ! (git ls-files | grep "non-existent")
 279'
 280
 281test_expect_success 'git add -A on empty repo does not error out' '
 282        rm -fr empty &&
 283        git init empty &&
 284        (
 285                cd empty &&
 286                git add -A . &&
 287                git add -A
 288        )
 289'
 290
 291test_expect_success '"git add ." in empty repo' '
 292        rm -fr empty &&
 293        git init empty &&
 294        (
 295                cd empty &&
 296                git add .
 297        )
 298'
 299
 300test_expect_success 'git add --dry-run of existing changed file' "
 301        echo new >>track-this &&
 302        git add --dry-run track-this >actual 2>&1 &&
 303        echo \"add 'track-this'\" | test_cmp - actual
 304"
 305
 306test_expect_success 'git add --dry-run of non-existing file' "
 307        echo ignored-file >>.gitignore &&
 308        test_must_fail git add --dry-run track-this ignored-file >actual 2>&1
 309"
 310
 311test_expect_success 'git add --dry-run of an existing file output' "
 312        echo \"fatal: pathspec 'ignored-file' did not match any files\" >expect &&
 313        test_i18ncmp expect actual
 314"
 315
 316cat >expect.err <<\EOF
 317The following paths are ignored by one of your .gitignore files:
 318ignored-file
 319Use -f if you really want to add them.
 320EOF
 321cat >expect.out <<\EOF
 322add 'track-this'
 323EOF
 324
 325test_expect_success 'git add --dry-run --ignore-missing of non-existing file' '
 326        test_must_fail git add --dry-run --ignore-missing track-this ignored-file >actual.out 2>actual.err
 327'
 328
 329test_expect_success 'git add --dry-run --ignore-missing of non-existing file output' '
 330        test_i18ncmp expect.out actual.out &&
 331        test_i18ncmp expect.err actual.err
 332'
 333
 334test_expect_success 'git add --chmod=[+-]x stages correctly' '
 335        rm -f foo1 &&
 336        echo foo >foo1 &&
 337        git add --chmod=+x foo1 &&
 338        test_mode_in_index 100755 foo1 &&
 339        git add --chmod=-x foo1 &&
 340        test_mode_in_index 100644 foo1
 341'
 342
 343test_expect_success POSIXPERM,SYMLINKS 'git add --chmod=+x with symlinks' '
 344        git config core.filemode 1 &&
 345        git config core.symlinks 1 &&
 346        rm -f foo2 &&
 347        echo foo >foo2 &&
 348        git add --chmod=+x foo2 &&
 349        test_mode_in_index 100755 foo2
 350'
 351
 352test_done