about summary refs log tree commit diff
path: root/third_party/git/help.c
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/help.c
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/help.c')
-rw-r--r--third_party/git/help.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/third_party/git/help.c b/third_party/git/help.c
index cf67624a94bc..5261d83ecf15 100644
--- a/third_party/git/help.c
+++ b/third_party/git/help.c
@@ -34,7 +34,7 @@ static struct category_description main_categories[] = {
 	{ CAT_foreignscminterface, N_("Interacting with Others") },
 	{ CAT_plumbingmanipulators, N_("Low-level Commands / Manipulators") },
 	{ CAT_plumbinginterrogators, N_("Low-level Commands / Interrogators") },
-	{ CAT_synchingrepositories, N_("Low-level Commands / Syncing Repositories") },
+	{ CAT_synchingrepositories, N_("Low-level Commands / Synching Repositories") },
 	{ CAT_purehelpers, N_("Low-level Commands / Internal Helpers") },
 	{ 0, NULL }
 };
@@ -774,8 +774,7 @@ static struct string_list guess_refs(const char *ref)
 	return similar_refs;
 }
 
-NORETURN void help_unknown_ref(const char *ref, const char *cmd,
-			       const char *error)
+void help_unknown_ref(const char *ref, const char *cmd, const char *error)
 {
 	int i;
 	struct string_list suggested_refs = guess_refs(ref);