Merge branch 'fz/help-doublofix'

gitster · gitster · commit dd37e5607f27 · 2022-09-21T14:23:14.000-07:00
Typofix for topic already in -rc0.

* fz/help-doublofix:
  help: fix doubled words in explanation for developer interfaces
diff --git a/help.c b/help.c
@@ -39,7 +39,7 @@ static struct category_description main_categories[] = {
 	{ CAT_synchingrepositories, N_("Low-level Commands / Syncing Repositories") },
 	{ CAT_purehelpers, N_("Low-level Commands / Internal Helpers") },
 	{ CAT_userinterfaces, N_("User-facing repository, command and file interfaces") },
-	{ CAT_developerinterfaces, N_("Developer-facing file file formats, protocols and interfaces") },
+	{ CAT_developerinterfaces, N_("Developer-facing file formats, protocols and other interfaces") },
 	{ 0, NULL }
 };
 
diff --git a/t/t0012-help.sh b/t/t0012-help.sh
@@ -231,7 +231,7 @@ test_expect_success "'git help -a' section spacing" '
 
 	User-facing repository, command and file interfaces
 
-	Developer-facing file file formats, protocols and interfaces
+	Developer-facing file formats, protocols and other interfaces
 	EOF
 	test_cmp expect actual
 '

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ test_expect_success "'git help -a' section spacing" '`
`231`	`231`
`232`	`232`	`User-facing repository, command and file interfaces`
`233`	`233`
`234`		`- Developer-facing file file formats, protocols and interfaces`
	`234`	`+ Developer-facing file formats, protocols and other interfaces`
`235`	`235`	`EOF`
`236`	`236`	`test_cmp expect actual`
`237`	`237`	`'`