Skip to content

Correctly write to missing locked global config - #5023

Merged
pks-t merged 1 commit into
libgit2:masterfrom
ianhattendorf:fix/lock_missing_global_config
May 2, 2019
Merged

Correctly write to missing locked global config#5023
pks-t merged 1 commit into
libgit2:masterfrom
ianhattendorf:fix/lock_missing_global_config

Conversation

@ianhattendorf

Copy link
Copy Markdown
Contributor

Opening a default config when ~/.gitconfig doesn't exist, locking it,
and attempting to write to it causes an assertion failure.

Treat non-existent global config file content as an empty string.

implausible added a commit to nodegit/nodegit that referenced this pull request Mar 20, 2019

@pks-t pks-t left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your PR! The proposed fix looks good to me, but there's a conflict in our tests due to #5034. Could you please rebase to fix it?

Opening a default config when ~/.gitconfig doesn't exist, locking it,
and attempting to write to it causes an assertion failure.

Treat non-existent global config file content as an empty string.
@ianhattendorf
ianhattendorf force-pushed the fix/lock_missing_global_config branch from 21db791 to e44110d Compare April 30, 2019 00:21
@ianhattendorf

Copy link
Copy Markdown
Contributor Author

Good to hear, just pushed up the rebased changes.

@ianhattendorf

Copy link
Copy Markdown
Contributor Author

/rebuild

@libgit2-azure-pipelines

Copy link
Copy Markdown

Okay, @ianhattendorf, I started to rebuild this pull request as build #1861.

@pks-t
pks-t merged commit 957940b into libgit2:master May 2, 2019
@pks-t

pks-t commented May 2, 2019

Copy link
Copy Markdown
Member

Thanks for resolving the conflict and thanks for your fix in general!

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.

3 participants