From: Johannes Sixt <j6t@kdbg•org>
To: GitHub Chris Idema <github_chris_idema@proton•me>
Cc: Junio C Hamano <gitster@pobox•com>,
git@vger•kernel.org, Michael Lutz <michi@icosahedron•de>,
Pat Thoyts <patthoyts@users•sourceforge.net>,
Chris Idema via GitGitGadget <gitgitgadget@gmail•com>
Subject: Re: [PATCH/RFC v2 2/2] diff.tcl: call "apply_tab_size 1" to fix alignment instead of spaces.
Date: Wed, 28 Jan 2026 16:59:55 +0100 [thread overview]
Message-ID: <bf8e6231-e1c0-4c0c-b4d5-20f8d0044211@kdbg.org> (raw)
In-Reply-To: <Rrnh0ugGQ5ef_s-3W0Tive8HA9R0_9Cq6yK7K6SS6Jr3kPigHai3jzxvphTRNXXNhCnor2TMV8UjKEi5U27VOLBf-R4g6VbJBLq8PQH9kCI=@proton.me>
Am 28.01.26 um 15:02 schrieb GitHub Chris Idema:
>> I concur. Also, "apply_tab_size 0" is needed when the contents of
>> an unstaged file are shown instead of patch text.
>
> Can you explain why it's needed?
> The file in my example is unstaged and it's a patch text.
> ...
> Can you show me how to get content without patch text in the window?
Sorry, I meant "untracked file". When the text of an untracked file is
displayed, we do not want to offset the tabstops.
>
>> + if {$have_tk85 && $firsttab != 0} {
>
> Gives me the error "can't read "have_tk85": no such variable"
> If I substitute 1 or 0 for have_tk85 it doesn't fix the alignment.
This was not a suggested fix, but a citation of the patch that
introduced the function. The variable has since been eliminated.
> I'm open for suggestions. My 1 line code change fixes the problem,
> but if it is not the official way to do it or if it introduces other
> problems feel free to suggest another fix.
It may fix the problem for regular patch text. But I doubt that it is a
correct fix for combined-diff text, because that needs offset 2.
> For us this bug is a show stopper that makes the diff in the
> git-gui window by default unreadable.
Earlier, I said that I'm not fond of such a change. But I changed my
mind. I hadn't noticed so far that Gitk applies customized tabstops. Git
GUI and Gitk need not emulate the behavor of terminal windows faithfully
and can be more clever as far as tabstops are concerned.
-- Hannes
next prev parent reply other threads:[~2026-01-28 16:00 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-26 10:45 [PATCH] diff.tcl: fixed alignment of tabs in git-gui diff by using spaces Chris Idema via GitGitGadget
2026-01-26 12:15 ` Johannes Sixt
2026-01-26 13:32 ` GitHub Chris Idema
2026-01-26 13:59 ` Johannes Sixt
2026-01-26 14:43 ` GitHub Chris Idema
2026-01-26 14:52 ` Johannes Sixt
2026-01-26 15:21 ` GitHub Chris Idema
2026-01-26 15:32 ` GitHub Chris Idema
2026-01-27 20:33 ` [PATCH/RFC v2 0/2] diff.tcl: Fixed " Chris Idema via GitGitGadget
2026-01-27 20:33 ` [PATCH/RFC v2 1/2] diff.tcl: fixed " Chris Idema via GitGitGadget
2026-01-27 20:33 ` [PATCH/RFC v2 2/2] diff.tcl: call "apply_tab_size 1" to fix alignment instead of spaces Chris Idema via GitGitGadget
2026-01-27 22:19 ` Junio C Hamano
2026-01-27 23:26 ` Junio C Hamano
2026-01-28 9:07 ` GitHub Chris Idema
2026-01-28 13:40 ` Johannes Sixt
2026-01-28 14:02 ` GitHub Chris Idema
2026-01-28 15:59 ` Johannes Sixt [this message]
2026-01-28 23:42 ` Junio C Hamano
2026-01-29 0:06 ` Junio C Hamano
2026-01-29 8:31 ` GitHub Chris Idema
2026-01-29 10:04 ` Johannes Sixt
2026-01-29 15:17 ` Junio C Hamano
2026-01-28 10:20 ` [PATCH/RFC v3] diff.tcl: made alignment of tabs in git-gui diff consistent with gitk Chris Idema via GitGitGadget
2026-01-28 17:02 ` Johannes Sixt
2026-01-28 19:02 ` GitHub Chris Idema
2026-01-29 0:02 ` Junio C Hamano
2026-01-29 11:09 ` [PATCH v4] git-gui: shift tabstops to account for the first column of context diffs Chris Idema via GitGitGadget
2026-01-29 21:36 ` Johannes Sixt
2026-03-04 13:32 ` GitHub Chris Idema
2026-03-04 19:22 ` Johannes Sixt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bf8e6231-e1c0-4c0c-b4d5-20f8d0044211@kdbg.org \
--to=j6t@kdbg$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=gitgitgadget@gmail$(echo .)com \
--cc=github_chris_idema@proton$(echo .)me \
--cc=gitster@pobox$(echo .)com \
--cc=michi@icosahedron$(echo .)de \
--cc=patthoyts@users$(echo .)sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox