Fix jagged lines in `git remote -v`

[dscho]

Output of git remote -v (and other Git subcommands) is all of a sudden jagged in mintty: instead of starting new lines at the left-most column, the lines start directly beneath the end of the previous line.

This seems to have been introduced with the latest merging rebase of the msys2-runtime to upstream.

[nalla]

I can confirm this. I think all of git's output is affected. git branch e.g. as well. git log seems to work. But I think because its directed to a pager.

[dscho]

Right, everything that gets redirected to the pager, and everything that is shown in the cmd still works. I am bisecting right now (already for two hours, this is really tedious).

[dscho]

This is fixed by the latest merging rebase of the msys2-runtime. Packages are building as we speak (will upload them tomorrow, as time permits). My guess is that the fix is the rather large commit git-for-windows/msys2-runtime@063e7da.

[dscho]

Uploaded!

[dscho]

Unfortunately, I had to revert the commit that fixed the jagged lines because it is the culprit for #127.

[dscho]

So this is my current state: git-for-windows/msys2-runtime@develop...debug-xp-git-bash-hang

With this, I get the following output when running by double-clicking git-bash.exe in the Windows Explorer:

creating pipe pty0-to-master.
created 0
start thread
succeeded
setting 1
set to_master to 0x6f4
close pty handles
to_master 0x6f4
duplicating cyg
to_master 0x6f4
verifying handle
setting output handle to 0x6b4
master fwd thread
pty master fwd thread
terminating master thread
force close io handle
force close cyg
getting output handle 0x6b4
set_handle_or_return
get_io_handle_cyg 0x6b8
<last two lines repeat over 6,000 times>

When running from a shortcut (created next to git-bash.exe) which points directly to ...\usr\bin\mintty.exe /usr/bin/bash --login -i, the mintty window appears as expected and the output reads:

creating pipe pty0-to-master.
created 0
start thread
succeeded
setting 1
set to_master to 0x110
master fwd thread
pty master fwd thread
close pty handles
to_master 0x110
duplicating cyg
to_master 0x110
verifying handle
setting output handle to 0x160
fixup after fork 0 1220
force close cyg
getting output handle 0x160
force close io handle
set_handle_or_return
<last line repeats 12 times, after that it seems to work normally>

There are two things that immediately jump out:

• the master fwd thread is not started (i.e. this function seems never to be called, even if the thread is started, and
• it makes sense that the shortcut already has a console handle (0x110) because it points to a console program (mintty.exe is compiled as a console program, I guess) but it makes less sense that starting from Git Bash would pass a console handle (0x6f4). This makes me believe that the real culprit might actually be that we pass stdin/stdout/stderr. It might make sense to detect when we are running as a GUI program and skip that code in that case.

I'll be away from the keyboard until Monday, so if anybody else wants to look deeper into this issue, I would be glad for any help!

[dscho]

Re-fixed in git-for-windows/msys2-runtime@069d204