about summary refs log tree commit diff
path: root/third_party/git/t/t7105-reset-patch.sh
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2021-09-21T10·03+0300
committerVincent Ambo <mail@tazj.in>2021-09-21T11·29+0300
commit43b1791ec601732ac31195df96781a848360a9ac (patch)
treedaae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/t/t7105-reset-patch.sh
parent2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (diff)
chore(3p/git): Unvendor git and track patches instead r/2903
This was vendored a long time ago under the expectation that keeping
it in sync with cgit would be easier this way, but it has proven not
to be a big issue.

On the other hand, a vendored copy of git is an annoying maintenance
burden. It is much easier to rebase the single (dottime) patch that we
have.

This removes the vendored copy of git and instead passes the git
source code to cgit via `pkgs.srcOnly`, which includes the applied
patch so that cgit can continue rendering dottime.

Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b
Diffstat (limited to 'third_party/git/t/t7105-reset-patch.sh')
-rwxr-xr-xthird_party/git/t/t7105-reset-patch.sh92
1 files changed, 0 insertions, 92 deletions
diff --git a/third_party/git/t/t7105-reset-patch.sh b/third_party/git/t/t7105-reset-patch.sh
deleted file mode 100755
index fc2a6cf5c7a4..000000000000
--- a/third_party/git/t/t7105-reset-patch.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-
-test_description='git reset --patch'
-. ./lib-patch-mode.sh
-
-test_expect_success PERL 'setup' '
-	mkdir dir &&
-	echo parent > dir/foo &&
-	echo dummy > bar &&
-	git add dir &&
-	git commit -m initial &&
-	test_tick &&
-	test_commit second dir/foo head &&
-	set_and_save_state bar bar_work bar_index &&
-	save_head
-'
-
-# note: bar sorts before foo, so the first 'n' is always to skip 'bar'
-
-test_expect_success PERL 'saying "n" does nothing' '
-	set_and_save_state dir/foo work work &&
-	test_write_lines n n | git reset -p &&
-	verify_saved_state dir/foo &&
-	verify_saved_state bar
-'
-
-test_expect_success PERL 'git reset -p' '
-	test_write_lines n y | git reset -p >output &&
-	verify_state dir/foo work head &&
-	verify_saved_state bar &&
-	test_i18ngrep "Unstage" output
-'
-
-test_expect_success PERL 'git reset -p HEAD^' '
-	test_write_lines n y | git reset -p HEAD^ >output &&
-	verify_state dir/foo work parent &&
-	verify_saved_state bar &&
-	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
-# the failure case (and thus get out of the loop).
-
-test_expect_success PERL 'git reset -p dir' '
-	set_state dir/foo work work &&
-	test_write_lines y n | git reset -p dir &&
-	verify_state dir/foo work head &&
-	verify_saved_state bar
-'
-
-test_expect_success PERL 'git reset -p -- foo (inside dir)' '
-	set_state dir/foo work work &&
-	test_write_lines y n | (cd dir && git reset -p -- foo) &&
-	verify_state dir/foo work head &&
-	verify_saved_state bar
-'
-
-test_expect_success PERL 'git reset -p HEAD^ -- dir' '
-	test_write_lines y n | git reset -p HEAD^ -- dir &&
-	verify_state dir/foo work parent &&
-	verify_saved_state bar
-'
-
-test_expect_success PERL 'none of this moved HEAD' '
-	verify_saved_head
-'
-
-
-test_done