Alex Henrie <alexhenrie24@xxxxxxxxx> writes:
> Signed-off-by: Alex Henrie <alexhenrie24@xxxxxxxxx>
> ---
> v3: no changes
> ---
> gitk-git/gitk | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
Please base a patch on gitk part to base on Paul's tree, not mine,
meaning that the first few lines of diff should begin like so:
diff --git a/gitk b/gitk
index ...
--- a/gitk
+++ b/gitk
and not as part of the series.
What the first two patches want to do is a good thing regardless, so
I'll take a deeper look at them and queue them. I am very skeptical
to log.graph=yes/no configuration for obvious reasons that setting
such a variable *will* break existing tools and users. It is not
even "it might break but we don't know until we try", as this patch
loudly demonstrates.
Thanks.
> diff --git a/gitk-git/gitk b/gitk-git/gitk
> index 23d9dd1fe0..24099ce0b8 100755
> --- a/gitk-git/gitk
> +++ b/gitk-git/gitk
> @@ -411,8 +411,8 @@ proc start_rev_list {view} {
> }
>
> if {[catch {
> - set fd [open [concat | git log --no-color -z --pretty=raw $show_notes \
> - --parents --boundary $args "--" $files] r]
> + set fd [open [concat | git log --no-color --no-graph -z --pretty=raw \
> + $show_notes --parents --boundary $args "--" $files] r]
> } err]} {
> error_popup "[mc "Error executing git log:"] $err"
> return 0
> @@ -559,8 +559,9 @@ proc updatecommits {} {
> set args $vorigargs($view)
> }
> if {[catch {
> - set fd [open [concat | git log --no-color -z --pretty=raw $show_notes \
> - --parents --boundary $args "--" $vfilelimit($view)] r]
> + set fd [open [concat | git log --no-color --no-graph -z --pretty=raw
> + $show_notes --parents --boundary $args "--"
> + $vfilelimit($view)] r]
> } err]} {
> error_popup "[mc "Error executing git log:"] $err"
> return
