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/t4013/diff.log_--first-parent_--diff-merges=off_-p_master | |
| 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/t4013/diff.log_--first-parent_--diff-merges=off_-p_master')
| -rw-r--r-- | third_party/git/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master | 78 |
1 files changed, 0 insertions, 78 deletions
diff --git a/third_party/git/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master b/third_party/git/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master deleted file mode 100644 index 5d7461a167ee..000000000000 --- a/third_party/git/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master +++ /dev/null @@ -1,78 +0,0 @@ -$ git log --first-parent --diff-merges=off -p master -commit 80e25ffa65bcdbe82ef654b4d06dbbde7945c37f -Merge: 9a6d494 c7a2ab9 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:04:00 2006 +0000 - - Merge branch 'side' - -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:02:00 2006 +0000 - - Third - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C - -commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:01:00 2006 +0000 - - Second - - This is the second commit. - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 - -commit 444ac553ac7612cc88969031b02b3767fb8a353a -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:00:00 2006 +0000 - - Initial -$ |