Re: [PATCH v3 1/2] stash show: teach --include-untracked and --only-untracked
From: Junio C Hamano <hidden>
Date: 2021-02-17 02:32:08
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2021-02-17 · Re: [PATCH v3 1/2] stash show: teach --include-untracked and --only-untracked · Junio C Hamano <hidden>
- 2021-02-17 · Re: [PATCH v3 1/2] stash show: teach --include-untracked and --only-untracked · Denton Liu <hidden>
- 2021-02-16 · Re: [PATCH v3 1/2] stash show: teach --include-untracked and --only-untracked · Junio C Hamano <hidden>
- 2021-02-16 · [PATCH v3 1/2] stash show: teach --include-untracked and --only-untracked · Denton Liu <hidden>
Denton Liu [off-list ref] writes:
quoted hunk
diff --git a/t/t3905-stash-include-untracked.sh b/t/t3905-stash-include-untracked.sh index b26a97aef4..978bc97baf 100755 --- a/t/t3905-stash-include-untracked.sh +++ b/t/t3905-stash-include-untracked.sh@@ -297,4 +297,88 @@ test_expect_success 'stash -u with globs' ' test_path_is_missing untracked.txt ' +test_expect_success 'stash show --include-untracked shows untracked files' ' + ... + cat >expect <<-EOF && + diff --git a/tracked b/tracked + new file mode 100644 + index 0000000..e69de29 + diff --git a/untracked b/untracked + new file mode 100644 + index 0000000..e69de29 + EOF
We'd need this on top. Thanks. ----- >8 ---------- >8 ---------- >8 ---------- >8 ----- Subject: [PATCH] SQUASH??? t/t3905-stash-include-untracked.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/t/t3905-stash-include-untracked.sh b/t/t3905-stash-include-untracked.sh
index 8bcd4c5ca8..a706ab80a5 100755
--- a/t/t3905-stash-include-untracked.sh
+++ b/t/t3905-stash-include-untracked.sh@@ -303,6 +303,7 @@ test_expect_success 'stash show --include-untracked shows untracked files' ' >untracked && >tracked && git add tracked && + empty_blob_oid=$(git rev-parse --short :tracked) && git stash -u && cat >expect <<-EOF &&
@@ -324,10 +325,10 @@ test_expect_success 'stash show --include-untracked shows untracked files' ' cat >expect <<-EOF && diff --git a/tracked b/tracked new file mode 100644 - index 0000000..e69de29 + index 0000000..$empty_blob_oid diff --git a/untracked b/untracked new file mode 100644 - index 0000000..e69de29 + index 0000000..$empty_blob_oid EOF git stash show -p --include-untracked >actual && test_cmp expect actual &&
@@ -341,6 +342,7 @@ test_expect_success 'stash show --only-untracked only shows untracked files' ' >untracked && >tracked && git add tracked && + empty_blob_oid=$(git rev-parse --short :tracked) && git stash -u && cat >expect <<-EOF &&
@@ -357,7 +359,7 @@ test_expect_success 'stash show --only-untracked only shows untracked files' ' cat >expect <<-EOF && diff --git a/untracked b/untracked new file mode 100644 - index 0000000..e69de29 + index 0000000..$empty_blob_oid EOF git stash show -p --only-untracked >actual && test_cmp expect actual &&
--
2.30.1-684-g310d03ec1a