about summary refs log tree commit diff
path: root/third_party/git/t/t9106-git-svn-commit-diff-clobber.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/t9106-git-svn-commit-diff-clobber.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/t9106-git-svn-commit-diff-clobber.sh')
-rwxr-xr-xthird_party/git/t/t9106-git-svn-commit-diff-clobber.sh106
1 files changed, 0 insertions, 106 deletions
diff --git a/third_party/git/t/t9106-git-svn-commit-diff-clobber.sh b/third_party/git/t/t9106-git-svn-commit-diff-clobber.sh
deleted file mode 100755
index aec45bca3b7b..000000000000
--- a/third_party/git/t/t9106-git-svn-commit-diff-clobber.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2006 Eric Wong
-test_description='git svn commit-diff clobber'
-. ./lib-git-svn.sh
-
-test_expect_success 'initialize repo' '
-	mkdir import &&
-	(
-		cd import &&
-		echo initial >file &&
-		svn_cmd import -m "initial" . "$svnrepo"
-	) &&
-	echo initial > file &&
-	git update-index --add file &&
-	git commit -a -m "initial"
-	'
-test_expect_success 'commit change from svn side' '
-	svn_cmd co "$svnrepo" t.svn &&
-	(
-		cd t.svn &&
-		echo second line from svn >>file &&
-		poke file &&
-		svn_cmd commit -m "second line from svn"
-	) &&
-	rm -rf t.svn
-	'
-
-test_expect_success 'commit conflicting change from git' '
-	echo second line from git >> file &&
-	git commit -a -m "second line from git" &&
-	test_must_fail git svn commit-diff -r1 HEAD~1 HEAD "$svnrepo"
-'
-
-test_expect_success 'commit complementing change from git' '
-	git reset --hard HEAD~1 &&
-	echo second line from svn >> file &&
-	git commit -a -m "second line from svn" &&
-	echo third line from git >> file &&
-	git commit -a -m "third line from git" &&
-	git svn commit-diff -r2 HEAD~1 HEAD "$svnrepo"
-	'
-
-test_expect_success 'dcommit fails to commit because of conflict' '
-	git svn init "$svnrepo" &&
-	git svn fetch &&
-	git reset --hard refs/remotes/git-svn &&
-	svn_cmd co "$svnrepo" t.svn &&
-	(
-		cd t.svn &&
-		echo fourth line from svn >>file &&
-		poke file &&
-		svn_cmd commit -m "fourth line from svn"
-	) &&
-	rm -rf t.svn &&
-	echo "fourth line from git" >> file &&
-	git commit -a -m "fourth line from git" &&
-	test_must_fail git svn dcommit
-	'
-
-test_expect_success 'dcommit does the svn equivalent of an index merge' "
-	git reset --hard refs/remotes/git-svn &&
-	echo 'index merge' > file2 &&
-	git update-index --add file2 &&
-	git commit -a -m 'index merge' &&
-	echo 'more changes' >> file2 &&
-	git update-index file2 &&
-	git commit -a -m 'more changes' &&
-	git svn dcommit
-	"
-
-test_expect_success 'commit another change from svn side' '
-	svn_cmd co "$svnrepo" t.svn &&
-	(
-		cd t.svn &&
-		echo third line from svn >>file &&
-		poke file &&
-		svn_cmd commit -m "third line from svn"
-	) &&
-	rm -rf t.svn
-	'
-
-test_expect_success 'multiple dcommit from git svn will not clobber svn' "
-	git reset --hard refs/remotes/git-svn &&
-	echo new file >> new-file &&
-	git update-index --add new-file &&
-	git commit -a -m 'new file' &&
-	echo clobber > file &&
-	git commit -a -m 'clobber' &&
-	test_must_fail git svn dcommit
-	"
-
-
-test_expect_success 'check that rebase really failed' '
-	git status >output &&
-	grep currently.rebasing output
-'
-
-test_expect_success 'resolve, continue the rebase and dcommit' "
-	echo clobber and I really mean it > file &&
-	git update-index file &&
-	git rebase --continue &&
-	git svn dcommit
-	"
-
-test_done