Update to factory version

OBS-URL: https://build.opensuse.org/request/show/1291488
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=325

0001-gitk-Add-a-basic-support-of-SHA256-repositories-into.patch

@@ -1,282 +0,0 @@
-From bf31d29be1c753d1f6c73c3477fb6040ef4341ce Mon Sep 17 00:00:00 2001
-From: Rostislav Krasny <rosti.bsd@gmail.com>
-Date: Mon, 14 Jun 2021 16:18:39 +0000
-Subject: [PATCH 1/2] gitk: Add a basic support of SHA256 repositories into
- Gitk
-
-This PR makes Gitk working on both SHA256 and SHA1 repositories without
-errors/crashes. I made it by changing and testing the gitk script of Git
-for Windows [https://gitforwindows.org/] version 2.32.0.windows.1 that
-is a little bit different than the mainstream 2.32.0 version.
-
-Still not fixed functionality: [1] There is the "Auto-select SHA1
-(length)" configuration preference that affects "Copy commit reference"
-on both SHA1 and SHA256 repositories.
-
-A new "Auto-select SHA256 (length)" configuration preference should be
-added and used on SHA256 repositories instead of the old one. Since I'm
-not familiar with Tcl/Tk and this issue isn't critical I didn't
-implement it.
-
-[ Changes from the original patch:
-  * Discard the changes for generic words (e.g. "Commit ID"), so that
-    translations can be still applied after this patch
-  * Simplify the regexp check in gotocommit as suggested in the
-    previous review
-  -- tiwai ]
-
-Signed-off-by: Rostislav Krasny <rosti.bsd@gmail.com>
-Link: https://patchwork.kernel.org/project/git/patch/pull.979.git.1623687519832.gitgitgadget@gmail.com
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- gitk-git/gitk | 59 +++++++++++++++++++++++++++++++++++++--------------
- 1 file changed, 43 insertions(+), 16 deletions(-)
-
-diff --git a/gitk-git/gitk b/gitk-git/gitk
-index bc9efa18566f..1e85cfef2ee3 100755
---- a/gitk-git/gitk
-+++ b/gitk-git/gitk
-@@ -425,6 +425,7 @@ proc parseviewargs {n arglist} {
- 
- proc parseviewrevs {view revs} {
-     global vposids vnegids
-+    global hashlength
- 
-     if {$revs eq {}} {
-         set revs HEAD
-@@ -438,7 +439,7 @@ proc parseviewrevs {view revs} {
-         set badrev {}
-         for {set l 0} {$l < [llength $errlines]} {incr l} {
-             set line [lindex $errlines $l]
--            if {!([string length $line] == 40 && [string is xdigit $line])} {
-+            if {!([string length $line] == $hashlength && [string is xdigit $line])} {
-                 if {[string match "fatal:*" $line]} {
-                     if {[string match "fatal: ambiguous argument*" $line]
-                         && $badrev ne {}} {
-@@ -655,6 +656,7 @@ proc updatecommits {} {
-     global hasworktree
-     global varcid vposids vnegids vflags vrevs
-     global show_notes
-+    global hashlength
- 
-     set hasworktree [hasworktree]
-     rereadrefs
-@@ -688,7 +690,7 @@ proc updatecommits {} {
-             # take out positive refs that we asked for before or
-             # that we have already seen
-             foreach rev $revs {
--                if {[string length $rev] == 40} {
-+                if {[string length $rev] == $hashlength} {
-                     if {[lsearch -exact $oldpos $rev] < 0
-                         && ![info exists varcid($view,$rev)]} {
-                         lappend newrevs $rev
-@@ -1573,6 +1575,7 @@ proc getcommitlines {fd inst view updating}  {
-     global parents children curview hlview
-     global idpending ordertok
-     global varccommits varcid varctok vtokmod vfilelimit vshortids
-+    global hashlength
- 
-     set stuff [read $fd 500000]
-     # git log doesn't terminate the last commit with a null...
-@@ -1655,7 +1658,7 @@ proc getcommitlines {fd inst view updating}  {
-             }
-             set ok 1
-             foreach id $ids {
--                if {[string length $id] != 40} {
-+                if {[string length $id] != $hashlength} {
-                     set ok 0
-                     break
-                 }
-@@ -1935,6 +1938,7 @@ proc readrefs {} {
-     global selecthead selectheadid
-     global hideremotes
-     global tclencoding
-+    global hashlength
- 
-     foreach v {tagids idtags headids idheads otherrefids idotherrefs} {
-         unset -nocomplain $v
-@@ -1944,9 +1948,9 @@ proc readrefs {} {
-         fconfigure $refd -encoding $tclencoding
-     }
-     while {[gets $refd line] >= 0} {
--        if {[string index $line 40] ne " "} continue
--        set id [string range $line 0 39]
--        set ref [string range $line 41 end]
-+        if {[string index $line $hashlength] ne " "} continue
-+        set id [string range $line 0 [expr {$hashlength - 1}]]
-+        set ref [string range $line [expr {$hashlength + 1}] end]
-         if {![string match "refs/*" $ref]} continue
-         set name [string range $ref 5 end]
-         if {[string match "remotes/*" $name]} {
-@@ -2241,6 +2245,7 @@ proc makewindow {} {
-     global have_tk85 have_tk86 use_ttk NS
-     global git_version
-     global worddiff
-+    global hashlength
- 
-     # The "mc" arguments here are purely so that xgettext
-     # sees the following string as needing to be translated
-@@ -2366,7 +2371,7 @@ proc makewindow {} {
-         -command gotocommit -width 8
-     $sha1but conf -disabledforeground [$sha1but cget -foreground]
-     pack .tf.bar.sha1label -side left
--    ${NS}::entry $sha1entry -width 40 -font textfont -textvariable sha1string
-+    ${NS}::entry $sha1entry -width $hashlength -font textfont -textvariable sha1string
-     trace add variable sha1string write sha1change
-     pack $sha1entry -side left -pady 2
- 
-@@ -4093,6 +4098,7 @@ proc stopblaming {} {
- 
- proc read_line_source {fd inst} {
-     global blamestuff curview commfd blameinst nullid nullid2
-+    global hashlength
- 
-     while {[gets $fd line] >= 0} {
-         lappend blamestuff($inst) $line
-@@ -4113,7 +4119,7 @@ proc read_line_source {fd inst} {
-     set line [split [lindex $blamestuff($inst) 0] " "]
-     set id [lindex $line 0]
-     set lnum [lindex $line 1]
--    if {[string length $id] == 40 && [string is xdigit $id] &&
-+    if {[string length $id] == $hashlength && [string is xdigit $id] &&
-         [string is digit -strict $lnum]} {
-         # look for "filename" line
-         foreach l $blamestuff($inst) {
-@@ -5436,13 +5442,14 @@ proc get_viewmainhead {view} {
- # git rev-list should give us just 1 line to use as viewmainheadid($view)
- proc getviewhead {fd inst view} {
-     global viewmainheadid commfd curview viewinstances showlocalchanges
-+    global hashlength
- 
-     set id {}
-     if {[gets $fd line] < 0} {
-         if {![eof $fd]} {
-             return 1
-         }
--    } elseif {[string length $line] == 40 && [string is xdigit $line]} {
-+    } elseif {[string length $line] == $hashlength && [string is xdigit $line]} {
-         set id $line
-     }
-     set viewmainheadid($view) $id
-@@ -7206,10 +7213,11 @@ proc commit_descriptor {p} {
- # Also look for URLs of the form "http[s]://..." and make them web links.
- proc appendwithlinks {text tags} {
-     global ctext linknum curview
-+    global hashlength
- 
-     set start [$ctext index "end - 1c"]
-     $ctext insert end $text $tags
--    set links [regexp -indices -all -inline {(?:\m|-g)[0-9a-f]{6,40}\M} $text]
-+    set links [regexp -indices -all -inline [string map "@@ $hashlength" {(?:\m|-g)[0-9a-f]{6,@@}\M}] $text]
-     foreach l $links {
-         set s [lindex $l 0]
-         set e [lindex $l 1]
-@@ -8888,13 +8896,16 @@ proc incrfont {inc} {
- 
- proc clearsha1 {} {
-     global sha1entry sha1string
--    if {[string length $sha1string] == 40} {
-+    global hashlength
-+
-+    if {[string length $sha1string] == $hashlength} {
-         $sha1entry delete 0 end
-     }
- }
- 
- proc sha1change {n1 n2 op} {
-     global sha1string currentid sha1but
-+
-     if {$sha1string == {}
-         || ([info exists currentid] && $sha1string == $currentid)} {
-         set state disabled
-@@ -8911,6 +8922,7 @@ proc sha1change {n1 n2 op} {
- 
- proc gotocommit {} {
-     global sha1string tagids headids curview varcid
-+    global hashlength
- 
-     if {$sha1string == {}
-         || ([info exists currentid] && $sha1string == $currentid)} return
-@@ -8920,11 +8932,11 @@ proc gotocommit {} {
-         set id $headids($sha1string)
-     } else {
-         set id [string tolower $sha1string]
--        if {[regexp {^[0-9a-f]{4,39}$} $id]} {
-+	if {[regexp {^[0-9a-f]{4,63}$} $id]} {
-             set matches [longid $id]
-             if {$matches ne {}} {
-                 if {[llength $matches] > 1} {
--                    error_popup [mc "Short commit ID %s is ambiguous" $id]
-+                    error_popup [mc "Short commit id %s is ambiguous" $id]
-                     return
-                 }
-                 set id [lindex $matches 0]
-@@ -9618,10 +9630,11 @@ proc mktaggo {} {
- 
- proc copyreference {} {
-     global rowmenuid autosellen
-+    global hashlength
- 
-     set format "%h (\"%s\", %ad)"
-     set cmd [list git show -s --pretty=format:$format --date=short]
--    if {$autosellen < 40} {
-+    if {$autosellen < $hashlength} {
-         lappend cmd --abbrev=$autosellen
-     }
-     set reference [eval exec $cmd $rowmenuid]
-@@ -9632,6 +9645,7 @@ proc copyreference {} {
- 
- proc writecommit {} {
-     global rowmenuid wrcomtop commitinfo wrcomcmd NS
-+    global hashlength
- 
-     set top .writecommit
-     set wrcomtop $top
-@@ -9641,7 +9655,7 @@ proc writecommit {} {
-     ${NS}::label $top.title -text [mc "Write commit to file"]
-     grid $top.title - -pady 10
-     ${NS}::label $top.id -text [mc "ID:"]
--    ${NS}::entry $top.sha1 -width 40
-+    ${NS}::entry $top.sha1 -width $hashlength
-     $top.sha1 insert 0 $rowmenuid
-     $top.sha1 conf -state readonly
-     grid $top.id $top.sha1 -sticky w
-@@ -9721,6 +9735,7 @@ proc mvbranch {} {
- 
- proc branchdia {top valvar uivar} {
-     global NS commitinfo
-+    global hashlength
-     upvar $valvar val $uivar ui
- 
-     catch {destroy $top}
-@@ -9729,7 +9744,7 @@ proc branchdia {top valvar uivar} {
-     ${NS}::label $top.title -text $ui(title)
-     grid $top.title - -pady 10
-     ${NS}::label $top.id -text [mc "ID:"]
--    ${NS}::entry $top.sha1 -width 40
-+    ${NS}::entry $top.sha1 -width $hashlength
-     $top.sha1 insert 0 $val(id)
-     $top.sha1 conf -state readonly
-     grid $top.id $top.sha1 -sticky w
-@@ -12524,6 +12539,18 @@ if {$tclencoding == {}} {
-     puts stderr "Warning: encoding $gitencoding is not supported by Tcl/Tk"
- }
- 
-+set objformat [exec git rev-parse --show-object-format]
-+if {$objformat eq "sha1"} {
-+    set hashlength 40
-+} elseif {$objformat eq "sha256"} {
-+    set hashlength 64
-+} else {
-+    error_popup "[mc "Not supported hash algorithm:"] {$objformat}"
-+    exit 1
-+}
-+set hashalgorithm [string toupper $objformat]
-+unset objformat
-+
- set gui_encoding [encoding system]
- catch {
-     set enc [exec git config --get gui.encoding]
--- 
-2.49.0
-

0001-gitk-Add-support-of-SHA256-repo.patch

@@ -1,399 +0,0 @@
-From: Takashi Iwai <tiwai@suse.de>
-Subject: [PATCH v2] gitk: Add support of SHA256 repo
-Date: Tue, 17 Jun 2025 07:59:54 +0200
-Message-ID: <20250617055957.9794-1-tiwai@suse.de>
-
-This patch adds a basic support of SHA256 Git repository to Gitk, so
-that Gitk can show and operate on both SHA1 and SHA256 repos
-gracefully.  Since SHA256 has a longer ID length (64 char) than SHA1
-(40 char), many field widths are adjusted to fit with it.
-
-A caveat is that the configuration of auto selection length is shared
-between SHA1 and SHA256 repos.  That is, once when this value is saved
-and read, it's applied to both repo types, which may result in shorter
-selection than the full SHA256 ID.  We may introduce another
-individual config for sha256 (actually I did write in the first
-version), but for simplicity, the common config is used as of writing
-this.
-
-Many lines still refer "sha1" although they may point to both SHA1 and
-SHA256.  They are left untouched for making the changes simpler.
-
-This patch is based on the early work by Rostislav Krasny:
-  https://patchwork.kernel.org/project/git/patch/pull.979.git.1623687519832.gitgitgadget@gmail.com
-I refreshed, revised and extended to the latest state.
-
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
-
-v1: https://lore.kernel.org/20250320154136.23262-1-tiwai@suse.de
-v1->v2:
-- Fix other procs using fixed 40 length
-- Don't use tabs
-- Drop autosellensha256 config
-- Some code simplification
-- Fix patch description
-
- gitk-git/gitk | 83 +++++++++++++++++++++++++++++++++++----------------
- 1 file changed, 58 insertions(+), 25 deletions(-)
-
-Index: git/gitk-git/gitk
-===================================================================
---- git.orig/gitk-git/gitk
-+++ git/gitk-git/gitk
-@@ -479,6 +479,7 @@ proc parseviewargs {n arglist} {
- 
- proc parseviewrevs {view revs} {
-     global vposids vnegids
-+    global hashlength
- 
-     if {$revs eq {}} {
-         set revs HEAD
-@@ -492,7 +493,7 @@ proc parseviewrevs {view revs} {
-         set badrev {}
-         for {set l 0} {$l < [llength $errlines]} {incr l} {
-             set line [lindex $errlines $l]
--            if {!([string length $line] == 40 && [string is xdigit $line])} {
-+            if {!([string length $line] == $hashlength && [string is xdigit $line])} {
-                 if {[string match "fatal:*" $line]} {
-                     if {[string match "fatal: ambiguous argument*" $line]
-                         && $badrev ne {}} {
-@@ -698,6 +699,7 @@ proc updatecommits {} {
-     global hasworktree
-     global varcid vposids vnegids vflags vrevs
-     global show_notes
-+    global hashlength
- 
-     set hasworktree [hasworktree]
-     rereadrefs
-@@ -731,7 +733,7 @@ proc updatecommits {} {
-             # take out positive refs that we asked for before or
-             # that we have already seen
-             foreach rev $revs {
--                if {[string length $rev] == 40} {
-+                if {[string length $rev] == $hashlength} {
-                     if {[lsearch -exact $oldpos $rev] < 0
-                         && ![info exists varcid($view,$rev)]} {
-                         lappend newrevs $rev
-@@ -1614,6 +1616,7 @@ proc getcommitlines {fd inst view updati
-     global parents children curview hlview
-     global idpending ordertok
-     global varccommits varcid varctok vtokmod vfilelimit vshortids
-+    global hashlength
- 
-     set stuff [read $fd 500000]
-     # git log doesn't terminate the last commit with a null...
-@@ -1696,7 +1699,7 @@ proc getcommitlines {fd inst view updati
-             }
-             set ok 1
-             foreach id $ids {
--                if {[string length $id] != 40} {
-+                if {[string length $id] != $hashlength} {
-                     set ok 0
-                     break
-                 }
-@@ -1942,8 +1945,8 @@ proc getcommit {id} {
-     return 1
- }
- 
--# Expand an abbreviated commit ID to a list of full 40-char IDs that match
--# and are present in the current view.
-+# Expand an abbreviated commit ID to a list of full 40-char (or 64-char
-+# for SHA256 repo) IDs that match and are present in the current view.
- # This is fairly slow...
- proc longid {prefix} {
-     global varcid curview vshortids
-@@ -1976,6 +1979,7 @@ proc readrefs {} {
-     global selecthead selectheadid
-     global hideremotes
-     global tclencoding
-+    global hashlength
- 
-     foreach v {tagids idtags headids idheads otherrefids idotherrefs} {
-         unset -nocomplain $v
-@@ -1985,9 +1989,9 @@ proc readrefs {} {
-         fconfigure $refd -encoding $tclencoding
-     }
-     while {[gets $refd line] >= 0} {
--        if {[string index $line 40] ne " "} continue
--        set id [string range $line 0 39]
--        set ref [string range $line 41 end]
-+        if {[string index $line $hashlength] ne " "} continue
-+        set id [string range $line 0 [expr {$hashlength - 1}]]
-+        set ref [string range $line [expr {$hashlength + 1}] end]
-         if {![string match "refs/*" $ref]} continue
-         set name [string range $ref 5 end]
-         if {[string match "remotes/*" $name]} {
-@@ -2282,6 +2286,7 @@ proc makewindow {} {
-     global have_tk85 have_tk86 use_ttk NS
-     global git_version
-     global worddiff
-+    global hashlength
- 
-     # The "mc" arguments here are purely so that xgettext
-     # sees the following string as needing to be translated
-@@ -2407,7 +2412,7 @@ proc makewindow {} {
-         -command gotocommit -width 8
-     $sha1but conf -disabledforeground [$sha1but cget -foreground]
-     pack .tf.bar.sha1label -side left
--    ${NS}::entry $sha1entry -width 40 -font textfont -textvariable sha1string
-+    ${NS}::entry $sha1entry -width $hashlength -font textfont -textvariable sha1string
-     trace add variable sha1string write sha1change
-     pack $sha1entry -side left -pady 2
- 
-@@ -4132,6 +4137,7 @@ proc stopblaming {} {
- 
- proc read_line_source {fd inst} {
-     global blamestuff curview commfd blameinst nullid nullid2
-+    global hashlength
- 
-     while {[gets $fd line] >= 0} {
-         lappend blamestuff($inst) $line
-@@ -4152,7 +4158,7 @@ proc read_line_source {fd inst} {
-     set line [split [lindex $blamestuff($inst) 0] " "]
-     set id [lindex $line 0]
-     set lnum [lindex $line 1]
--    if {[string length $id] == 40 && [string is xdigit $id] &&
-+    if {[string length $id] == $hashlength && [string is xdigit $id] &&
-         [string is digit -strict $lnum]} {
-         # look for "filename" line
-         foreach l $blamestuff($inst) {
-@@ -5296,11 +5302,13 @@ proc askrelhighlight {row id} {
- # Graph layout functions
- 
- proc shortids {ids} {
-+    global hashlength
-+
-     set res {}
-     foreach id $ids {
-         if {[llength $id] > 1} {
-             lappend res [shortids $id]
--        } elseif {[regexp {^[0-9a-f]{40}$} $id]} {
-+        } elseif {[regexp [string map "@@ $hashlength" {^[0-9a-f]{@@}$}] $id]} {
-             lappend res [string range $id 0 7]
-         } else {
-             lappend res $id
-@@ -5475,13 +5483,14 @@ proc get_viewmainhead {view} {
- # git rev-list should give us just 1 line to use as viewmainheadid($view)
- proc getviewhead {fd inst view} {
-     global viewmainheadid commfd curview viewinstances showlocalchanges
-+    global hashlength
- 
-     set id {}
-     if {[gets $fd line] < 0} {
-         if {![eof $fd]} {
-             return 1
-         }
--    } elseif {[string length $line] == 40 && [string is xdigit $line]} {
-+    } elseif {[string length $line] == $hashlength && [string is xdigit $line]} {
-         set id $line
-     }
-     set viewmainheadid($view) $id
-@@ -7245,10 +7254,11 @@ proc commit_descriptor {p} {
- # Also look for URLs of the form "http[s]://..." and make them web links.
- proc appendwithlinks {text tags} {
-     global ctext linknum curview
-+    global hashlength
- 
-     set start [$ctext index "end - 1c"]
-     $ctext insert end $text $tags
--    set links [regexp -indices -all -inline {(?:\m|-g)[0-9a-f]{6,40}\M} $text]
-+    set links [regexp -indices -all -inline [string map "@@ $hashlength" {(?:\m|-g)[0-9a-f]{6,@@}\M}] $text]
-     foreach l $links {
-         set s [lindex $l 0]
-         set e [lindex $l 1]
-@@ -7276,13 +7286,14 @@ proc appendwithlinks {text tags} {
- proc setlink {id lk} {
-     global curview ctext pendinglinks
-     global linkfgcolor
-+    global hashlength
- 
-     if {[string range $id 0 1] eq "-g"} {
-       set id [string range $id 2 end]
-     }
- 
-     set known 0
--    if {[string length $id] < 40} {
-+    if {[string length $id] < $hashlength} {
-         set matches [longid $id]
-         if {[llength $matches] > 0} {
-             if {[llength $matches] > 1} return
-@@ -8927,13 +8938,16 @@ proc incrfont {inc} {
- 
- proc clearsha1 {} {
-     global sha1entry sha1string
--    if {[string length $sha1string] == 40} {
-+    global hashlength
-+
-+    if {[string length $sha1string] == $hashlength} {
-         $sha1entry delete 0 end
-     }
- }
- 
- proc sha1change {n1 n2 op} {
-     global sha1string currentid sha1but
-+
-     if {$sha1string == {}
-         || ([info exists currentid] && $sha1string == $currentid)} {
-         set state disabled
-@@ -8950,6 +8964,7 @@ proc sha1change {n1 n2 op} {
- 
- proc gotocommit {} {
-     global sha1string tagids headids curview varcid
-+    global hashlength
- 
-     if {$sha1string == {}
-         || ([info exists currentid] && $sha1string == $currentid)} return
-@@ -8959,7 +8974,7 @@ proc gotocommit {} {
-         set id $headids($sha1string)
-     } else {
-         set id [string tolower $sha1string]
--        if {[regexp {^[0-9a-f]{4,39}$} $id]} {
-+        if {[regexp {^[0-9a-f]{4,63}$} $id]} {
-             set matches [longid $id]
-             if {$matches ne {}} {
-                 if {[llength $matches] > 1} {
-@@ -9446,6 +9461,7 @@ proc doseldiff {oldid newid} {
- 
- proc mkpatch {} {
-     global rowmenuid currentid commitinfo patchtop patchnum NS
-+    global hashlength
- 
-     if {![info exists currentid]} return
-     set oldid $currentid
-@@ -9460,7 +9476,7 @@ proc mkpatch {} {
-     ${NS}::label $top.title -text [mc "Generate patch"]
-     grid $top.title - -pady 10
-     ${NS}::label $top.from -text [mc "From:"]
--    ${NS}::entry $top.fromsha1 -width 40
-+    ${NS}::entry $top.fromsha1 -width $hashlength
-     $top.fromsha1 insert 0 $oldid
-     $top.fromsha1 conf -state readonly
-     grid $top.from $top.fromsha1 -sticky w
-@@ -9469,7 +9485,7 @@ proc mkpatch {} {
-     $top.fromhead conf -state readonly
-     grid x $top.fromhead -sticky w
-     ${NS}::label $top.to -text [mc "To:"]
--    ${NS}::entry $top.tosha1 -width 40
-+    ${NS}::entry $top.tosha1 -width $hashlength
-     $top.tosha1 insert 0 $newid
-     $top.tosha1 conf -state readonly
-     grid $top.to $top.tosha1 -sticky w
-@@ -9535,6 +9551,7 @@ proc mkpatchcan {} {
- 
- proc mktag {} {
-     global rowmenuid mktagtop commitinfo NS
-+    global hashlength
- 
-     set top .maketag
-     set mktagtop $top
-@@ -9544,7 +9561,7 @@ proc mktag {} {
-     ${NS}::label $top.title -text [mc "Create tag"]
-     grid $top.title - -pady 10
-     ${NS}::label $top.id -text [mc "ID:"]
--    ${NS}::entry $top.sha1 -width 40
-+    ${NS}::entry $top.sha1 -width $hashlength
-     $top.sha1 insert 0 $rowmenuid
-     $top.sha1 conf -state readonly
-     grid $top.id $top.sha1 -sticky w
-@@ -9652,10 +9669,11 @@ proc mktaggo {} {
- 
- proc copyreference {} {
-     global rowmenuid autosellen
-+    global hashlength
- 
-     set format "%h (\"%s\", %ad)"
-     set cmd [list git show -s --pretty=format:$format --date=short]
--    if {$autosellen < 40} {
-+    if {$autosellen < $hashlength} {
-         lappend cmd --abbrev=$autosellen
-     }
-     set reference [safe_exec [concat $cmd $rowmenuid]]
-@@ -9666,6 +9684,7 @@ proc copyreference {} {
- 
- proc writecommit {} {
-     global rowmenuid wrcomtop commitinfo wrcomcmd NS
-+    global hashlength
- 
-     set top .writecommit
-     set wrcomtop $top
-@@ -9675,7 +9694,7 @@ proc writecommit {} {
-     ${NS}::label $top.title -text [mc "Write commit to file"]
-     grid $top.title - -pady 10
-     ${NS}::label $top.id -text [mc "ID:"]
--    ${NS}::entry $top.sha1 -width 40
-+    ${NS}::entry $top.sha1 -width $hashlength
-     $top.sha1 insert 0 $rowmenuid
-     $top.sha1 conf -state readonly
-     grid $top.id $top.sha1 -sticky w
-@@ -9755,6 +9774,7 @@ proc mvbranch {} {
- 
- proc branchdia {top valvar uivar} {
-     global NS commitinfo
-+    global hashlength
-     upvar $valvar val $uivar ui
- 
-     catch {destroy $top}
-@@ -9763,7 +9783,7 @@ proc branchdia {top valvar uivar} {
-     ${NS}::label $top.title -text $ui(title)
-     grid $top.title - -pady 10
-     ${NS}::label $top.id -text [mc "ID:"]
--    ${NS}::entry $top.sha1 -width 40
-+    ${NS}::entry $top.sha1 -width $hashlength
-     $top.sha1 insert 0 $val(id)
-     $top.sha1 conf -state readonly
-     grid $top.id $top.sha1 -sticky w
-@@ -9773,7 +9793,7 @@ proc branchdia {top valvar uivar} {
-     grid x $top.head -sticky ew
-     grid columnconfigure $top 1 -weight 1
-     ${NS}::label $top.nlab -text [mc "Name:"]
--    ${NS}::entry $top.name -width 40
-+    ${NS}::entry $top.name -width $hashlength
-     $top.name insert 0 $val(name)
-     grid $top.nlab $top.name -sticky w
-     ${NS}::frame $top.buts
-@@ -11762,6 +11782,7 @@ proc prefspage_general {notebook} {
-     global tabstop wrapcomment wrapdefault limitdiffs
-     global autocopy autoselect autosellen extdifftool perfile_attrs
-     global hideremotes want_ttk have_ttk maxrefs web_browser
-+    global hashlength
- 
-     set page [create_prefs_page $notebook.general]
- 
-@@ -11790,7 +11811,8 @@ proc prefspage_general {notebook} {
-             -variable autoselect
-         grid x $page.autoselect -sticky w
-     }
--    spinbox $page.autosellen -from 1 -to 40 -width 4 -textvariable autosellen
-+
-+    spinbox $page.autosellen -from 1 -to $hashlength -width 4 -textvariable autosellen
-     ${NS}::label $page.autosellenl -text [mc "Length of commit ID to copy"]
-     grid x $page.autosellenl $page.autosellen -sticky w
- 
-@@ -12556,6 +12578,17 @@ if {$tclencoding == {}} {
-     puts stderr "Warning: encoding $gitencoding is not supported by Tcl/Tk"
- }
- 
-+# Use object format as hash algorightm (either "sha1" or "sha256")
-+set hashalgorithm [exec git rev-parse --show-object-format]
-+if {$hashalgorithm eq "sha1"} {
-+    set hashlength 40
-+} elseif {$hashalgorithm eq "sha256"} {
-+    set hashlength 64
-+} else {
-+    puts stderr "Unknown hash algorithm: $hashalgorithm"
-+    exit 1
-+}
-+
- set gui_encoding [encoding system]
- catch {
-     set enc [exec git config --get gui.encoding]
-@@ -12610,7 +12643,7 @@ set limitdiffs 1
- set datetimeformat "%Y-%m-%d %H:%M:%S"
- set autocopy 0
- set autoselect 1
--set autosellen 40
-+set autosellen $hashlength
- set perfile_attrs 0
- set want_ttk 1
- 

0002-git-gui-Add-support-of-SHA256-repo.patch

@@ -1,197 +0,0 @@
-From 36516ccae8af702640d900067998f4c7310d5b05 Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Fri, 13 Jun 2025 17:36:34 +0200
-Subject: [PATCH] git-gui: Add support of SHA256 repo
-
-This patch adds the basic support of SHA256 Git repositories.
-The needed changes were mostly about adjusting the fixed ID length of
-SHA1 (40) to be variable depending on the repo type.
-
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- git-gui/git-gui.sh                   | 13 ++++++++++++-
- git-gui/lib/blame.tcl                | 12 ++++++++----
- git-gui/lib/choose_repository.tcl    |  8 ++++++--
- git-gui/lib/commit.tcl               |  3 ++-
- git-gui/lib/remote_branch_delete.tcl |  4 +++-
- 5 files changed, 31 insertions(+), 9 deletions(-)
-
-Index: git/git-gui/git-gui.sh
-===================================================================
---- git.orig/git-gui/git-gui.sh
-+++ git/git-gui/git-gui.sh
-@@ -1298,6 +1298,17 @@ if {[catch {
- 	set picked 1
- }
- 
-+# Use object format as hash algorightm (either "sha1" or "sha256")
-+set hashalgorithm [exec git rev-parse --show-object-format]
-+if {$hashalgorithm eq "sha1"} {
-+	set hashlength 40
-+} elseif {$hashalgorithm eq "sha256"} {
-+	set hashlength 64
-+} else {
-+	puts stderr "Unknown hash algorithm: $hashalgorithm"
-+	exit 1
-+}
-+
- # we expand the _gitdir when it's just a single dot (i.e. when we're being
- # run from the .git dir itself) lest the routines to find the worktree
- # get confused
-@@ -1845,7 +1856,7 @@ proc short_path {path} {
- }
- 
- set next_icon_id 0
--set null_sha1 [string repeat 0 40]
-+set null_sha1 [string repeat 0 $hashlength]
- 
- proc merge_state {path new_state {head_info {}} {index_info {}}} {
- 	global file_states next_icon_id null_sha1
-Index: git/git-gui/lib/blame.tcl
-===================================================================
---- git.orig/git-gui/lib/blame.tcl
-+++ git/git-gui/lib/blame.tcl
-@@ -426,6 +426,7 @@ method _kill {} {
- 
- method _load {jump} {
- 	variable group_colors
-+	global hashlength
- 
- 	_hide_tooltip $this
- 
-@@ -436,7 +437,7 @@ method _load {jump} {
- 			$i conf -state normal
- 			$i delete 0.0 end
- 			foreach g [$i tag names] {
--				if {[regexp {^g[0-9a-f]{40}$} $g]} {
-+				if {[regexp [string map "@@ $hashlength" {^g[0-9a-f]{@@}$}] $g]} {
- 					$i tag delete $g
- 				}
- 			}
-@@ -500,6 +501,8 @@ method _load {jump} {
- }
- 
- method _history_menu {} {
-+	global hashlength
-+
- 	set m $w.backmenu
- 	if {[winfo exists $m]} {
- 		$m delete 0 end
-@@ -513,7 +516,7 @@ method _history_menu {} {
- 		set c [lindex $e 0]
- 		set f [lindex $e 1]
- 
--		if {[regexp {^[0-9a-f]{40}$} $c]} {
-+		if {[regexp [string map "@@ $hashlength" {^[0-9a-f]{@@}$}] $c]} {
- 			set t [string range $c 0 8]...
- 		} elseif {$c eq {}} {
- 			set t {Working Directory}
-@@ -627,6 +630,7 @@ method _exec_blame {cur_w cur_d options
- method _read_blame {fd cur_w cur_d} {
- 	upvar #0 $cur_d line_data
- 	variable group_colors
-+	global hashlength
- 
- 	if {$fd ne $current_fd} {
- 		catch {close $fd}
-@@ -635,7 +639,7 @@ method _read_blame {fd cur_w cur_d} {
- 
- 	$cur_w conf -state normal
- 	while {[gets $fd line] >= 0} {
--		if {[regexp {^([a-z0-9]{40}) (\d+) (\d+) (\d+)$} $line line \
-+		if {[regexp [string map "@@ $hashlength" {^([a-z0-9]{@@}) (\d+) (\d+) (\d+)$}] $line line \
- 			cmit original_line final_line line_count]} {
- 			set r_commit     $cmit
- 			set r_orig_line  $original_line
-@@ -648,7 +652,7 @@ method _read_blame {fd cur_w cur_d} {
- 			set oln  $r_orig_line
- 			set cmit $r_commit
- 
--			if {[regexp {^0{40}$} $cmit]} {
-+			if {[regexp [string map "@@ $hashlength" {^0{@@}$}] $cmit]} {
- 				set commit_abbr work
- 				set commit_type curr_commit
- 			} elseif {$cmit eq $commit} {
-Index: git/git-gui/lib/choose_repository.tcl
-===================================================================
---- git.orig/git-gui/lib/choose_repository.tcl
-+++ git/git-gui/lib/choose_repository.tcl
-@@ -870,6 +870,8 @@ method _do_clone_HEAD {ok} {
- }
- 
- method _do_clone_full_end {ok} {
-+	global hashlength
-+
- 	$o_cons done $ok
- 
- 	if {$ok} {
-@@ -879,7 +881,7 @@ method _do_clone_full_end {ok} {
- 		if {[file exists [gitdir FETCH_HEAD]]} {
- 			set fd [safe_open_file [gitdir FETCH_HEAD] r]
- 			while {[gets $fd line] >= 0} {
--				if {[regexp "^(.{40})\t\t" $line line HEAD]} {
-+				if {[regexp [string map "@@ $hashlength" "^(.{@@})\t\t"] $line line HEAD]} {
- 					break
- 				}
- 			}
-@@ -966,6 +968,8 @@ method _do_clone_checkout {HEAD} {
- }
- 
- method _readtree_wait {fd} {
-+	global hashlength
-+
- 	set buf [read $fd]
- 	$o_status_op update_meter $buf
- 	append readtree_err $buf
-@@ -987,7 +991,7 @@ method _readtree_wait {fd} {
- 
- 	# -- Run the post-checkout hook.
- 	#
--	set fd_ph [githook_read post-checkout [string repeat 0 40] \
-+	set fd_ph [githook_read post-checkout [string repeat 0 $hashlength] \
- 		[git rev-parse HEAD] 1]
- 	if {$fd_ph ne {}} {
- 		global pch_error
-Index: git/git-gui/lib/commit.tcl
-===================================================================
---- git.orig/git-gui/lib/commit.tcl
-+++ git/git-gui/lib/commit.tcl
-@@ -348,6 +348,7 @@ proc commit_committree {fd_wt curHEAD ms
- 	global file_states selected_paths rescan_active
- 	global repo_config
- 	global env
-+	global hashlength
- 
- 	gets $fd_wt tree_id
- 	if {[catch {close $fd_wt} err]} {
-@@ -367,7 +368,7 @@ proc commit_committree {fd_wt curHEAD ms
- 		close $fd_ot
- 
- 		if {[string equal -length 5 {tree } $old_tree]
--			&& [string length $old_tree] == 45} {
-+			&& [string length $old_tree] == [expr {$hashlength + 5}]} {
- 			set old_tree [string range $old_tree 5 end]
- 		} else {
- 			error [mc "Commit %s appears to be corrupt" $PARENT]
-Index: git/git-gui/lib/remote_branch_delete.tcl
-===================================================================
---- git.orig/git-gui/lib/remote_branch_delete.tcl
-+++ git/git-gui/lib/remote_branch_delete.tcl
-@@ -323,6 +323,8 @@ method _load {cache uri} {
- }
- 
- method _read {cache fd} {
-+	global hashlength
-+
- 	if {$fd ne $active_ls} {
- 		catch {close $fd}
- 		return
-@@ -330,7 +332,7 @@ method _read {cache fd} {
- 
- 	while {[gets $fd line] >= 0} {
- 		if {[string match {*^{}} $line]} continue
--		if {[regexp {^([0-9a-f]{40})	(.*)$} $line _junk obj ref]} {
-+		if {[regexp [string map "@@ $hashlength" {^([0-9a-f]{@@})	(.*)$}] $line _junk obj ref]} {
- 			if {[regsub ^refs/heads/ $ref {} abr]} {
- 				lappend head_list $abr
- 				lappend head_cache($cache) $abr

0002-gitk-Add-auto-select-length-preference-for-SHA256.patch

@@ -1,134 +0,0 @@
-From 0c251d64abf2eb7b275554b3fc6784e87f07cfbe Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Wed, 19 Mar 2025 11:18:21 +0100
-Subject: [PATCH 2/2] gitk: Add auto-select length preference for SHA256
-
-This implements the missing preference setup of the auto select length
-for SHA256. The variable set via the preference menu is switched
-depending on the hash algorithm.
-
-The default auto-select length is set to 64 for SHA256, and
-saved/restored as "autosellensha256" in the config.
-
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- gitk-git/gitk | 39 +++++++++++++++++++++++++++++----------
- 1 file changed, 29 insertions(+), 10 deletions(-)
-
-diff --git a/gitk-git/gitk b/gitk-git/gitk
-index 1e85cfef2ee3..b364d9e7dc93 100755
---- a/gitk-git/gitk
-+++ b/gitk-git/gitk
-@@ -7488,6 +7488,16 @@ proc make_idmark {id} {
-     $canv raise $t
- }
- 
-+proc get_autosellen {} {
-+    global hashalgorithm autosellen autosellensha256
-+
-+    if {$hashalgorithm == "SHA256"} {
-+        return $autosellensha256
-+    } else {
-+        return $autosellen
-+    }
-+}
-+
- proc selectline {l isnew {desired_loc {}} {switch_to_patch 0}} {
-     global canv ctext commitinfo selectedline
-     global canvy0 linespc parents children curview
-@@ -7496,7 +7506,7 @@ proc selectline {l isnew {desired_loc {}} {switch_to_patch 0}} {
-     global mergemax numcommits pending_select
-     global cmitmode showneartags allcommits
-     global targetrow targetid lastscrollrows
--    global autocopy autoselect autosellen jump_to_here
-+    global autocopy autoselect jump_to_here
-     global vinlinediff
- 
-     unset -nocomplain pending_select
-@@ -7563,11 +7573,11 @@ proc selectline {l isnew {desired_loc {}} {switch_to_patch 0}} {
-     $sha1entry delete 0 end
-     $sha1entry insert 0 $id
-     if {$autoselect && [haveselectionclipboard]} {
--        $sha1entry selection range 0 $autosellen
-+        $sha1entry selection range 0 [get_autosellen]
-     }
-     if {$autocopy} {
-         clipboard clear
--        clipboard append [string range $id 0 [expr $autosellen - 1]]
-+        clipboard append [string range $id 0 [expr [get_autosellen] - 1]]
-     }
-     rhighlight_sel $id
- 
-@@ -9629,13 +9639,14 @@ proc mktaggo {} {
- }
- 
- proc copyreference {} {
--    global rowmenuid autosellen
-+    global rowmenuid
-     global hashlength
- 
-     set format "%h (\"%s\", %ad)"
-     set cmd [list git show -s --pretty=format:$format --date=short]
--    if {$autosellen < $hashlength} {
--        lappend cmd --abbrev=$autosellen
-+    set alen [get_autosellen]
-+    if {$alen < $hashlength} {
-+        lappend cmd --abbrev=$alen
-     }
-     set reference [eval exec $cmd $rowmenuid]
- 
-@@ -11741,8 +11752,9 @@ proc create_prefs_page {w} {
- proc prefspage_general {notebook} {
-     global NS maxwidth maxgraphpct showneartags showlocalchanges
-     global tabstop wrapcomment wrapdefault limitdiffs
--    global autocopy autoselect autosellen extdifftool perfile_attrs
-+    global autocopy autoselect extdifftool perfile_attrs
-     global hideremotes want_ttk have_ttk maxrefs web_browser
-+    global hashalgorithm hashlength
- 
-     set page [create_prefs_page $notebook.general]
- 
-@@ -11771,7 +11783,13 @@ proc prefspage_general {notebook} {
-             -variable autoselect
-         grid x $page.autoselect -sticky w
-     }
--    spinbox $page.autosellen -from 1 -to 40 -width 4 -textvariable autosellen
-+
-+    if {$hashalgorithm == "SHA256"} {
-+        set autolenvar "autosellensha256"
-+    } else {
-+        set autolenvar "autosellen"
-+    }
-+    spinbox $page.autosellen -from 1 -to $hashlength -width 4 -textvariable $autolenvar
-     ${NS}::label $page.autosellenl -text [mc "Length of commit ID to copy"]
-     grid x $page.autosellenl $page.autosellen -sticky w
- 
-@@ -11908,7 +11926,7 @@ proc doprefs {} {
-     global maxwidth maxgraphpct use_ttk NS
-     global oldprefs prefstop showneartags showlocalchanges
-     global uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
--    global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs
-+    global tabstop limitdiffs autoselect extdifftool perfile_attrs
-     global hideremotes want_ttk have_ttk wrapcomment wrapdefault
- 
-     set top .gitkprefs
-@@ -12606,6 +12624,7 @@ set datetimeformat "%Y-%m-%d %H:%M:%S"
- set autocopy 0
- set autoselect 1
- set autosellen 40
-+set autosellensha256 64
- set perfile_attrs 0
- set want_ttk 1
- 
-@@ -12702,7 +12721,7 @@ config_check_tmp_exists 50
- set config_variables {
-     mainfont textfont uifont tabstop findmergefiles maxgraphpct maxwidth
-     cmitmode wrapcomment wrapdefault autocopy autoselect autosellen
--    showneartags maxrefs visiblerefs
-+    autosellensha256 showneartags maxrefs visiblerefs
-     hideremotes showlocalchanges datetimeformat limitdiffs uicolor want_ttk
-     bgcolor fgcolor uifgcolor uifgdisabledcolor colors diffcolors mergecolors
-     markbgcolor diffcontext selectbgcolor foundbgcolor currentsearchhitbgcolor
--- 
-2.49.0
-

CVE-2024-24577.patch

@@ -1,8 +1,8 @@
-Index: b/read-cache.c
+Index: git/read-cache.c
 ===================================================================
---- a/read-cache.c
-+++ b/read-cache.c
-@@ -1158,10 +1158,13 @@ static int has_dir_name(struct index_sta
+--- git.orig/read-cache.c
++++ git/read-cache.c
+@@ -1135,10 +1135,13 @@ static int has_dir_name(struct index_sta
  		size_t len;
  
  		for (;;) {

completion-wordbreaks.diff

@@ -2,11 +2,11 @@
  contrib/completion/git-completion.bash |   10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
 
-Index: git-2.43.1/contrib/completion/git-completion.bash
+Index: git/contrib/completion/git-completion.bash
 ===================================================================
---- git-2.43.1.orig/contrib/completion/git-completion.bash
-+++ git-2.43.1/contrib/completion/git-completion.bash
-@@ -67,10 +67,12 @@
+--- git.orig/contrib/completion/git-completion.bash
++++ git/contrib/completion/git-completion.bash
+@@ -81,10 +81,12 @@
  #     case insensitively, even on systems with case sensitive file systems
  #     (e.g., completing tag name "FOO" on "git checkout f<TAB>").
  

git-2.45.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:51bfe87eb1c02fed1484051875365eeab229831d30d0cec5d89a14f9e40e9adb
-size 7487680

git-2.47.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1ce114da88704271b43e027c51e04d9399f8c88e9ef7542dae7aebae7d87bc4e
-size 7652728

git-2.47.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f3d8f9bb23ae392374e91cd9d395970dabc5b9c5ee72f39884613cd84a6ed310
-size 7654244

git-2.48.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4803b809c42696b3b8cce6b0ba6de26febe1197f853daf930a484db93c1ad0d5
-size 7723336

git-2.48.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1c5d545f5dc1eb51e95d2c50d98fdf88b1a36ba1fa30e9ae5d5385c6024f82ad
-size 7723580

git-2.50.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dff3c000e400ace3a63b8a6f8b3b76b88ecfdffd4504a04aba4248372cdec045
-size 7878256

git-2.50.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7e3e6c36decbd8f1eedd14d42db6674be03671c2204864befa2a41756c5c8fc4
-size 7880972

git-tcsh-completion-fixes.diff

@@ -4,10 +4,10 @@
  contrib/completion/git.tcsh            |    4 ++++
  3 files changed, 15 insertions(+), 10 deletions(-)
 
-Index: git-2.11.0/contrib/completion/git-completion.tcsh
+Index: git/contrib/completion/git-completion.tcsh
 ===================================================================
---- git-2.11.0.orig/contrib/completion/git-completion.tcsh
-+++ git-2.11.0/contrib/completion/git-completion.tcsh
+--- git.orig/contrib/completion/git-completion.tcsh
++++ git/contrib/completion/git-completion.tcsh
 @@ -32,14 +32,14 @@ if ( ${__git_tcsh_completion_version[1]}
  endif
  unset __git_tcsh_completion_version
@@ -30,26 +30,26 @@ Index: git-2.11.0/contrib/completion/git-completion.tcsh
  
  cat << EOF >! ${__git_tcsh_completion_script}
  #!bash
-@@ -121,6 +121,3 @@ EOF
+@@ -122,6 +122,3 @@ EOF
  
  # Don't need this variable anymore, so don't pollute the users environment
  unset __git_tcsh_completion_original_script
 -
 -complete git  'p,*,`bash ${__git_tcsh_completion_script} git "${COMMAND_LINE}"`,'
 -complete gitk 'p,*,`bash ${__git_tcsh_completion_script} gitk "${COMMAND_LINE}"`,'
-Index: git-2.11.0/contrib/completion/git.csh
+Index: git/contrib/completion/git.csh
 ===================================================================
 --- /dev/null
-+++ git-2.11.0/contrib/completion/git.csh
++++ git/contrib/completion/git.csh
 @@ -0,0 +1,4 @@
 +if (${?prompt}) then
 +complete git  'p,*,`bash /usr/share/tcsh/git.complete git "${COMMAND_LINE}"`,'
 +complete gitk 'p,*,`bash /usr/share/tcsh/git.complete gitk "${COMMAND_LINE}"`,'
 +endif
-Index: git-2.11.0/contrib/completion/git.tcsh
+Index: git/contrib/completion/git.tcsh
 ===================================================================
 --- /dev/null
-+++ git-2.11.0/contrib/completion/git.tcsh
++++ git/contrib/completion/git.tcsh
 @@ -0,0 +1,4 @@
 +if (${?prompt}) then
 +complete git  'p,*,`bash /usr/share/tcsh/git.complete git "${COMMAND_LINE}"`,'

git.changes

@@ -1,3 +1,264 @@
+-------------------------------------------------------------------
+Wed Aug 20 14:22:54 UTC 2025 - Antonio Teixeira <antonio.teixeira@suse.com>
+
+- Use zlib instead of zlib-ng for SLES16
+
+-------------------------------------------------------------------
+Mon Aug 18 18:38:01 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to 2.51.0
+  - UI, Workflows & Features
+    - Userdiff patterns for the R language have been added.
+    - Documentation for "git send-email" has been updated with a
+      bit more credential helper and OAuth information.
+    - "git cat-file --batch" learns to understand %(objectmode)
+      atom to allow the caller to tell missing objects (due to
+      repository corruption) and submodules (whose commit objects
+      are OK to be missing) apart.
+    - "git diff --no-index dirA dirB" can limit the comparison with
+      pathspec at the end of the command line, just like normal
+      "git diff".
+    - "git subtree" (in contrib/) learned to grok GPG signing its
+      commits.
+    - "git whatchanged" that is longer to type than "git log --raw"
+      which is its modern rough equivalent has outlived its
+      usefulness more than 10 years ago.  Plan to deprecate and
+      remove it.
+    - An interchange format for stash entries is defined, and
+      subcommand of "git stash" to import/export has been added.
+    - "git merge/pull" has been taught the "--compact-summary"
+      option to use the compact-summary format, intead of diffstat,
+      when showing the summary of the incoming changes.
+    - "git imap-send" has been broken for a long time, which has
+      been resurrected and then taught to talk OAuth2.0 etc.
+    - Some error messages from "git imap-send" has been updated.
+    - When "git daemon" sees a signal while attempting to accept()
+      a new client, instead of retrying, it skipped it by mistake,
+      which has been corrected.
+    - The reftable ref backend has matured enough; Git 3.0 will
+      make it the default format in a newly created repositories by
+      default.
+    - "netrc" credential helper has been improved to understand
+      textual service names (like smtp) in addition to the numeric
+      port numbers (like 25).
+    - Lift the limitation to use changed-path filter in "git log"
+      so that it can be used for a pathspec with multiple literal
+      paths.
+    - Clean up the way how signature on commit objects are exported
+      to and imported from fast-import stream.
+    - Remove unsupported, unused, and unsupportable old option from
+      "git log".
+    - Document recently added "git imap-send --list" with an
+      example.
+    - "git pull" learned to pay attention to pull.autostash
+      configuration variable, which overrides
+      rebase/merge.autostash.
+    - "git for-each-ref" learns "--start-after" option to help
+      applications that want to page its output.
+    - "git switch" and "git restore" are declared to be no longer
+      experimental.
+    - "git -c alias.foo=bar foo -h baz" reported "'foo' is aliased
+      to 'bar'" and then went on to run "git foo -h baz", which was
+      unexpected.  Tighten the rule so that alias expansion is
+      reported only when "-h" is the sole option.
+  - Performance, Internal Implementation, Development Support etc.
+    - "git pack-objects" learned to find delta bases from blobs at
+      the same path, using the --path-walk API.
+    - CodingGuidelines update.
+    - Add settings for Solaris 10 & 11.
+    - Meson-based build/test framework now understands TAP output
+      generated by our tests.
+    - "Do not explicitly initialize to zero" rule has been
+      clarified in the CodingGuidelines document.
+    - A test helper "test_seq" function learned the "-f <fmt>"
+      option, which allowed us to simplify a lot of test scripts.
+    - A lot of stale stuff has been removed from the contrib/
+      hierarchy.
+    - "git push" and "git fetch" are taught to update refs in
+      batches to gain performance.
+    - Some code paths in "git prune" used to ignore the passed-in
+      repository object and used the `the_repository` singleton
+      instance instead, which has been corrected.
+    - Update ".clang-format" and ".editorconfig" to match our style
+      guide a bit better.
+    - "make coccicheck" succeeds even when spatch made suggestions,
+      which has been updated to fail in such a case.
+    - Code clean-up around object access API.
+    - Define .precision to more canned parse-options type to avoid
+      bugs coming from using a variable with a wrong type to
+      capture the parsed values.
+    - Flipping the default hash function to SHA-256 at Git 3.0
+      boundary is planned.
+    - Declare weather-balloon we raised for "bool" type 18 months
+      ago a success and officially allow using the type in our
+      codebase.
+    - GIT_TEST_INSTALLED was not honored in the recent topic
+      related to SHA256 hashes, which has been corrected.
+    - The pop_most_recent_commit() function can have quite
+      expensive worst case performance characteristics, which has
+      been optimized by using prio-queue data structure.
+    - Move structure definition from unrelated header file to where
+      it belongs.
+    - To help our developers, document what C99 language features
+      are being considered for adoption, in addition to what past
+      experiments have already decided.
+    - The reftable unit tests are now ported to the "clar" unit
+      testing framework.
+    - Redefine where the multi-pack-index sits in the object
+      subsystem, which recently was restructured to allow multiple
+      backends that support a single object source that belongs to
+      one repository.  A MIDX does span multiple "object sources".
+    - Reduce implicit assumption and dependence on the_repository
+      in the object-file subsystem.
+
+  - Fixes since v2.50 Unless otherwise noted, all the changes in
+    2.50.X maintenance track, including security updates, are
+    included in this release.
+    - A memory-leak in an error code path has been plugged. (merge
+      7082da85cb ly/commit-graph-graph-write-leakfix later to
+      maint).
+    - A memory-leak in an error code path has been plugged. (merge
+      aedebdb6b9 ly/fetch-pack-leakfix later to maint).
+    - Some leftover references to documentation source files that
+      no longer exist, due to recent ".txt" -> ".adoc" renaming,
+      have been corrected. (merge 3717a5775a
+      jw/doc-txt-to-adoc-refs later to maint).
+    - "git stash -p <pathspec>" improvements. (merge 468817bab2
+      pw/stash-p-pathspec-fixes later to maint).
+    - "git send-email" incremented its internal message counter
+      when a message was edited, which made logic that treats the
+      first message specially misbehave, which has been corrected.
+      (merge 2cc27b3501 ag/send-email-edit-threading-fix later to
+      maint).
+    - "git stash" recorded a wrong branch name when submodules are
+      present in the current checkout, which has been corrected.
+      (merge ffb36c64f2 kj/stash-onbranch-submodule-fix later to
+      maint).
+    - When asking to apply mailmap to both author and committer
+      field while showing a commit object, the field that appears
+      later was not correctly parsed and replaced, which has been
+      corrected. (merge abf94a283f sa/multi-mailmap-fix later to
+      maint).
+    - "git maintenance" lacked the care "git gc" had to avoid
+      holding onto the repository lock for too long during packing
+      refs, which has been remedied. (merge 1b5074e614
+      ps/maintenance-ref-lock later to maint).
+    - Avoid regexp_constraint and instead use comparison_constraint
+      when listing functions to exclude from application of
+      coccinelle rules, as spatch can be built with different
+      regexp engine X-<. (merge f2ad545813
+      jc/cocci-avoid-regexp-constraint later to maint).
+    - Updating submodules from the upstream did not work well when
+      submodule's HEAD is detached, which has been improved. (merge
+      ca62f524c1 jk/submodule-remote-lookup-cleanup later to
+      maint).
+    - Remove unnecessary check from "git daemon" code. (merge
+      0c856224d2 cb/daemon-fd-check-fix later to maint).
+    - Use of sysctl() system call to learn the total RAM size used
+      on BSDs has been corrected. (merge 781c1cf571
+      cb/total-ram-bsd-fix later to maint).
+    - Drop FreeBSD 4 support and declare that we support only
+      FreeBSD 12 or later, which has memmem() supported. (merge
+      0392f976a7 bs/config-mak-freebsd later to maint).
+    - A diff-filter with negative-only specification like "git log
+      --diff-filter=d" did not trigger correctly, which has been
+      fixed. (merge 375ac087c5 jk/all-negative-diff-filter-fix
+      later to maint).
+    - A failure to open the index file for writing due to
+      conflicting access did not state what went wrong, which has
+      been corrected. (merge 9455397a5c
+      hy/read-cache-lock-error-fix later to maint).
+    - Tempfile removal fix in the codepath to sign commits with SSH
+      keys. (merge 4498127b04 re/ssh-sign-buffer-fix later to
+      maint).
+    - Code and test clean-up around string-list API. (merge
+      6e5b26c3ff sj/string-list later to maint).
+    - "git apply -N" should start from the current index and
+      register only new files, but it instead started from an empty
+      index, which has been corrected. (merge 2b49d97fcb
+      rp/apply-intent-to-add-fix later to maint).
+    - Leakfix with a new and a bit invasive test on pack-bitmap
+      files. (merge bfd5522e98 ly/load-bitmap-leakfix later to
+      maint).
+    - "git fetch --prune" used to be O(n^2) expensive when there
+      are many refs, which has been corrected. (merge 87d8d8c5d0
+      ph/fetch-prune-optim later to maint).
+    - When a ref creation at refs/heads/foo/bar fails, the files
+      backend now removes refs/heads/foo/ if the directory is
+      otherwise not used. (merge a3a7f20516
+      ps/refs-files-remove-empty-parent later to maint).
+    - "pack-objects" has been taught to avoid pointing into objects
+      in cruft packs from midx.
+    - "git remote" now detects remote names that overlap with each
+      other (e.g., remote nickname "outer" and "outer/inner" are
+      used at the same time), as it will lead to overlapping
+      remote-tracking branches. (merge a5a727c448
+      jk/remote-avoid-overlapping-names later to maint).
+    - The gpg.program configuration variable, which names a
+      pathname to the (custom) GPG compatible program, can now be
+      spelled with ~tilde expansion. (merge 7d275cd5c0
+      jb/gpg-program-variable-is-a-pathname later to maint).
+    - Our <sane-ctype.h> header file relied on that the
+      system-supplied <ctype.h> header is not later included, which
+      would override our macro definitions, but "amazon linux"
+      broke this assumption.  Fix this by preemptively including
+      <ctype.h> near the beginning of <sane-ctype.h> ourselves.
+      (merge 9d3b33125f ps/sane-ctype-workaround later to maint).
+    - Clean-up compat/bswap.h mess. (merge f4ac32c03a
+      ss/compat-bswap-revamp later to maint).
+    - Meson-based build did not handle libexecdir setting
+      correctly, which has been corrected. (merge 056dbe8612
+      rj/meson-libexecdir-fix later to maint).
+    - Document that we do not require "real" name when signing your
+      patches off. (merge 1f0fed312a
+      bc/contribution-under-non-real-names later to maint).
+    - "git commit" that concludes a conflicted merge failed to
+      notice and remove existing comment added automatically (like
+      "# Conflicts:") when the core.commentstring is set to 'auto'.
+      (merge 92b7c7c9f5 ac/auto-comment-char-fix later to maint).
+    - "git rebase -i" with bogus rebase.instructionFormat
+      configuration failed to produce the todo file after recording
+      the state files, leading to confused "git status"; this has
+      been corrected. (merge ade14bffd7
+      ow/rebase-verify-insn-fmt-before-initializing-state later to
+      maint).
+    - A few file descriptors left unclosed upon program completion
+      in a few test helper programs are now closed. (merge
+      0f1b33815b hl/test-helper-fd-close later to maint).
+    - Interactive prompt code did not correctly strip CRLF from the
+      end of line on Windows. (merge 711a20827b js/prompt-crlf-fix
+      later to maint).
+    - The config API had a set of convenience wrapper functions
+      that implicitly use the_repository instance; they have been
+      removed and inlined at the calling sites.
+    - "git add/etc -p" now honor the diff.context configuration
+      variable, and also they learn to honor the -U<n> command-line
+      option. (merge 2b3ae04011 lm/add-p-context later to maint).
+    - The case where a new submodule takes a path where there used
+      to be a completely different subproject is now dealt with a
+      bit better than before. (merge 5ed8c5b465
+      kj/renamed-submodule later to maint).
+    - The deflate codepath in "git archive --format=zip" had a
+      longstanding bug coming from misuse of zlib API, which has
+      been corrected.
+- drop patches included in update:
+  0001-git-gui-Replace-null_sha1-with-nullid.patch
+  0001-gitk-Add-support-of-SHA256-repo.patch
+  0002-git-gui-Add-support-of-SHA256-repo.patch
+- refreshed patches:
+  CVE-2024-24577.patch
+  completion-wordbreaks.diff
+  git-tcsh-completion-fixes.diff
+  setup-don-t-fail-if-commondir-reference-is-deleted.patch
+- contrib/workdir is dropped. remove references for it.
+
+-------------------------------------------------------------------
+Tue Jul 15 13:20:32 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- update git-gui sha256 patches after the upstream review:
+  0001-git-gui-Replace-null_sha1-with-nullid.patch
+  0002-git-gui-Add-support-of-SHA256-repo.patch
+
 -------------------------------------------------------------------
 Wed Jul  9 11:01:47 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
 
@@ -8,7 +269,7 @@ Wed Jul  9 11:01:47 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
 -------------------------------------------------------------------
 Wed Jul  9 10:48:56 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
 
-- update to 2.50.1 (boo#1245938 boo#1245939 boo#1245942 boo#1245943 
+- update to 2.50.1 (boo#1245938 boo#1245939 boo#1245942 boo#1245943
   boo#1245946 boo#1245947)
   Security fixes for CVE-2025-27613, CVE-2025-27614,
   CVE-2025-46334, CVE-2025-46835, CVE-2025-48384, CVE-2025-48385,
@@ -119,7 +380,7 @@ Fri Mar 14 23:43:43 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
 Tue Jan 14 21:45:04 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
 
 - update to 2.48.1: (boo#1235600 boo#1235601)
-  * CVE-2024-50349, CVE-2024-52006: 
+  * CVE-2024-50349, CVE-2024-52006:
     refuse to accept URLs that contain control sequences
 
 -------------------------------------------------------------------

git.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package git
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 # Copyright (c) 2025 Andreas Stieger <Andreas.Stieger@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
@@ -43,7 +43,7 @@
 %bcond_with    asciidoctor
 %endif
 Name:           git
-Version:        2.50.1
+Version:        2.51.0
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0-only
@@ -70,9 +70,6 @@ Patch8:         git-asciidoc.patch
 Patch10:        setup-don-t-fail-if-commondir-reference-is-deleted.patch
 # PATCH-FIX-OPENSUSE CVE-2024-24577.patch boo#1219660 antonio.teixeira@suse.com
 Patch11:        CVE-2024-24577.patch
-# Add SHA256 support for gitk and git-gui (bsc#1239989)
-Patch20:        0001-gitk-Add-support-of-SHA256-repo.patch
-Patch21:        0002-git-gui-Add-support-of-SHA256-repo.patch
 BuildRequires:  fdupes
 BuildRequires:  gpg2
 BuildRequires:  libcurl-devel
@@ -89,7 +86,7 @@ BuildRequires:  systemd-rpm-macros
 BuildRequires:  tcsh
 BuildRequires:  update-desktop-files
 BuildRequires:  xz
-%if 0%{?suse_version} >= 1600
+%if 0%{?suse_version} > 1600
 BuildRequires:  pkgconfig(zlib-ng)
 %else
 BuildRequires:  pkgconfig(zlib)
@@ -414,8 +411,6 @@ install -m 644 %{SOURCE12} %{buildroot}/%{_sysconfdir}/bash_completion.d/git-pro
 %if %{with git_libsecret}
 install -m 755 -D contrib/credential/libsecret/git-credential-libsecret %{buildroot}/%{gitexecdir}/git-credential-libsecret
 %endif
-# contrib/workdir
-install -m 755 -D contrib/workdir/git-new-workdir %{buildroot}/%{_bindir}
 # process tcsh completion
 (cd contrib/completion
  mkdir -p %{buildroot}%{_datadir}/tcsh
@@ -577,7 +572,6 @@ fi
 %dir %{gitexecdir}
 %dir %{gitexecdir}/mergetools
 %{gitexecdir}/mergetools/guiffy
-%{_bindir}/git-new-workdir
 %{_datadir}/bash-completion/completions/*
 %{_sysconfdir}/bash_completion.d/git-prompt
 %{_datadir}/tcsh

setup-don-t-fail-if-commondir-reference-is-deleted.patch

@@ -28,11 +28,11 @@ v3:
  setup.c | 16 +++++++++++-----
  1 file changed, 11 insertions(+), 5 deletions(-)
 
-Index: git-2.43.1/setup.c
+Index: git/setup.c
 ===================================================================
---- git-2.43.1.orig/setup.c
-+++ git-2.43.1/setup.c
-@@ -316,12 +316,20 @@ int get_common_dir_noenv(struct strbuf *
+--- git.orig/setup.c
++++ git/setup.c
+@@ -327,12 +327,20 @@ int get_common_dir_noenv(struct strbuf *
  {
  	struct strbuf data = STRBUF_INIT;
  	struct strbuf path = STRBUF_INIT;
@@ -56,7 +56,7 @@ Index: git-2.43.1/setup.c
  		while (data.len && (data.buf[data.len - 1] == '\n' ||
  				    data.buf[data.len - 1] == '\r'))
  			data.len--;
-@@ -332,8 +340,6 @@ int get_common_dir_noenv(struct strbuf *
+@@ -343,8 +351,6 @@ int get_common_dir_noenv(struct strbuf *
  		strbuf_addbuf(&path, &data);
  		strbuf_add_real_path(sb, path.buf);
  		ret = 1;