Use git environment variables if set #42
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thank you for catching it. I didn't know |
rhysd
requested changes
Feb 23, 2018
autoload/committia/git.vim
Outdated
| " Use environment variables if set | ||
| if !empty($GIT_DIR) && !empty($GIT_WORK_TREE) | ||
| return [$GIT_DIR, $GIT_WORK_TREE] | ||
| endif |
There was a problem hiding this comment.
$GIT_WORK_TREE is set by user and the path must be existing. So $GIT_WORK_TREE should be verified as follows:
if !empty($GIT_DIR) && !empty($GIT_WORK_TREE) && isdirectory($GIT_WORK_TREE)
return [$GIT_DIR, $GIT_WORK_TREE]
endifThere was a problem hiding this comment.
Or should we explicitly raise an error rather than falling back into automatic worktree detection silently?
if !empty($GIT_DIR) && !empty($GIT_WORK_TREE)
if !isdirectory($GIT_WORK_TREE)
throw 'Directory specified with $GIT_WORK_TREE is not found: ' . $GIT_WORK_TREE
endif
return [$GIT_DIR, $GIT_WORK_TREE]
endifEither look ok for me.
There was a problem hiding this comment.
Good point, I set GIT_WORK_TREE manually, that's correct. I like the variant throwing an error because git cannot operate if the value of GIT_WORK_TREE is invalid:
✔ test master@HEAD$ GIT_WORK_TREE="/tmp/invalid" git status
fatal: This operation must be run in a work tree
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Git also uses the
GIT_DIRandGIT_WORK_TREEenvironment variables , which should be preferred if set.This does not fix #37 yet, but provides a base for vcsh to work. Vcsh only has to export those environment variables and it will work.
In the meantime, other scripts relying on those variables will work right away.