about summary refs log tree commit diff
path: root/third_party/git/t/t4100
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
committerVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
commit93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch)
tree85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/t/t4100
parent6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff)
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable.

This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing
changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/t/t4100')
-rw-r--r--third_party/git/t/t4100/t-apply-1.patch4
-rw-r--r--third_party/git/t/t4100/t-apply-3.patch2
-rw-r--r--third_party/git/t/t4100/t-apply-5.patch4
-rw-r--r--third_party/git/t/t4100/t-apply-7.patch2
4 files changed, 6 insertions, 6 deletions
diff --git a/third_party/git/t/t4100/t-apply-1.patch b/third_party/git/t/t4100/t-apply-1.patch
index 43394f828561..90ab54f0f586 100644
--- a/third_party/git/t/t4100/t-apply-1.patch
+++ b/third_party/git/t/t4100/t-apply-1.patch
@@ -75,8 +75,8 @@ diff --git a/Documentation/git.txt b/Documentation/git.txt
 +link:git-ssh-pull.html[git-ssh-pull]::
  	Pulls from a remote repository over ssh connection
  
- Interrogators:
-@@ -156,8 +156,8 @@ Interrogators:
+ Interogators:
+@@ -156,8 +156,8 @@ Interogators:
  link:git-diff-helper.html[git-diff-helper]::
  	Generates patch format output for git-diff-*
  
diff --git a/third_party/git/t/t4100/t-apply-3.patch b/third_party/git/t/t4100/t-apply-3.patch
index cac172e7791d..90cdbaa5bb62 100644
--- a/third_party/git/t/t4100/t-apply-3.patch
+++ b/third_party/git/t/t4100/t-apply-3.patch
@@ -211,7 +211,7 @@ dissimilarity index 82%
 -
 -		/* If this is an exact directory match, we may have
 -		 * directory files following this path. Match on them.
--		 * Otherwise, we're at a patch subcomponent, and we need
+-		 * Otherwise, we're at a pach subcomponent, and we need
 -		 * to try to match again.
 -		 */
 -		if (mtype == 0)
diff --git a/third_party/git/t/t4100/t-apply-5.patch b/third_party/git/t/t4100/t-apply-5.patch
index 57ec79d8879a..5f6ddc105950 100644
--- a/third_party/git/t/t4100/t-apply-5.patch
+++ b/third_party/git/t/t4100/t-apply-5.patch
@@ -185,8 +185,8 @@ diff a/Documentation/git.txt b/Documentation/git.txt
 +link:git-ssh-pull.html[git-ssh-pull]::
  	Pulls from a remote repository over ssh connection
  
- Interrogators:
-@@ -156,8 +156,8 @@ Interrogators:
+ Interogators:
+@@ -156,8 +156,8 @@ Interogators:
  link:git-diff-helper.html[git-diff-helper]::
  	Generates patch format output for git-diff-*
  
diff --git a/third_party/git/t/t4100/t-apply-7.patch b/third_party/git/t/t4100/t-apply-7.patch
index fa2430510864..07c6589e74fa 100644
--- a/third_party/git/t/t4100/t-apply-7.patch
+++ b/third_party/git/t/t4100/t-apply-7.patch
@@ -335,7 +335,7 @@ diff a/ls-tree.c b/ls-tree.c
  
 -		/* If this is an exact directory match, we may have
 -		 * directory files following this path. Match on them.
--		 * Otherwise, we're at a patch subcomponent, and we need
+-		 * Otherwise, we're at a pach subcomponent, and we need
 -		 * to try to match again.
 +	if (e->directory) {
 +		/* If this is a directory, we have the following cases: