mirror of
https://github.com/git/git.git
synced 2024-11-16 22:14:53 +01:00
7474b8b452
The two new stash options --include-untracked and --all do not remove the untracked and/or ignored files that are stashed if those files reside in a subdirectory. e.g. the following sequence fails: mkdir untracked && echo hello >untracked/file.txt && git stash --include-untracked && test ! -f untracked/file.txt Within the git-stash script, git-clean is used to remove the untracked/ignored files, but since the -d option was not supplied, it does not remove directories. So, add -d to the git-clean arguments, and update the tests to test this functionality. Reported-by: Hilco Wijbenga <hilco.wijbenga@gmail.com> Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
175 lines
3.6 KiB
Bash
Executable file
175 lines
3.6 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2011 David Caldwell
|
|
#
|
|
|
|
test_description='Test git stash --include-untracked'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'stash save --include-untracked some dirty working directory' '
|
|
echo 1 > file &&
|
|
git add file &&
|
|
test_tick &&
|
|
git commit -m initial &&
|
|
echo 2 > file &&
|
|
git add file &&
|
|
echo 3 > file &&
|
|
test_tick &&
|
|
echo 1 > file2 &&
|
|
mkdir untracked &&
|
|
echo untracked >untracked/untracked &&
|
|
git stash --include-untracked &&
|
|
git diff-files --quiet &&
|
|
git diff-index --cached --quiet HEAD
|
|
'
|
|
|
|
cat > expect <<EOF
|
|
?? actual
|
|
?? expect
|
|
EOF
|
|
|
|
test_expect_success 'stash save --include-untracked cleaned the untracked files' '
|
|
git status --porcelain >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
cat > expect.diff <<EOF
|
|
diff --git a/file2 b/file2
|
|
new file mode 100644
|
|
index 0000000..d00491f
|
|
--- /dev/null
|
|
+++ b/file2
|
|
@@ -0,0 +1 @@
|
|
+1
|
|
diff --git a/untracked/untracked b/untracked/untracked
|
|
new file mode 100644
|
|
index 0000000..5a72eb2
|
|
--- /dev/null
|
|
+++ b/untracked/untracked
|
|
@@ -0,0 +1 @@
|
|
+untracked
|
|
EOF
|
|
cat > expect.lstree <<EOF
|
|
file2
|
|
untracked
|
|
EOF
|
|
|
|
test_expect_success 'stash save --include-untracked stashed the untracked files' '
|
|
test "!" -f file2 &&
|
|
test ! -e untracked &&
|
|
git diff HEAD stash^3 -- file2 untracked >actual &&
|
|
test_cmp expect.diff actual &&
|
|
git ls-tree --name-only stash^3: >actual &&
|
|
test_cmp expect.lstree actual
|
|
'
|
|
test_expect_success 'stash save --patch --include-untracked fails' '
|
|
test_must_fail git stash --patch --include-untracked
|
|
'
|
|
|
|
test_expect_success 'stash save --patch --all fails' '
|
|
test_must_fail git stash --patch --all
|
|
'
|
|
|
|
git clean --force --quiet
|
|
|
|
cat > expect <<EOF
|
|
M file
|
|
?? actual
|
|
?? expect
|
|
?? file2
|
|
?? untracked/
|
|
EOF
|
|
|
|
test_expect_success 'stash pop after save --include-untracked leaves files untracked again' '
|
|
git stash pop &&
|
|
git status --porcelain >actual &&
|
|
test_cmp expect actual &&
|
|
test "1" = "`cat file2`" &&
|
|
test untracked = "`cat untracked/untracked`"
|
|
'
|
|
|
|
git clean --force --quiet -d
|
|
|
|
test_expect_success 'stash save -u dirty index' '
|
|
echo 4 > file3 &&
|
|
git add file3 &&
|
|
test_tick &&
|
|
git stash -u
|
|
'
|
|
|
|
cat > expect <<EOF
|
|
diff --git a/file3 b/file3
|
|
new file mode 100644
|
|
index 0000000..b8626c4
|
|
--- /dev/null
|
|
+++ b/file3
|
|
@@ -0,0 +1 @@
|
|
+4
|
|
EOF
|
|
|
|
test_expect_success 'stash save --include-untracked dirty index got stashed' '
|
|
git stash pop --index &&
|
|
git diff --cached >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
git reset > /dev/null
|
|
|
|
test_expect_success 'stash save --include-untracked -q is quiet' '
|
|
echo 1 > file5 &&
|
|
git stash save --include-untracked --quiet > output.out 2>&1 &&
|
|
test ! -s output.out
|
|
'
|
|
|
|
test_expect_success 'stash save --include-untracked removed files' '
|
|
rm -f file &&
|
|
git stash save --include-untracked &&
|
|
echo 1 > expect &&
|
|
test_cmp file expect
|
|
'
|
|
|
|
rm -f expect
|
|
|
|
test_expect_success 'stash save --include-untracked removed files got stashed' '
|
|
git stash pop &&
|
|
test ! -f file
|
|
'
|
|
|
|
cat > .gitignore <<EOF
|
|
.gitignore
|
|
ignored
|
|
ignored.d/
|
|
EOF
|
|
|
|
test_expect_success 'stash save --include-untracked respects .gitignore' '
|
|
echo ignored > ignored &&
|
|
mkdir ignored.d &&
|
|
echo ignored >ignored.d/untracked &&
|
|
git stash -u &&
|
|
test -s ignored &&
|
|
test -s ignored.d/untracked &&
|
|
test -s .gitignore
|
|
'
|
|
|
|
test_expect_success 'stash save -u can stash with only untracked files different' '
|
|
echo 4 > file4 &&
|
|
git stash -u &&
|
|
test "!" -f file4
|
|
'
|
|
|
|
test_expect_success 'stash save --all does not respect .gitignore' '
|
|
git stash -a &&
|
|
test "!" -f ignored &&
|
|
test "!" -e ignored.d &&
|
|
test "!" -f .gitignore
|
|
'
|
|
|
|
test_expect_success 'stash save --all is stash poppable' '
|
|
git stash pop &&
|
|
test -s ignored &&
|
|
test -s ignored.d/untracked &&
|
|
test -s .gitignore
|
|
'
|
|
|
|
test_done
|