Merge branch 'jk/enable-test-lint-by-default' into maint
[git/jnareb-git.git] / t / t3905-stash-include-untracked.sh
bloba5e7e6b2ba3138d06c400e965decf1389da3274a
1 #!/bin/sh
3 # Copyright (c) 2011 David Caldwell
6 test_description='Test git stash --include-untracked'
8 . ./test-lib.sh
10 test_expect_success 'stash save --include-untracked some dirty working directory' '
11 echo 1 > file &&
12 git add file &&
13 test_tick &&
14 git commit -m initial &&
15 echo 2 > file &&
16 git add file &&
17 echo 3 > file &&
18 test_tick &&
19 echo 1 > file2 &&
20 echo 1 > HEAD &&
21 mkdir untracked &&
22 echo untracked >untracked/untracked &&
23 git stash --include-untracked &&
24 git diff-files --quiet &&
25 git diff-index --cached --quiet HEAD
28 cat > expect <<EOF
29 ?? actual
30 ?? expect
31 EOF
33 test_expect_success 'stash save --include-untracked cleaned the untracked files' '
34 git status --porcelain >actual &&
35 test_cmp expect actual
38 cat > expect.diff <<EOF
39 diff --git a/HEAD b/HEAD
40 new file mode 100644
41 index 0000000..d00491f
42 --- /dev/null
43 +++ b/HEAD
44 @@ -0,0 +1 @@
46 diff --git a/file2 b/file2
47 new file mode 100644
48 index 0000000..d00491f
49 --- /dev/null
50 +++ b/file2
51 @@ -0,0 +1 @@
53 diff --git a/untracked/untracked b/untracked/untracked
54 new file mode 100644
55 index 0000000..5a72eb2
56 --- /dev/null
57 +++ b/untracked/untracked
58 @@ -0,0 +1 @@
59 +untracked
60 EOF
61 cat > expect.lstree <<EOF
62 HEAD
63 file2
64 untracked
65 EOF
67 test_expect_success 'stash save --include-untracked stashed the untracked files' '
68 test_path_is_missing file2 &&
69 test_path_is_missing untracked &&
70 test_path_is_missing HEAD &&
71 git diff HEAD stash^3 -- HEAD file2 untracked >actual &&
72 test_cmp expect.diff actual &&
73 git ls-tree --name-only stash^3: >actual &&
74 test_cmp expect.lstree actual
76 test_expect_success 'stash save --patch --include-untracked fails' '
77 test_must_fail git stash --patch --include-untracked
80 test_expect_success 'stash save --patch --all fails' '
81 test_must_fail git stash --patch --all
84 git clean --force --quiet
86 cat > expect <<EOF
87 M file
88 ?? HEAD
89 ?? actual
90 ?? expect
91 ?? file2
92 ?? untracked/
93 EOF
95 test_expect_success 'stash pop after save --include-untracked leaves files untracked again' '
96 git stash pop &&
97 git status --porcelain >actual &&
98 test_cmp expect actual &&
99 test "1" = "`cat file2`" &&
100 test untracked = "`cat untracked/untracked`"
103 git clean --force --quiet -d
105 test_expect_success 'stash save -u dirty index' '
106 echo 4 > file3 &&
107 git add file3 &&
108 test_tick &&
109 git stash -u
112 cat > expect <<EOF
113 diff --git a/file3 b/file3
114 new file mode 100644
115 index 0000000..b8626c4
116 --- /dev/null
117 +++ b/file3
118 @@ -0,0 +1 @@
122 test_expect_success 'stash save --include-untracked dirty index got stashed' '
123 git stash pop --index &&
124 git diff --cached >actual &&
125 test_cmp expect actual
128 git reset > /dev/null
130 # Must direct output somewhere where it won't be considered an untracked file
131 test_expect_success 'stash save --include-untracked -q is quiet' '
132 echo 1 > file5 &&
133 git stash save --include-untracked --quiet > .git/stash-output.out 2>&1 &&
134 test_line_count = 0 .git/stash-output.out &&
135 rm -f .git/stash-output.out
138 test_expect_success 'stash save --include-untracked removed files' '
139 rm -f file &&
140 git stash save --include-untracked &&
141 echo 1 > expect &&
142 test_cmp file expect
145 rm -f expect
147 test_expect_success 'stash save --include-untracked removed files got stashed' '
148 git stash pop &&
149 test_path_is_missing file
152 cat > .gitignore <<EOF
153 .gitignore
154 ignored
155 ignored.d/
158 test_expect_success 'stash save --include-untracked respects .gitignore' '
159 echo ignored > ignored &&
160 mkdir ignored.d &&
161 echo ignored >ignored.d/untracked &&
162 git stash -u &&
163 test -s ignored &&
164 test -s ignored.d/untracked &&
165 test -s .gitignore
168 test_expect_success 'stash save -u can stash with only untracked files different' '
169 echo 4 > file4 &&
170 git stash -u &&
171 test_path_is_missing file4
174 test_expect_success 'stash save --all does not respect .gitignore' '
175 git stash -a &&
176 test_path_is_missing ignored &&
177 test_path_is_missing ignored.d &&
178 test_path_is_missing .gitignore
181 test_expect_success 'stash save --all is stash poppable' '
182 git stash pop &&
183 test -s ignored &&
184 test -s ignored.d/untracked &&
185 test -s .gitignore
188 test_done