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/t0023-crlf-am.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/t0023-crlf-am.sh')
| -rwxr-xr-x | third_party/git/t/t0023-crlf-am.sh | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/third_party/git/t/t0023-crlf-am.sh b/third_party/git/t/t0023-crlf-am.sh deleted file mode 100755 index f9bbb91f64e3..000000000000 --- a/third_party/git/t/t0023-crlf-am.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh - -test_description='Test am with auto.crlf' - -. ./test-lib.sh - -cat >patchfile <<\EOF -From 38be10072e45dd6b08ce40851e3fca60a31a340b Mon Sep 17 00:00:00 2001 -From: Marius Storm-Olsen <x@y.com> -Date: Thu, 23 Aug 2007 13:00:00 +0200 -Subject: test1 - ---- - foo | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - create mode 100644 foo - -diff --git a/foo b/foo -new file mode 100644 -index 0000000000000000000000000000000000000000..5716ca5987cbf97d6bb54920bea6adde242d87e6 ---- /dev/null -+++ b/foo -@@ -0,0 +1 @@ -+bar -EOF - -test_expect_success 'setup' ' - - git config core.autocrlf true && - echo foo >bar && - git add bar && - test_tick && - git commit -m initial - -' - -test_expect_success 'am' ' - - git am -3 <patchfile && - git diff-files --name-status --exit-code - -' - -test_done |