Make a short-and-sweet "git-add -i" synonym for "git-add --interactive"
[git/jnareb-git.git] / t / t3700-add.sh
blobe98786de32ca3139b2587fd5fca29a9f400c81d7
1 #!/bin/sh
3 # Copyright (c) 2006 Carl D. Worth
6 test_description='Test of git-add, including the -- option.'
8 . ./test-lib.sh
10 test_expect_success \
11 'Test of git-add' \
12 'touch foo && git-add foo'
14 test_expect_success \
15 'Post-check that foo is in the index' \
16 'git-ls-files foo | grep foo'
18 test_expect_success \
19 'Test that "git-add -- -q" works' \
20 'touch -- -q && git-add -- -q'
22 test_expect_success \
23 'git-add: Test that executable bit is not used if core.filemode=0' \
24 'git repo-config core.filemode 0 &&
25 echo foo >xfoo1 &&
26 chmod 755 xfoo1 &&
27 git-add xfoo1 &&
28 case "`git-ls-files --stage xfoo1`" in
29 100644" "*xfoo1) echo ok;;
30 *) echo fail; git-ls-files --stage xfoo1; (exit 1);;
31 esac'
33 test_expect_success \
34 'git-update-index --add: Test that executable bit is not used...' \
35 'git repo-config core.filemode 0 &&
36 echo foo >xfoo2 &&
37 chmod 755 xfoo2 &&
38 git-update-index --add xfoo2 &&
39 case "`git-ls-files --stage xfoo2`" in
40 100644" "*xfoo2) echo ok;;
41 *) echo fail; git-ls-files --stage xfoo2; (exit 1);;
42 esac'
44 test_expect_success \
45 'git-update-index --add: Test that executable bit is not used...' \
46 'git repo-config core.filemode 0 &&
47 ln -s xfoo2 xfoo3 &&
48 git-update-index --add xfoo3 &&
49 case "`git-ls-files --stage xfoo3`" in
50 120000" "*xfoo3) echo ok;;
51 *) echo fail; git-ls-files --stage xfoo3; (exit 1);;
52 esac'
54 test_expect_success '.gitignore test setup' '
55 echo "*.ig" >.gitignore &&
56 mkdir c.if d.ig &&
57 >a.ig && >b.if &&
58 >c.if/c.if && >c.if/c.ig &&
59 >d.ig/d.if && >d.ig/d.ig
62 test_expect_success '.gitignore is honored' '
63 git-add . &&
64 ! git-ls-files | grep "\\.ig"
67 test_expect_success 'error out when attempting to add ignored ones without -f' '
68 ! git-add a.?? &&
69 ! git-ls-files | grep "\\.ig"
72 test_expect_success 'error out when attempting to add ignored ones without -f' '
73 ! git-add d.?? &&
74 ! git-ls-files | grep "\\.ig"
77 test_expect_success 'add ignored ones with -f' '
78 git-add -f a.?? &&
79 git-ls-files --error-unmatch a.ig
82 test_expect_success 'add ignored ones with -f' '
83 git-add -f d.??/* &&
84 git-ls-files --error-unmatch d.ig/d.if d.ig/d.ig
87 test_done