about summary refs log tree commit diff
path: root/third_party/git/t/t7105-reset-patch.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/t7105-reset-patch.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/t7105-reset-patch.sh')
-rwxr-xr-xthird_party/git/t/t7105-reset-patch.sh21
1 files changed, 0 insertions, 21 deletions
diff --git a/third_party/git/t/t7105-reset-patch.sh b/third_party/git/t/t7105-reset-patch.sh
index fc2a6cf5c7..bd10a96727 100755
--- a/third_party/git/t/t7105-reset-patch.sh
+++ b/third_party/git/t/t7105-reset-patch.sh
@@ -38,27 +38,6 @@ test_expect_success PERL 'git reset -p HEAD^' '
 	test_i18ngrep "Apply" output
 '
 
-test_expect_success PERL 'git reset -p HEAD^^{tree}' '
-	test_write_lines n y | git reset -p HEAD^^{tree} >output &&
-	verify_state dir/foo work parent &&
-	verify_saved_state bar &&
-	test_i18ngrep "Apply" output
-'
-
-test_expect_success PERL 'git reset -p HEAD^:dir/foo (blob fails)' '
-	set_and_save_state dir/foo work work &&
-	test_must_fail git reset -p HEAD^:dir/foo &&
-	verify_saved_state dir/foo &&
-	verify_saved_state bar
-'
-
-test_expect_success PERL 'git reset -p aaaaaaaa (unknown fails)' '
-	set_and_save_state dir/foo work work &&
-	test_must_fail git reset -p aaaaaaaa &&
-	verify_saved_state dir/foo &&
-	verify_saved_state bar
-'
-
 # The idea in the rest is that bar sorts first, so we always say 'y'
 # first and if the path limiter fails it'll apply to bar instead of
 # dir/foo.  There's always an extra 'n' to reject edits to dir/foo in