Re: [PATCH/RFC v2 2/2] diff.tcl: call "apply_tab_size 1" to fix alignment instead of spaces.

From: GitHub Chris Idema <github_chris_idema@proton.me>
Date: Jan 29, 2026, 08:31 UTC
Message-ID: <AXTzN5mRXdWYZx55ARuBbRgndXW5zA51_wcnAV4KaUpk3kz6t8ZYfOk0Du5rg6zKhz0_O-4ZSkLNX6WkhTp4fjDFDMfCZAsTRCoBMH_IpMU=@proton.me>
In-Reply-To: <xmqqv7glcmee.fsf@gitster.g>

> From: Junio C Hamano <gitster@pobox.com>
>
> calling it a "show stopper" and "unreadable" is a great
> exaggeration, I must say.

We use clang-format to format most of our code. But we don't have that always available. So it's good to review indentation changes prior to commit. And we use either git diff or Git Gui for that. For many file changes I prefer Git Gui as you don't need to scroll.

For git diff there is a way to configure tab size to 4: git config --global core.pager 'less -x1,5' source: https://stackoverflow.com/a/10584237/15307950

For Git Gui and Gitk there is also a tab setting. But only in Git Gui it didn't work as expected. So with show stopper I meant that it's the only odd one. And since the code already uses apply_tab_size it makes sense to just apply it correctly in all scenarios.

My latest commit was tested for:
- "Modified, not staged"
- "Staged for commit"
- "Requires merge resolution"
- "Untracked, not staged"
- "Missing"
- "Staged for removal"

And it worked on my side. @@@ needs apply_tab_size 2 @@ needs apply_tab_size 1 the rest was already handled correctly

> From: Junio C Hamano <gitster@pobox.com>
>
> I noticed that gitk has code to deal with octopus merges

I would love to know how such a merge can be replicated. Is it also possible to have such a merge visible in Git Gui?

-- Chris