diff mbox series

[1/2] git: 2.49.0 -> 2.50.0

Message ID 95cf4a5fd613055b4467df6a4806a4fc3f648279.1751610337.git.liezhi.yang@windriver.com
State New
Headers show
Series [1/2] git: 2.49.0 -> 2.50.0 | expand

Commit Message

Robert Yang July 4, 2025, 6:26 a.m. UTC 
From: Robert Yang <liezhi.yang@windriver.com>

* Rebased fixsort.patch

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 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 mbox series

Patch

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 <<EOF
  	NULL,
+ };
diff --git a/meta/recipes-devtools/git/git_2.49.0.bb b/meta/recipes-devtools/git/git_2.50.0.bb
similarity index 98%
rename from meta/recipes-devtools/git/git_2.49.0.bb
rename to meta/recipes-devtools/git/git_2.50.0.bb
index e1b501d62b..2d28fd05fc 100644
--- a/meta/recipes-devtools/git/git_2.49.0.bb
+++ b/meta/recipes-devtools/git/git_2.50.0.bb
@@ -170,4 +170,4 @@  EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
                  "
 EXTRA_OEMAKE += "NO_GETTEXT=1"
 
-SRC_URI[tarball.sha256sum] = "f8047f572f665bebeb637fd5f14678f31b3ca5d2ff9a18f20bd925bd48f75d3c"
+SRC_URI[tarball.sha256sum] = "920f8ca563d16a7d4fdecb44349cbffbc5cb814a8b36c96028463478197050da"