From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 10 Mar 2026 21:23:23 +0000 (-0700)
Subject: Merge branch 'jh/alias-i18n-fixes'
X-Git-Tag: v2.54.0-rc0~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42afcb954bd4a69deba0a7b9823a9307b4223136;p=thirdparty%2Fgit.git

Merge branch 'jh/alias-i18n-fixes'

Further update to the i18n alias support to avoid regressions.

* jh/alias-i18n-fixes:
  doc: fix list continuation in alias.adoc
  git, help: fix memory leaks in alias listing
  alias: treat empty subsection [alias ""] as plain [alias]
  doc: fix list continuation in alias subsection example
---

42afcb954bd4a69deba0a7b9823a9307b4223136
diff --cc help.c
index 95f576c5c8,725e92a195..3e59d07c37
--- a/help.c
+++ b/help.c
@@@ -422,7 -422,8 +422,7 @@@ void list_cmds_by_config(struct string_
  	if (repo_config_get_string_tmp(the_repository, "completion.commands", &cmd_list))
  		return;
  
- 	string_list_sort_u(list, 0);
 -	string_list_sort(list);
 -	string_list_remove_duplicates(list, 1);
++	string_list_sort_u(list, 1);
  
  	while (*cmd_list) {
  		struct strbuf sb = STRBUF_INIT;