2011-06-25 08:56:06 +08:00
|
|
|
#!/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 &&
|
stash: Don't fail if work dir contains file named 'HEAD'
When performing a plain "git stash" (without --patch), git-diff would fail
with "fatal: ambiguous argument 'HEAD': both revision and filename". The
output was piped into git-update-index, masking the failed exit status.
The output is now sent to a temporary file (which is cleaned up by
existing code), and the exit status is checked. The "HEAD" arg to the
git-diff invocation has been disambiguated too, of course.
In patch mode, "git stash -p" would fail harmlessly, leaving the working
dir untouched. Interactive adding is fine, but the resulting tree was
diffed with an ambiguous 'HEAD' argument.
Use >foo (no space) when redirecting output.
In t3904, checks and operations on each file are in the order they'll
appear when interactively staging.
In t3905, fix a bug in "stash save --include-untracked -q is quiet": The
redirected stdout file was considered untracked, and so was removed from
the working directory. Use test path helper functions where appropriate.
Signed-off-by: Jonathon Mah <me@JonathonMah.com>
Acked-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-12-31 08:14:01 +08:00
|
|
|
echo 1 > HEAD &&
|
2011-08-27 08:59:27 +08:00
|
|
|
mkdir untracked &&
|
|
|
|
echo untracked >untracked/untracked &&
|
2011-06-25 08:56:06 +08:00
|
|
|
git stash --include-untracked &&
|
|
|
|
git diff-files --quiet &&
|
|
|
|
git diff-index --cached --quiet HEAD
|
|
|
|
'
|
|
|
|
|
|
|
|
cat > expect <<EOF
|
2011-08-27 08:59:24 +08:00
|
|
|
?? actual
|
2011-06-25 08:56:06 +08:00
|
|
|
?? expect
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'stash save --include-untracked cleaned the untracked files' '
|
2011-08-27 08:59:26 +08:00
|
|
|
git status --porcelain >actual &&
|
2011-08-27 08:59:24 +08:00
|
|
|
test_cmp expect actual
|
2011-06-25 08:56:06 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
cat > expect.diff <<EOF
|
stash: Don't fail if work dir contains file named 'HEAD'
When performing a plain "git stash" (without --patch), git-diff would fail
with "fatal: ambiguous argument 'HEAD': both revision and filename". The
output was piped into git-update-index, masking the failed exit status.
The output is now sent to a temporary file (which is cleaned up by
existing code), and the exit status is checked. The "HEAD" arg to the
git-diff invocation has been disambiguated too, of course.
In patch mode, "git stash -p" would fail harmlessly, leaving the working
dir untouched. Interactive adding is fine, but the resulting tree was
diffed with an ambiguous 'HEAD' argument.
Use >foo (no space) when redirecting output.
In t3904, checks and operations on each file are in the order they'll
appear when interactively staging.
In t3905, fix a bug in "stash save --include-untracked -q is quiet": The
redirected stdout file was considered untracked, and so was removed from
the working directory. Use test path helper functions where appropriate.
Signed-off-by: Jonathon Mah <me@JonathonMah.com>
Acked-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-12-31 08:14:01 +08:00
|
|
|
diff --git a/HEAD b/HEAD
|
|
|
|
new file mode 100644
|
|
|
|
index 0000000..d00491f
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/HEAD
|
|
|
|
@@ -0,0 +1 @@
|
|
|
|
+1
|
2011-06-25 08:56:06 +08:00
|
|
|
diff --git a/file2 b/file2
|
|
|
|
new file mode 100644
|
|
|
|
index 0000000..d00491f
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/file2
|
|
|
|
@@ -0,0 +1 @@
|
|
|
|
+1
|
2011-08-27 08:59:27 +08:00
|
|
|
diff --git a/untracked/untracked b/untracked/untracked
|
|
|
|
new file mode 100644
|
|
|
|
index 0000000..5a72eb2
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/untracked/untracked
|
|
|
|
@@ -0,0 +1 @@
|
|
|
|
+untracked
|
2011-06-25 08:56:06 +08:00
|
|
|
EOF
|
|
|
|
cat > expect.lstree <<EOF
|
stash: Don't fail if work dir contains file named 'HEAD'
When performing a plain "git stash" (without --patch), git-diff would fail
with "fatal: ambiguous argument 'HEAD': both revision and filename". The
output was piped into git-update-index, masking the failed exit status.
The output is now sent to a temporary file (which is cleaned up by
existing code), and the exit status is checked. The "HEAD" arg to the
git-diff invocation has been disambiguated too, of course.
In patch mode, "git stash -p" would fail harmlessly, leaving the working
dir untouched. Interactive adding is fine, but the resulting tree was
diffed with an ambiguous 'HEAD' argument.
Use >foo (no space) when redirecting output.
In t3904, checks and operations on each file are in the order they'll
appear when interactively staging.
In t3905, fix a bug in "stash save --include-untracked -q is quiet": The
redirected stdout file was considered untracked, and so was removed from
the working directory. Use test path helper functions where appropriate.
Signed-off-by: Jonathon Mah <me@JonathonMah.com>
Acked-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-12-31 08:14:01 +08:00
|
|
|
HEAD
|
2011-06-25 08:56:06 +08:00
|
|
|
file2
|
2011-08-27 08:59:27 +08:00
|
|
|
untracked
|
2011-06-25 08:56:06 +08:00
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'stash save --include-untracked stashed the untracked files' '
|
stash: Don't fail if work dir contains file named 'HEAD'
When performing a plain "git stash" (without --patch), git-diff would fail
with "fatal: ambiguous argument 'HEAD': both revision and filename". The
output was piped into git-update-index, masking the failed exit status.
The output is now sent to a temporary file (which is cleaned up by
existing code), and the exit status is checked. The "HEAD" arg to the
git-diff invocation has been disambiguated too, of course.
In patch mode, "git stash -p" would fail harmlessly, leaving the working
dir untouched. Interactive adding is fine, but the resulting tree was
diffed with an ambiguous 'HEAD' argument.
Use >foo (no space) when redirecting output.
In t3904, checks and operations on each file are in the order they'll
appear when interactively staging.
In t3905, fix a bug in "stash save --include-untracked -q is quiet": The
redirected stdout file was considered untracked, and so was removed from
the working directory. Use test path helper functions where appropriate.
Signed-off-by: Jonathon Mah <me@JonathonMah.com>
Acked-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-12-31 08:14:01 +08:00
|
|
|
test_path_is_missing file2 &&
|
|
|
|
test_path_is_missing untracked &&
|
|
|
|
test_path_is_missing HEAD &&
|
|
|
|
git diff HEAD stash^3 -- HEAD file2 untracked >actual &&
|
2011-08-27 08:59:24 +08:00
|
|
|
test_cmp expect.diff actual &&
|
|
|
|
git ls-tree --name-only stash^3: >actual &&
|
|
|
|
test_cmp expect.lstree actual
|
2011-06-25 08:56:06 +08:00
|
|
|
'
|
|
|
|
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
|
stash: Don't fail if work dir contains file named 'HEAD'
When performing a plain "git stash" (without --patch), git-diff would fail
with "fatal: ambiguous argument 'HEAD': both revision and filename". The
output was piped into git-update-index, masking the failed exit status.
The output is now sent to a temporary file (which is cleaned up by
existing code), and the exit status is checked. The "HEAD" arg to the
git-diff invocation has been disambiguated too, of course.
In patch mode, "git stash -p" would fail harmlessly, leaving the working
dir untouched. Interactive adding is fine, but the resulting tree was
diffed with an ambiguous 'HEAD' argument.
Use >foo (no space) when redirecting output.
In t3904, checks and operations on each file are in the order they'll
appear when interactively staging.
In t3905, fix a bug in "stash save --include-untracked -q is quiet": The
redirected stdout file was considered untracked, and so was removed from
the working directory. Use test path helper functions where appropriate.
Signed-off-by: Jonathon Mah <me@JonathonMah.com>
Acked-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-12-31 08:14:01 +08:00
|
|
|
?? HEAD
|
2011-08-27 08:59:24 +08:00
|
|
|
?? actual
|
2011-06-25 08:56:06 +08:00
|
|
|
?? expect
|
|
|
|
?? file2
|
2011-08-27 08:59:27 +08:00
|
|
|
?? untracked/
|
2011-06-25 08:56:06 +08:00
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'stash pop after save --include-untracked leaves files untracked again' '
|
|
|
|
git stash pop &&
|
2011-08-27 08:59:26 +08:00
|
|
|
git status --porcelain >actual &&
|
2011-08-27 08:59:27 +08:00
|
|
|
test_cmp expect actual &&
|
2014-05-01 00:22:54 +08:00
|
|
|
test "1" = "$(cat file2)" &&
|
|
|
|
test untracked = "$(cat untracked/untracked)"
|
2011-06-25 08:56:06 +08:00
|
|
|
'
|
|
|
|
|
2011-08-27 08:59:27 +08:00
|
|
|
git clean --force --quiet -d
|
2011-06-25 08:56:06 +08:00
|
|
|
|
|
|
|
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 &&
|
2011-08-27 08:59:24 +08:00
|
|
|
git diff --cached >actual &&
|
|
|
|
test_cmp expect actual
|
2011-06-25 08:56:06 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
git reset > /dev/null
|
|
|
|
|
stash: Don't fail if work dir contains file named 'HEAD'
When performing a plain "git stash" (without --patch), git-diff would fail
with "fatal: ambiguous argument 'HEAD': both revision and filename". The
output was piped into git-update-index, masking the failed exit status.
The output is now sent to a temporary file (which is cleaned up by
existing code), and the exit status is checked. The "HEAD" arg to the
git-diff invocation has been disambiguated too, of course.
In patch mode, "git stash -p" would fail harmlessly, leaving the working
dir untouched. Interactive adding is fine, but the resulting tree was
diffed with an ambiguous 'HEAD' argument.
Use >foo (no space) when redirecting output.
In t3904, checks and operations on each file are in the order they'll
appear when interactively staging.
In t3905, fix a bug in "stash save --include-untracked -q is quiet": The
redirected stdout file was considered untracked, and so was removed from
the working directory. Use test path helper functions where appropriate.
Signed-off-by: Jonathon Mah <me@JonathonMah.com>
Acked-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-12-31 08:14:01 +08:00
|
|
|
# Must direct output somewhere where it won't be considered an untracked file
|
2011-06-25 08:56:06 +08:00
|
|
|
test_expect_success 'stash save --include-untracked -q is quiet' '
|
|
|
|
echo 1 > file5 &&
|
stash: Don't fail if work dir contains file named 'HEAD'
When performing a plain "git stash" (without --patch), git-diff would fail
with "fatal: ambiguous argument 'HEAD': both revision and filename". The
output was piped into git-update-index, masking the failed exit status.
The output is now sent to a temporary file (which is cleaned up by
existing code), and the exit status is checked. The "HEAD" arg to the
git-diff invocation has been disambiguated too, of course.
In patch mode, "git stash -p" would fail harmlessly, leaving the working
dir untouched. Interactive adding is fine, but the resulting tree was
diffed with an ambiguous 'HEAD' argument.
Use >foo (no space) when redirecting output.
In t3904, checks and operations on each file are in the order they'll
appear when interactively staging.
In t3905, fix a bug in "stash save --include-untracked -q is quiet": The
redirected stdout file was considered untracked, and so was removed from
the working directory. Use test path helper functions where appropriate.
Signed-off-by: Jonathon Mah <me@JonathonMah.com>
Acked-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-12-31 08:14:01 +08:00
|
|
|
git stash save --include-untracked --quiet > .git/stash-output.out 2>&1 &&
|
|
|
|
test_line_count = 0 .git/stash-output.out &&
|
|
|
|
rm -f .git/stash-output.out
|
2011-06-25 08:56:06 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
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 &&
|
stash: Don't fail if work dir contains file named 'HEAD'
When performing a plain "git stash" (without --patch), git-diff would fail
with "fatal: ambiguous argument 'HEAD': both revision and filename". The
output was piped into git-update-index, masking the failed exit status.
The output is now sent to a temporary file (which is cleaned up by
existing code), and the exit status is checked. The "HEAD" arg to the
git-diff invocation has been disambiguated too, of course.
In patch mode, "git stash -p" would fail harmlessly, leaving the working
dir untouched. Interactive adding is fine, but the resulting tree was
diffed with an ambiguous 'HEAD' argument.
Use >foo (no space) when redirecting output.
In t3904, checks and operations on each file are in the order they'll
appear when interactively staging.
In t3905, fix a bug in "stash save --include-untracked -q is quiet": The
redirected stdout file was considered untracked, and so was removed from
the working directory. Use test path helper functions where appropriate.
Signed-off-by: Jonathon Mah <me@JonathonMah.com>
Acked-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-12-31 08:14:01 +08:00
|
|
|
test_path_is_missing file
|
2011-06-25 08:56:06 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
cat > .gitignore <<EOF
|
|
|
|
.gitignore
|
|
|
|
ignored
|
2011-08-27 08:59:27 +08:00
|
|
|
ignored.d/
|
2011-06-25 08:56:06 +08:00
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'stash save --include-untracked respects .gitignore' '
|
|
|
|
echo ignored > ignored &&
|
2011-08-27 08:59:27 +08:00
|
|
|
mkdir ignored.d &&
|
|
|
|
echo ignored >ignored.d/untracked &&
|
2011-06-25 08:56:06 +08:00
|
|
|
git stash -u &&
|
|
|
|
test -s ignored &&
|
2011-08-27 08:59:27 +08:00
|
|
|
test -s ignored.d/untracked &&
|
2011-06-25 08:56:06 +08:00
|
|
|
test -s .gitignore
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'stash save -u can stash with only untracked files different' '
|
|
|
|
echo 4 > file4 &&
|
2011-08-27 08:59:26 +08:00
|
|
|
git stash -u &&
|
stash: Don't fail if work dir contains file named 'HEAD'
When performing a plain "git stash" (without --patch), git-diff would fail
with "fatal: ambiguous argument 'HEAD': both revision and filename". The
output was piped into git-update-index, masking the failed exit status.
The output is now sent to a temporary file (which is cleaned up by
existing code), and the exit status is checked. The "HEAD" arg to the
git-diff invocation has been disambiguated too, of course.
In patch mode, "git stash -p" would fail harmlessly, leaving the working
dir untouched. Interactive adding is fine, but the resulting tree was
diffed with an ambiguous 'HEAD' argument.
Use >foo (no space) when redirecting output.
In t3904, checks and operations on each file are in the order they'll
appear when interactively staging.
In t3905, fix a bug in "stash save --include-untracked -q is quiet": The
redirected stdout file was considered untracked, and so was removed from
the working directory. Use test path helper functions where appropriate.
Signed-off-by: Jonathon Mah <me@JonathonMah.com>
Acked-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-12-31 08:14:01 +08:00
|
|
|
test_path_is_missing file4
|
2011-06-25 08:56:06 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'stash save --all does not respect .gitignore' '
|
|
|
|
git stash -a &&
|
stash: Don't fail if work dir contains file named 'HEAD'
When performing a plain "git stash" (without --patch), git-diff would fail
with "fatal: ambiguous argument 'HEAD': both revision and filename". The
output was piped into git-update-index, masking the failed exit status.
The output is now sent to a temporary file (which is cleaned up by
existing code), and the exit status is checked. The "HEAD" arg to the
git-diff invocation has been disambiguated too, of course.
In patch mode, "git stash -p" would fail harmlessly, leaving the working
dir untouched. Interactive adding is fine, but the resulting tree was
diffed with an ambiguous 'HEAD' argument.
Use >foo (no space) when redirecting output.
In t3904, checks and operations on each file are in the order they'll
appear when interactively staging.
In t3905, fix a bug in "stash save --include-untracked -q is quiet": The
redirected stdout file was considered untracked, and so was removed from
the working directory. Use test path helper functions where appropriate.
Signed-off-by: Jonathon Mah <me@JonathonMah.com>
Acked-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-12-31 08:14:01 +08:00
|
|
|
test_path_is_missing ignored &&
|
|
|
|
test_path_is_missing ignored.d &&
|
|
|
|
test_path_is_missing .gitignore
|
2011-06-25 08:56:06 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'stash save --all is stash poppable' '
|
|
|
|
git stash pop &&
|
|
|
|
test -s ignored &&
|
2011-08-27 08:59:27 +08:00
|
|
|
test -s ignored.d/untracked &&
|
2011-06-25 08:56:06 +08:00
|
|
|
test -s .gitignore
|
|
|
|
'
|
|
|
|
|
|
|
|
test_done
|