Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

git: Update to 2.51.0 (#5575)

Browse Source 
git-2.43.0-git-gui.patch: refresh

the two remote scripts were dropped upstream with
https://github.com/git/git/commit/9a5e587d47c8d973d3484
This commit is contained in:
Christoph Reiter 2025-08-19 07:55:56 +02:00 committed by GitHub
parent 3852bfa99e
commit df438d69c8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
git/PKGBUILD
View File

@ -2,7 +2,7 @@
# Maintainer: Ray Donnelly <mingw.android@gmail.com> # Maintainer: Ray Donnelly <mingw.android@gmail.com>
pkgname=git pkgname=git
pkgver=2.50.1 pkgver=2.51.0
pkgrel=1 pkgrel=1
pkgdesc="The fast distributed version control system" pkgdesc="The fast distributed version control system"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
@ -61,13 +61,13 @@ source=("${pkgname}-${pkgver}.tar.gz"::https://github.com/git/git/archive/v${pkg
git-2.8.2-Cygwin-Allow-DOS-paths.patch git-2.8.2-Cygwin-Allow-DOS-paths.patch
git-tcsh-completion-fixes.patch git-tcsh-completion-fixes.patch
git-2.43.0-git-gui.patch) git-2.43.0-git-gui.patch)
sha256sums=('4932f262b88b7f4f8402e331a7ee8d0a98ba350aa2269ce3a00eeda18cb4fe43' sha256sums=('3524fc5fd81f16f80e1696a8281bd8ad831048b67848015d7b7382bf365ae685'
'32baa705d76789d82316a1325e61c9a261114eaa9814dca9c05683bf63069dea' '32baa705d76789d82316a1325e61c9a261114eaa9814dca9c05683bf63069dea'
'9bc4da5022c5004c4c5b45417b25c6636ddf0ac338574a624c2c775d4394546d' '9bc4da5022c5004c4c5b45417b25c6636ddf0ac338574a624c2c775d4394546d'
'336159815092f503e0254ebbbea2b637ffc09a36217c4c644167b86852568272' '336159815092f503e0254ebbbea2b637ffc09a36217c4c644167b86852568272'
'148a2c45de2c8bb2dfffc96bd40523f860a4b13f4e661609636158b7b3bc930b' '148a2c45de2c8bb2dfffc96bd40523f860a4b13f4e661609636158b7b3bc930b'
'6f25aae9e92469d5e284dcf372e15ee0e57ff91531e691e7391f9bfb78f73626' '6f25aae9e92469d5e284dcf372e15ee0e57ff91531e691e7391f9bfb78f73626'
'fa2ef1371c0903e3bcf18458b242192f8d53cf26cfe8d9de89c1d3742b7e1930') '830b72ed3c9f7443c9553cf553ed18c0bc70a07ff0ba32a3606e446f46460be6')
# Helper macros to help make tasks easier # # Helper macros to help make tasks easier #
apply_patch_with_msg() { apply_patch_with_msg() {
@ -156,9 +156,7 @@ package() {
# scripts are for python # scripts are for python
sed -i 's|#![ ]*/usr/bin/env python$|#!/usr/bin/python|' \ sed -i 's|#![ ]*/usr/bin/env python$|#!/usr/bin/python|' \
$(find "${pkgdir}" -name '*.py') \ $(find "${pkgdir}" -name '*.py') \
"${pkgdir}"/usr/lib/git-core/git-p4 \ "${pkgdir}"/usr/lib/git-core/git-p4
"${pkgdir}"/usr/share/git/remote-helpers/git-remote-bzr \
"${pkgdir}"/usr/share/git/remote-helpers/git-remote-hg
# Remove *.orig files # Remove *.orig files
find "${pkgdir}/usr" -type f -name "*.orig" -exec rm -f {} \; find "${pkgdir}/usr" -type f -name "*.orig" -exec rm -f {} \;

34
git/git-2.43.0-git-gui.patch
View File

@ -1,7 +1,7 @@
--- git-2.43.0/git-gui/git-gui.sh.orig 2023-11-20 02:28:15.000000000 +0100 --- git-2.51.0/git-gui/git-gui.sh.orig 2025-08-18 02:18:23.000000000 +0200
+++ git-2.43.0/git-gui/git-gui.sh 2023-11-21 19:47:37.244720600 +0100 +++ git-2.51.0/git-gui/git-gui.sh 2025-08-18 21:04:23.387867700 +0200
@@ -75,6 +75,11 @@ @@ -93,6 +93,11 @@
return $_iscygwin }
} }
+proc is_CygwinGit {} { +proc is_CygwinGit {} {
@ -11,8 +11,8 @@
+ +
###################################################################### ######################################################################
## ##
## PATH lookup ## PATH lookup. Sanitize $PATH, assure exec/open use only that
@@ -177,7 +182,11 @@ @@ -268,7 +273,11 @@
if { [info exists ::env(GIT_GUI_LIB_DIR) ] } { if { [info exists ::env(GIT_GUI_LIB_DIR) ] } {
set oguilib $::env(GIT_GUI_LIB_DIR) set oguilib $::env(GIT_GUI_LIB_DIR)
} else { } else {
@ -25,20 +25,20 @@
} }
set oguirel {@@GITGUI_RELATIVE@@} set oguirel {@@GITGUI_RELATIVE@@}
if {$oguirel eq {1}} { if {$oguirel eq {1}} {
@@ -1285,7 +1294,11 @@ @@ -1183,7 +1192,11 @@
load_config 0
apply_config
# v1.7.0 introduced --show-toplevel to return the canonical work-tree -set _gitworktree [git rev-parse --show-toplevel]
if {[package vcompare $_git_version 1.7.0] >= 0} { +if {[is_Windows] && [is_CygwinGit]} {
- set _gitworktree [git rev-parse --show-toplevel]
+ if {[is_Windows] && [is_CygwinGit]} {
+ set _gitworktree [exec cygpath --windows [git rev-parse --show-toplevel]] + set _gitworktree [exec cygpath --windows [git rev-parse --show-toplevel]]
+ } else { +} else {
+ set _gitworktree [git rev-parse --show-toplevel] + set _gitworktree [git rev-parse --show-toplevel]
+ } +}
} else {
# try to set work tree from environment, core.worktree or use if {$_prefix ne {}} {
# cdup to obtain a relative path to the top of the worktree. If if {$_gitworktree eq {}} {
@@ -2254,7 +2267,11 @@ @@ -2123,7 +2136,11 @@
if {[is_Cygwin]} { if {[is_Cygwin]} {
set explorer "/bin/cygstart.exe --explore" set explorer "/bin/cygstart.exe --explore"
} elseif {[is_Windows]} { } elseif {[is_Windows]} {