Skip to content
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

Better git path handling #864

Closed
wants to merge 205 commits into from
Closed

Conversation

jankatins
Copy link
Contributor

This PR contains three commits

mikesigs and others added 30 commits February 22, 2015 23:48
I was annoyed at having to use short paths all the time in my aliases. It wasn't until I found a command that actually refused to work with a shortpath (running iisexpress.exe) I was determined to find a solution. 

It appears that the reason the quoted paths weren't working was due to the ::validate alias stuff. The for command would stumble on a quoted path, arguing that /foo was unexpected...

The additions on lines 7-8 wrap the input in quotes and then strip the inner quotes. This variable is used in the for loop (instead of %*) for validating the alias. So long as the alias is valid (contains no spaces) then the existing method of appending the new alias to the aliases file works just fine because it still uses %*.
…`ConEmu-%COMPUTERNAME%.ini`, before checking for the standard ini file `ConEmu.ini`.
$PSScriptRoot is not available on PS version 2 or below.

So we'll set it ourselves.
Add bundled git to PATH if we can't find git on PATH.
This reverts commit 53efab1.
This is not needed and confuses users.
The function Enable-GitColors is depreciated in dahlbyk/posh-git@4e778e2 and should be removed here as well.
Remove depreciated Enable-GitColors in posh-git
update VS to 2015 release version and switch to /MT for static linking
MartiUK and others added 29 commits February 9, 2016 13:57
For releases.
Should now just be a 120x30 at the 500x500px position and saves size
and position on close.
Since Git 1.7.8, submodules don't contain a .git/ folder anymore.
Instead, the submodule directory is populated with a .git text file
which contains a git-dir: /path/to/superproject/git_dir/modules/name.

See,
https://github.com/git/git/blob/master/Documentation/RelNotes/1.7.8.txt#L109-L114
Fixed get_git_dir() to take submodules into account. Fixes cmderdev#833
Added profile.d like support for all supported shells
The idea is:
* if the users points as to a specific git, use that
* test if a git is in path and if yes, use that
* last, use our vendored git

We don't make any attempt to guess a different location, if a user wants their
own git install, they have to choose "add git to path".

Also check that we have a recent enough version of git (e.g. test for
<GIT>\cmd\git.exe)
Some unix commands shadow windows commands and therefor the unix commands should
be at the end of the PATH
@jankatins jankatins closed this Mar 2, 2016
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.