Repository navigation
remote: Handle missing config values when deleting a remote - #3862
Merged
ethomson merged 1 commit intoJul 24, 2016
Merged
ethomson merged 1 commit into
ethomson merged 1 commit into
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
Comment thread
src/remote.c
| break; | ||
| if ((error = git_config_delete_entry(config, git_buf_cstr(&buf))) < 0) { | ||
| if (error != GIT_ENOTFOUND) | ||
| break; |
Copy link
Copy Markdown
Member
There was a problem hiding this comment.
Could I trouble you to do a giterr_clear() here to remove the error message that git_config_delete_entry added? We would like to avoid leaving that error message hanging around when there isn't actually an error.
Sorry, something went wrong.
Copy link
Copy Markdown
Member
|
👍 Thanks. :D |
Sorry, something went wrong.
Somehow I ended up with the following in my ~/.gitconfig: [branch "master"] remote = origin merge = master rebase = true I assume something went crazy while I was running the git.git tests some time ago, and that I never noticed until now. This is not a good configuration, but it shouldn't cause problems. But it does. Specifically, if you have this in your config, and you perform the following set of actions: create a remote fetch from that remote create a branch off of the remote master branch called "master" delete the branch delete the remote The remote delete fails with the message "Could not find key 'branch.master.rebase' to delete". This is because it's iterating over the config entries (including the ones in the global config) and believes that there is a master branch which must therefore have these config keys. libgit2#3856
novalis
force-pushed
the
dturner/do-not-die-on-missing-config
branch
from
ad971b5 to
d81cb2e
Compare
July 15, 2016 17:47
Copy link
Copy Markdown
Contributor
Author
|
(done) |
Sorry, something went wrong.
Copy link
Copy Markdown
Member
|
Thanks! |
Sorry, something went wrong.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Somehow I ended up with the following in my ~/.gitconfig:
[branch "master"]
remote = origin
merge = master
rebase = true
I assume something went crazy while I was running the git.git tests
some time ago, and that I never noticed until now.
This is not a good configuration, but it shouldn't cause problems. But
it does. Specifically, if you have this in your config, and you
perform the following set of actions:
create a remote
fetch from that remote
create a branch off of the remote master branch called "master"
delete the branch
delete the remote
The remote delete fails with the message "Could not find key
'branch.master.rebase' to delete". This is because it's iterating over
the config entries (including the ones in the global config) and
believes that there is a master branch which must therefore have these
config keys.
#3856