diff options
author | Vincent Ambo <mail@tazj.in> | 2021-09-21T10·03+0300 |
---|---|---|
committer | Vincent Ambo <mail@tazj.in> | 2021-09-21T11·29+0300 |
commit | 43b1791ec601732ac31195df96781a848360a9ac (patch) | |
tree | daae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/t/t4102-apply-rename.sh | |
parent | 2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (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/t4102-apply-rename.sh')
-rwxr-xr-x | third_party/git/t/t4102-apply-rename.sh | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/third_party/git/t/t4102-apply-rename.sh b/third_party/git/t/t4102-apply-rename.sh deleted file mode 100755 index fae305979a88..000000000000 --- a/third_party/git/t/t4102-apply-rename.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2005 Junio C Hamano -# - -test_description='git apply handling copy/rename patch. - -' -. ./test-lib.sh - -# setup - -cat >test-patch <<\EOF -diff --git a/foo b/bar -similarity index 47% -rename from foo -rename to bar ---- a/foo -+++ b/bar -@@ -1 +1 @@ --This is foo -+This is bar -EOF - -echo 'This is foo' >foo -chmod +x foo - -test_expect_success setup \ - 'git update-index --add foo' - -test_expect_success apply \ - 'git apply --index --stat --summary --apply test-patch' - -test_expect_success FILEMODE validate \ - 'test -f bar && ls -l bar | grep "^-..x......"' - -test_expect_success 'apply reverse' \ - 'git apply -R --index --stat --summary --apply test-patch && - test "$(cat foo)" = "This is foo"' - -cat >test-patch <<\EOF -diff --git a/foo b/bar -similarity index 47% -copy from foo -copy to bar ---- a/foo -+++ b/bar -@@ -1 +1 @@ --This is foo -+This is bar -EOF - -test_expect_success 'apply copy' \ - 'git apply --index --stat --summary --apply test-patch && - test "$(cat bar)" = "This is bar" && test "$(cat foo)" = "This is foo"' - -test_done |