t/t3700-add.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2006 Carl D. Worth
   4 #
   5
   6 test_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.
  11 test_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
  24 test_expect_success \
  25     'Test of git add' \
  26     'touch foo && git add foo'
  27
  28 test_expect_success \
  29     'Post-check that foo is in the index' \
  30     'git ls-files foo | grep foo'
  31
  32 test_expect_success \
  33     'Test that "git add -- -q" works' \
  34     'touch -- -q && git add -- -q'
  35
  36 test_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
  44 test_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
  50 test_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
  58 test_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
  64 test_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
  70 test_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
  78 test_expect_success '.gitignore is honored' '
  79         git add . &&
  80         ! (git ls-files | grep "\\.ig")
  81 '
  82
  83 test_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
  88 test_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
  93 test_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
 100 test_expect_success 'add ignored ones with -f' '
 101         git add -f a.?? &&
 102         git ls-files --error-unmatch a.ig
 103 '
 104
 105 test_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
 110 test_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
 116 test_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
 133 mkdir 1 1/2 1/3
 134 touch 1/2/a 1/3/b 1/2/c
 135 test_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
 140 test_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
 156 test_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
 173 test_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
 185 test_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-tool chmtime -60 bar baz &&
 191         git add --refresh bar >actual &&
 192         test_must_be_empty actual &&
 193
 194         git diff-files --name-only >actual &&
 195         ! grep bar actual &&
 196         grep baz actual
 197 '
 198
 199 test_expect_success 'git add --refresh correctly reports no match error' "
 200         echo \"fatal: pathspec ':(icase)nonexistent' did not match any files\" >expect &&
 201         test_must_fail git add --refresh ':(icase)nonexistent' 2>actual &&
 202         test_cmp expect actual
 203 "
 204
 205 test_expect_success POSIXPERM,SANITY 'git add should fail atomically upon an unreadable file' '
 206         git reset --hard &&
 207         date >foo1 &&
 208         date >foo2 &&
 209         chmod 0 foo2 &&
 210         test_must_fail git add --verbose . &&
 211         ! ( git ls-files foo1 | grep foo1 )
 212 '
 213
 214 rm -f foo2
 215
 216 test_expect_success POSIXPERM,SANITY 'git add --ignore-errors' '
 217         git reset --hard &&
 218         date >foo1 &&
 219         date >foo2 &&
 220         chmod 0 foo2 &&
 221         test_must_fail git add --verbose --ignore-errors . &&
 222         git ls-files foo1 | grep foo1
 223 '
 224
 225 rm -f foo2
 226
 227 test_expect_success POSIXPERM,SANITY 'git add (add.ignore-errors)' '
 228         git config add.ignore-errors 1 &&
 229         git reset --hard &&
 230         date >foo1 &&
 231         date >foo2 &&
 232         chmod 0 foo2 &&
 233         test_must_fail git add --verbose . &&
 234         git ls-files foo1 | grep foo1
 235 '
 236 rm -f foo2
 237
 238 test_expect_success POSIXPERM,SANITY 'git add (add.ignore-errors = false)' '
 239         git config add.ignore-errors 0 &&
 240         git reset --hard &&
 241         date >foo1 &&
 242         date >foo2 &&
 243         chmod 0 foo2 &&
 244         test_must_fail git add --verbose . &&
 245         ! ( git ls-files foo1 | grep foo1 )
 246 '
 247 rm -f foo2
 248
 249 test_expect_success POSIXPERM,SANITY '--no-ignore-errors overrides config' '
 250        git config add.ignore-errors 1 &&
 251        git reset --hard &&
 252        date >foo1 &&
 253        date >foo2 &&
 254        chmod 0 foo2 &&
 255        test_must_fail git add --verbose --no-ignore-errors . &&
 256        ! ( git ls-files foo1 | grep foo1 ) &&
 257        git config add.ignore-errors 0
 258 '
 259 rm -f foo2
 260
 261 test_expect_success BSLASHPSPEC "git add 'fo\\[ou\\]bar' ignores foobar" '
 262         git reset --hard &&
 263         touch fo\[ou\]bar foobar &&
 264         git add '\''fo\[ou\]bar'\'' &&
 265         git ls-files fo\[ou\]bar | fgrep fo\[ou\]bar &&
 266         ! ( git ls-files foobar | grep foobar )
 267 '
 268
 269 test_expect_success 'git add to resolve conflicts on otherwise ignored path' '
 270         git reset --hard &&
 271         H=$(git rev-parse :1/2/a) &&
 272         (
 273                 echo "100644 $H 1       track-this" &&
 274                 echo "100644 $H 3       track-this"
 275         ) | git update-index --index-info &&
 276         echo track-this >>.gitignore &&
 277         echo resolved >track-this &&
 278         git add track-this
 279 '
 280
 281 test_expect_success '"add non-existent" should fail' '
 282         test_must_fail git add non-existent &&
 283         ! (git ls-files | grep "non-existent")
 284 '
 285
 286 test_expect_success 'git add -A on empty repo does not error out' '
 287         rm -fr empty &&
 288         git init empty &&
 289         (
 290                 cd empty &&
 291                 git add -A . &&
 292                 git add -A
 293         )
 294 '
 295
 296 test_expect_success '"git add ." in empty repo' '
 297         rm -fr empty &&
 298         git init empty &&
 299         (
 300                 cd empty &&
 301                 git add .
 302         )
 303 '
 304
 305 test_expect_success 'error on a repository with no commits' '
 306         rm -fr empty &&
 307         git init empty &&
 308         test_must_fail git add empty >actual 2>&1 &&
 309         cat >expect <<-EOF &&
 310         error: '"'empty/'"' does not have a commit checked out
 311         fatal: adding files failed
 312         EOF
 313         test_cmp expect actual
 314 '
 315
 316 test_expect_success 'git add --dry-run of existing changed file' "
 317         echo new >>track-this &&
 318         git add --dry-run track-this >actual 2>&1 &&
 319         echo \"add 'track-this'\" | test_cmp - actual
 320 "
 321
 322 test_expect_success 'git add --dry-run of non-existing file' "
 323         echo ignored-file >>.gitignore &&
 324         test_must_fail git add --dry-run track-this ignored-file >actual 2>&1
 325 "
 326
 327 test_expect_success 'git add --dry-run of an existing file output' "
 328         echo \"fatal: pathspec 'ignored-file' did not match any files\" >expect &&
 329         test_cmp expect actual
 330 "
 331
 332 cat >expect.err <<\EOF
 333 The following paths are ignored by one of your .gitignore files:
 334 ignored-file
 335 hint: Use -f if you really want to add them.
 336 hint: Turn this message off by running
 337 hint: "git config advice.addIgnoredFile false"
 338 EOF
 339 cat >expect.out <<\EOF
 340 add 'track-this'
 341 EOF
 342
 343 test_expect_success 'git add --dry-run --ignore-missing of non-existing file' '
 344         test_must_fail git add --dry-run --ignore-missing track-this ignored-file >actual.out 2>actual.err
 345 '
 346
 347 test_expect_success 'git add --dry-run --ignore-missing of non-existing file output' '
 348         test_cmp expect.out actual.out &&
 349         test_cmp expect.err actual.err
 350 '
 351
 352 test_expect_success 'git add --dry-run --interactive should fail' '
 353         test_must_fail git add --dry-run --interactive
 354 '
 355
 356 test_expect_success 'git add empty string should fail' '
 357         test_must_fail git add ""
 358 '
 359
 360 test_expect_success 'git add --chmod=[+-]x stages correctly' '
 361         rm -f foo1 &&
 362         echo foo >foo1 &&
 363         git add --chmod=+x foo1 &&
 364         test_mode_in_index 100755 foo1 &&
 365         git add --chmod=-x foo1 &&
 366         test_mode_in_index 100644 foo1
 367 '
 368
 369 test_expect_success POSIXPERM,SYMLINKS 'git add --chmod=+x with symlinks' '
 370         git config core.filemode 1 &&
 371         git config core.symlinks 1 &&
 372         rm -f foo2 &&
 373         echo foo >foo2 &&
 374         git add --chmod=+x foo2 &&
 375         test_mode_in_index 100755 foo2
 376 '
 377
 378 test_expect_success 'git add --chmod=[+-]x changes index with already added file' '
 379         rm -f foo3 xfoo3 &&
 380         git reset --hard &&
 381         echo foo >foo3 &&
 382         git add foo3 &&
 383         git add --chmod=+x foo3 &&
 384         test_mode_in_index 100755 foo3 &&
 385         echo foo >xfoo3 &&
 386         chmod 755 xfoo3 &&
 387         git add xfoo3 &&
 388         git add --chmod=-x xfoo3 &&
 389         test_mode_in_index 100644 xfoo3
 390 '
 391
 392 test_expect_success POSIXPERM 'git add --chmod=[+-]x does not change the working tree' '
 393         echo foo >foo4 &&
 394         git add foo4 &&
 395         git add --chmod=+x foo4 &&
 396         ! test -x foo4
 397 '
 398
 399 test_expect_success 'git add --chmod fails with non regular files (but updates the other paths)' '
 400         git reset --hard &&
 401         test_ln_s_add foo foo3 &&
 402         touch foo4 &&
 403         test_must_fail git add --chmod=+x foo3 foo4 2>stderr &&
 404         test_i18ngrep "cannot chmod +x .foo3." stderr &&
 405         test_mode_in_index 120000 foo3 &&
 406         test_mode_in_index 100755 foo4
 407 '
 408
 409 test_expect_success 'git add --chmod honors --dry-run' '
 410         git reset --hard &&
 411         echo foo >foo4 &&
 412         git add foo4 &&
 413         git add --chmod=+x --dry-run foo4 &&
 414         test_mode_in_index 100644 foo4
 415 '
 416
 417 test_expect_success 'git add --chmod --dry-run reports error for non regular files' '
 418         git reset --hard &&
 419         test_ln_s_add foo foo4 &&
 420         test_must_fail git add --chmod=+x --dry-run foo4 2>stderr &&
 421         test_i18ngrep "cannot chmod +x .foo4." stderr
 422 '
 423
 424 test_expect_success 'git add --chmod --dry-run reports error for unmatched pathspec' '
 425         test_must_fail git add --chmod=+x --dry-run nonexistent 2>stderr &&
 426         test_i18ngrep "pathspec .nonexistent. did not match any files" stderr
 427 '
 428
 429 test_expect_success 'no file status change if no pathspec is given' '
 430         >foo5 &&
 431         >foo6 &&
 432         git add foo5 foo6 &&
 433         git add --chmod=+x &&
 434         test_mode_in_index 100644 foo5 &&
 435         test_mode_in_index 100644 foo6
 436 '
 437
 438 test_expect_success 'no file status change if no pathspec is given in subdir' '
 439         mkdir -p sub &&
 440         (
 441                 cd sub &&
 442                 >sub-foo1 &&
 443                 >sub-foo2 &&
 444                 git add . &&
 445                 git add --chmod=+x &&
 446                 test_mode_in_index 100644 sub-foo1 &&
 447                 test_mode_in_index 100644 sub-foo2
 448         )
 449 '
 450
 451 test_expect_success 'all statuses changed in folder if . is given' '
 452         git init repo &&
 453         (
 454                 cd repo &&
 455                 mkdir -p sub/dir &&
 456                 touch x y z sub/a sub/dir/b &&
 457                 git add -A &&
 458                 git add --chmod=+x . &&
 459                 test $(git ls-files --stage | grep ^100644 | wc -l) -eq 0 &&
 460                 git add --chmod=-x . &&
 461                 test $(git ls-files --stage | grep ^100755 | wc -l) -eq 0
 462         )
 463 '
 464
 465 test_expect_success CASE_INSENSITIVE_FS 'path is case-insensitive' '
 466         path="$(pwd)/BLUB" &&
 467         touch "$path" &&
 468         downcased="$(echo "$path" | tr A-Z a-z)" &&
 469         git add "$downcased"
 470 '
 471
 472 test_done