kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

gitk: prevent overly long command lines 

To avoid running into command line limitations, some of Git's commands
support the `--stdin` option.

Let's use exactly this option in the three rev-list/log invocations in
gitk that would otherwise possibly run the danger of trying to invoke a
too-long command line.

While it is easy to redirect either stdin or stdout in Tcl/Tk scripts,
what we need here is both. We need to capture the output, yet we also
need to pipe in the revs/files arguments via stdin (because stdin does
not have any limit, unlike the command line). To help this, we use the
neat Tcl feature where you can capture stdout and at the same time feed
a fixed string as stdin to the spawned process.

One non-obvious aspect about this change is that the `--stdin` option
allows to specify revs, the double-dash, and files, but *no* other
options such as `--not`. This is addressed by prefixing the "negative"
revs with `^` explicitly rather than relying on the `--not` option
(thanks for coming up with that idea, Max!).

This fixes https://github.com/git-for-windows/git/issues/1987

Analysis-and-initial-patch-by: Max Kirillov <max@max630.net>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Johannes Schindelin 2023-01-24 11:23:16 +00:00 committed by Junio C Hamano
parent 465f03869a
commit bb5cb23daf
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gitk
View File

@ -405,14 +405,16 @@ proc start_rev_list {view} {
if {$revs eq {}} { if {$revs eq {}} {
return 0 return 0
} }
set args [concat $vflags($view) $revs] set args $vflags($view)
} else { } else {
set revs {}
set args $vorigargs($view) set args $vorigargs($view)
} }


if {[catch { if {[catch {
set fd [open [concat | git log --no-color -z --pretty=raw $show_notes \ set fd [open [concat | git log --no-color -z --pretty=raw $show_notes \
--parents --boundary $args "--" $files] r] --parents --boundary $args --stdin \
"<<[join [concat $revs "--" $files] "\\n"]"] r]
} err]} { } err]} {
error_popup "[mc "Error executing git log:"] $err" error_popup "[mc "Error executing git log:"] $err"
return 0 return 0
@ -554,13 +556,19 @@ proc updatecommits {} {
set revs $newrevs set revs $newrevs
set vposids($view) [lsort -unique [concat $oldpos $vposids($view)]] set vposids($view) [lsort -unique [concat $oldpos $vposids($view)]]
} }
set args [concat $vflags($view) $revs --not $oldpos] set args $vflags($view)
foreach r $oldpos {
lappend revs "^$r"
}
} else { } else {
set revs {}
set args $vorigargs($view) set args $vorigargs($view)
} }
if {[catch { if {[catch {
set fd [open [concat | git log --no-color -z --pretty=raw $show_notes \ set fd [open [concat | git log --no-color -z --pretty=raw $show_notes \
--parents --boundary $args "--" $vfilelimit($view)] r] --parents --boundary $args --stdin \
"<<[join [concat $revs "--" \
$vfilelimit($view)] "\\n"]"] r]
} err]} { } err]} {
error_popup "[mc "Error executing git log:"] $err" error_popup "[mc "Error executing git log:"] $err"
return return
@ -10231,10 +10239,16 @@ proc getallcommits {} {
foreach id $seeds { foreach id $seeds {
lappend ids "^$id" lappend ids "^$id"
} }
lappend ids "--"
} }
} }
if {$ids ne {}} { if {$ids ne {}} {
set fd [open [concat $cmd $ids] r] if {$ids eq "--all"} {
set cmd [concat $cmd "--all"]
} else {
set cmd [concat $cmd --stdin "<<[join $ids "\\n"]"]
}
set fd [open $cmd r]
fconfigure $fd -blocking 0 fconfigure $fd -blocking 0
incr allcommits incr allcommits
nowbusy allcommits nowbusy allcommits