use .lfsconfig (with fallback to .gitconfig) #837
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
Merged
| fileOutput, err := git.Config.ListFromFile(configFile) | ||
| if err != nil { | ||
| panic(fmt.Errorf("Error listing git config from %s: %s", configFile, err)) | ||
| // TODO: remove .gitconfig support for Git LFS v2.0 |
There was a problem hiding this comment.
Add the issue # tracking this work so that when we complete the work we know to remove the TODO.
technoweenie
added a commit
that referenced
this pull request
Nov 18, 2015
use .lfsconfig (with fallback to .gitconfig)
| @@ -280,9 +280,6 @@ func (c *gitConfig) List() (string, error) { | |||
|
|
|||
| // ListFromFile lists all of the git config values in the given config file | |||
| func (c *gitConfig) ListFromFile(f string) (string, error) { | |||
| if _, err := os.Stat(f); os.IsNotExist(err) { | |||
| return "", nil | |||
| } | |||
| return simpleExec("git", "config", "-l", "-f", f) | |||
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.
This changes Git LFS to read committed lfs config settings from
.lfsconfiginstead of.gitconfig. This makes it more clear what settings should go in that file. It does continue to check for.gitconfigbut only IF.lfsconfigdoes not exist. This is meant as a way for projects to gradually rename this file on their own. By Git LFS v2.0, we'll remove support completely.This also makes a few other changes:
ListFromFile()doesn't runos.Statanymore. The newreadGitConfigFromFiles()function minimizesos.Statcalls.git configcalls. No need to callgit config --listANDgit config --file .git/config --list. Now it only callsgit config --file .lfsconfig --listandgit config --list.Fixes #780