Skip to content

git-gui (Windows): use git-bash.exe if it is available #360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from

Conversation

dscho
Copy link
Member

@dscho dscho commented Sep 26, 2019

... and yet another patch that is carried in Git for Windows for quite a long time.

This commit was contributed as https://github.com/patthoyts/git/gui/pull/6 which was ignored for almost three years, and then as prati0100/git-gui#2 which was rejected in favor of a mailing list-centric workflow.

The patch is based on Git GUI's master branch at https://github.com/prati0100/git-gui/.

Cc: Pratyush Yadav [email protected]

Git for Windows 2.x ships with an executable that starts the Git Bash
with all the environment variables and what not properly set up. It is
also adjusted according to the Terminal emulator option chosen when
installing Git for Windows (while `bash.exe --login -i` would always
launch with Windows' default console).

So let's use that executable (usually C:\Program Files\Git\git-bash.exe)
instead of `bash.exe --login -i` if its presence was detected.

This fixes git-for-windows#490

Signed-off-by: Thomas Kläger <[email protected]>
Signed-off-by: Johannes Schindelin <[email protected]>
@dscho
Copy link
Member Author

dscho commented Sep 26, 2019

/submit

@gitgitgadget
Copy link

gitgitgadget bot commented Sep 26, 2019

Submitted as [email protected]

@@ -2700,10 +2700,18 @@ if {![is_bare]} {
}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On the Git mailing list, Pratyush Yadav wrote (reply to this):

On 26/09/19 10:46AM, Thomas Klaeger via GitGitGadget wrote:
> From: Thomas Klaeger <[email protected]>
> 
> Git for Windows 2.x ships with an executable that starts the Git Bash
> with all the environment variables and what not properly set up. It is
> also adjusted according to the Terminal emulator option chosen when
> installing Git for Windows (while `bash.exe --login -i` would always
> launch with Windows' default console).
> 
> So let's use that executable (usually C:\Program Files\Git\git-bash.exe)
> instead of `bash.exe --login -i` if its presence was detected.
> 
> This fixes https://github.com/git-for-windows/git/issues/490
> 
> Signed-off-by: Thomas Kl�ger <[email protected]>

While applying the patch, my patch check script complained that the 
author did not sign off.

Well, they did... but with a slightly different name (Kl�ger vs  
Klaeger) and a completely different email address.

I'm not sure if I can do something about it, just thought it was 
something worth mentioning.

-- 
Regards,
Pratyush Yadav

@dscho
Copy link
Member Author

dscho commented Nov 4, 2019

This finally made it upstream as 6a72d44 (git-gui (Windows): use git-bash.exe if it is available, 2019-09-26)

@dscho dscho closed this Nov 4, 2019
@dscho dscho deleted the git-gui-git-bash branch November 4, 2019 09:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants