about summary refs log tree commit diff
path: root/third_party/git/t/t7061-wtstatus-ignore.sh
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
committerVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
commit93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch)
tree85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/t/t7061-wtstatus-ignore.sh
parent6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff)
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable.

This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing
changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/t/t7061-wtstatus-ignore.sh')
-rwxr-xr-xthird_party/git/t/t7061-wtstatus-ignore.sh9
1 files changed, 2 insertions, 7 deletions
diff --git a/third_party/git/t/t7061-wtstatus-ignore.sh b/third_party/git/t/t7061-wtstatus-ignore.sh
index e4cf5484f97a..0c394cf995cb 100755
--- a/third_party/git/t/t7061-wtstatus-ignore.sh
+++ b/third_party/git/t/t7061-wtstatus-ignore.sh
@@ -43,16 +43,11 @@ test_expect_success 'status untracked directory with --ignored -u' '
 	test_cmp expected actual
 '
 cat >expected <<\EOF
-?? untracked/
+?? untracked/uncommitted
 !! untracked/ignored
 EOF
 
-test_expect_success 'status of untracked directory with --ignored works with or without prefix' '
-	git status --porcelain --ignored >tmp &&
-	grep untracked/ tmp >actual &&
-	rm tmp &&
-	test_cmp expected actual &&
-
+test_expect_success 'status prefixed untracked directory with --ignored' '
 	git status --porcelain --ignored untracked/ >actual &&
 	test_cmp expected actual
 '