From 481b051a2c6a17ad2e191f1ab0f71b976c285ecd Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 3 Jul 2025 23:26:19 -0700 Subject: [PATCH] git: 2.49.0 -> 2.50.0 * Rebased fixsort.patch Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-devtools/git/git/fixsort.patch | 16 ++++++++-------- .../git/{git_2.49.0.bb => git_2.50.0.bb} | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) rename meta/recipes-devtools/git/{git_2.49.0.bb => git_2.50.0.bb} (98%) diff --git a/meta/recipes-devtools/git/git/fixsort.patch b/meta/recipes-devtools/git/git/fixsort.patch index e077eba8ff..7066e1808d 100644 --- a/meta/recipes-devtools/git/git/fixsort.patch +++ b/meta/recipes-devtools/git/git/fixsort.patch @@ -23,15 +23,15 @@ Upstream-Status: Submitted [https://public-inbox.org/git/f029a942dd3d50d85e60bd3 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate-configlist.sh b/generate-configlist.sh -index dffdaad..cc35a21 100755 +index 75c39ad..6d4525e 100755 --- a/generate-configlist.sh +++ b/generate-configlist.sh -@@ -15,7 +15,7 @@ static const char *config_name_list[] = { - EOF - grep -h '^[a-zA-Z].*\..*::$' "$SOURCE_DIR"/Documentation/*config.adoc "$SOURCE_DIR"/Documentation/config/*.adoc | - sed '/deprecated/d; s/::$//; s/, */\n/g' | -- sort | -+ LC_ALL=C sort | - sed 's/^.*$/ "&",/' +@@ -23,7 +23,7 @@ EOF + d' \ + "$SOURCE_DIR"/Documentation/*config.adoc \ + "$SOURCE_DIR"/Documentation/config/*.adoc | +- sort ++ LC_ALL=C sort cat <