Skip to content

Override bash executable, defaulting to Git for Windows git bash over WSL bash #1791

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.

Sign up for GitHub

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

Open
emanspeaks wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Override bash executable, defaulting to Git for Windows git bash over WSL bash #1791

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
77f74ce
initial patch to use git bash rather than WSL
emanspeaks Jan 9, 2024
4bde10d
fix typos preventing import
emanspeaks Jan 9, 2024
6676668
remove rogue temp file
emanspeaks Jan 9, 2024
50c74f4
updates after running black
emanspeaks Jan 9, 2024
bf919f6
Merge branch 'main' into fix-bash-exe
emanspeaks Jan 21, 2024
f065d1f
address first round of comments from PR #1791
emanspeaks Jan 21, 2024
0c14cac
address lint issue
emanspeaks Jan 21, 2024
8200ad1
possible fix to test_hook_uses_shell_not_from_cwd
emanspeaks Jan 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into fix-bash-exe
  • Loading branch information
@emanspeaks
emanspeaks committed Jan 21, 2024
commit bf919f678265de2a2699c1414e57a4191b119262
1 change: 1 addition & 0 deletions AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ Contributors are:
-Santos Gallegos <stsewd _at_ proton.me>
-Wenhan Zhu <wzhu.cosmos _at_ gmail.com>
-Eliah Kagan <eliah.kagan _at_ gmail.com>
-Ethan Lin <et.repositories _at_ gmail.com>
-Randy Eckman <emanspeaks _at_ gmail.com>

Portions derived from other open source works and are clearly marked.
2 changes: 1 addition & 1 deletion git/index/fun.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
)
import subprocess

from git.cmd import PROC_CREATIONFLAGS, handle_process_output, Git
from git.cmd import handle_process_output, Git, safer_popen
from git.compat import defenc, force_bytes, force_text, safe_decode
from git.exc import HookExecutionError, UnmergedEntriesError
from git.objects.fun import (
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.