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/t4133-apply-filenames.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/t4133-apply-filenames.sh')
| -rwxr-xr-x | third_party/git/t/t4133-apply-filenames.sh | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/third_party/git/t/t4133-apply-filenames.sh b/third_party/git/t/t4133-apply-filenames.sh deleted file mode 100755 index c5ed3b17c4a1..000000000000 --- a/third_party/git/t/t4133-apply-filenames.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2010 Andreas Gruenbacher -# - -test_description='git apply filename consistency check' - -. ./test-lib.sh - -test_expect_success setup ' - cat > bad1.patch <<EOF && -diff --git a/f b/f -new file mode 100644 -index 0000000..d00491f ---- /dev/null -+++ b/f-blah -@@ -0,0 +1 @@ -+1 -EOF - cat > bad2.patch <<EOF -diff --git a/f b/f -deleted file mode 100644 -index d00491f..0000000 ---- b/f-blah -+++ /dev/null -@@ -1 +0,0 @@ --1 -EOF -' - -test_expect_success 'apply diff with inconsistent filenames in headers' ' - test_must_fail git apply bad1.patch 2>err && - test_i18ngrep "inconsistent new filename" err && - test_must_fail git apply bad2.patch 2>err && - test_i18ngrep "inconsistent old filename" err -' - -test_expect_success 'apply diff with new filename missing from headers' ' - cat >missing_new_filename.diff <<-\EOF && - diff --git a/f b/f - index 0000000..d00491f - --- a/f - @@ -0,0 +1 @@ - +1 - EOF - test_must_fail git apply missing_new_filename.diff 2>err && - test_i18ngrep "lacks filename information" err -' - -test_expect_success 'apply diff with old filename missing from headers' ' - cat >missing_old_filename.diff <<-\EOF && - diff --git a/f b/f - index d00491f..0000000 - +++ b/f - @@ -1 +0,0 @@ - -1 - EOF - test_must_fail git apply missing_old_filename.diff 2>err && - test_i18ngrep "lacks filename information" err -' - -test_done |