about summary refs log tree commit diff
path: root/third_party/git/t/t8009-blame-vs-topicbranches.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/t8009-blame-vs-topicbranches.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/t8009-blame-vs-topicbranches.sh')
-rwxr-xr-xthird_party/git/t/t8009-blame-vs-topicbranches.sh36
1 files changed, 0 insertions, 36 deletions
diff --git a/third_party/git/t/t8009-blame-vs-topicbranches.sh b/third_party/git/t/t8009-blame-vs-topicbranches.sh
deleted file mode 100755
index 72596e38b25f..000000000000
--- a/third_party/git/t/t8009-blame-vs-topicbranches.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-test_description='blaming trough history with topic branches'
-. ./test-lib.sh
-
-# Creates the history shown below. '*'s mark the first parent in the merges.
-# The only line of file.t is changed in commit B2
-#
-#        +---C1
-#       /      \
-# A0--A1--*A2--*A3
-#   \     /
-#    B1-B2
-#
-test_expect_success setup '
-	test_commit A0 file.t line0 &&
-	test_commit A1 &&
-	git reset --hard A0 &&
-	test_commit B1 &&
-	test_commit B2 file.t line0changed &&
-	git reset --hard A1 &&
-	test_merge A2 B2 &&
-	git reset --hard A1 &&
-	test_commit C1 &&
-	git reset --hard A2 &&
-	test_merge A3 C1
-	'
-
-test_expect_success 'blame --reverse --first-parent finds A1' '
-	git blame --porcelain --reverse --first-parent A0..A3 -- file.t >actual_full &&
-	head -n 1 <actual_full | sed -e "s/ .*//" >actual &&
-	git rev-parse A1 >expect &&
-	test_cmp expect actual
-	'
-
-test_done