Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

two minor patches to make git play more nicely in the mingw environment #1

Closed
junkshow wants to merge 2 commits into from
Closed

two minor patches to make git play more nicely in the mingw environment #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d48d298
simplify git completion while loop to prevent git PS1 from breaking i…
geekherder Sep 16, 2011
1bffb9a
modify git-submodule local variable name to avoid msys confusing it w…
geekherder Sep 16, 2011
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
6 changes: 3 additions & 3 deletions contrib/completion/git-completion.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ __git_ps1_show_upstream ()
local upstream=git legacy="" verbose=""

# get some config options from git-config
(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ') |\
while read key value; do
case "$key" in
bash.showupstream)
Expand All @@ -125,8 +126,7 @@ __git_ps1_show_upstream ()
upstream=svn+git # default upstream is SVN if available, else git
;;
esac
done < <(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ')

done
# parse configuration values
for option in ${GIT_PS1_SHOWUPSTREAM}; do
case "$option" in
Expand Down Expand Up @@ -2058,7 +2058,7 @@ _git_config ()
color.ui
commit.status
commit.template
core.abbrevguard
core.abbrev
core.askpass
core.attributesfile
core.autocrlf
Expand Down
Loading