filter-branch: also don't fail in map() if a commit cannot be mapped
[alt-git.git] / t / t3700-add.sh
blobad8cc7d4ae88e2066d2f51b6a6a5a192780d5e9a
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 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 'git-add: filemode=0 should not get confused by symlink' '
34 rm -f xfoo1 &&
35 ln -s foo xfoo1 &&
36 git-add xfoo1 &&
37 case "`git-ls-files --stage xfoo1`" in
38 120000" "*xfoo1) echo ok;;
39 *) echo fail; git-ls-files --stage xfoo1; (exit 1);;
40 esac
43 test_expect_success \
44 'git-update-index --add: Test that executable bit is not used...' \
45 'git config core.filemode 0 &&
46 echo foo >xfoo2 &&
47 chmod 755 xfoo2 &&
48 git-update-index --add xfoo2 &&
49 case "`git-ls-files --stage xfoo2`" in
50 100644" "*xfoo2) echo ok;;
51 *) echo fail; git-ls-files --stage xfoo2; (exit 1);;
52 esac'
54 test_expect_success 'git-add: filemode=0 should not get confused by symlink' '
55 rm -f xfoo2 &&
56 ln -s foo xfoo2 &&
57 git update-index --add xfoo2 &&
58 case "`git-ls-files --stage xfoo2`" in
59 120000" "*xfoo2) echo ok;;
60 *) echo fail; git-ls-files --stage xfoo2; (exit 1);;
61 esac
64 test_expect_success \
65 'git-update-index --add: Test that executable bit is not used...' \
66 'git config core.filemode 0 &&
67 ln -s xfoo2 xfoo3 &&
68 git-update-index --add xfoo3 &&
69 case "`git-ls-files --stage xfoo3`" in
70 120000" "*xfoo3) echo ok;;
71 *) echo fail; git-ls-files --stage xfoo3; (exit 1);;
72 esac'
74 test_expect_success '.gitignore test setup' '
75 echo "*.ig" >.gitignore &&
76 mkdir c.if d.ig &&
77 >a.ig && >b.if &&
78 >c.if/c.if && >c.if/c.ig &&
79 >d.ig/d.if && >d.ig/d.ig
82 test_expect_success '.gitignore is honored' '
83 git-add . &&
84 ! git-ls-files | grep "\\.ig"
87 test_expect_success 'error out when attempting to add ignored ones without -f' '
88 ! git-add a.?? &&
89 ! git-ls-files | grep "\\.ig"
92 test_expect_success 'error out when attempting to add ignored ones without -f' '
93 ! git-add d.?? &&
94 ! git-ls-files | grep "\\.ig"
97 test_expect_success 'add ignored ones with -f' '
98 git-add -f a.?? &&
99 git-ls-files --error-unmatch a.ig
102 test_expect_success 'add ignored ones with -f' '
103 git-add -f d.??/* &&
104 git-ls-files --error-unmatch d.ig/d.if d.ig/d.ig
107 mkdir 1 1/2 1/3
108 touch 1/2/a 1/3/b 1/2/c
109 test_expect_success 'check correct prefix detection' '
110 git add 1/2/a 1/3/b 1/2/c
113 test_done