Two fixes that are not rebases #313
Merged
Conversation
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
I ran into a very odd situation where I couldn't rebase because Git couldn't find my .gitconfig file and wouldn't make any commits. I'm still not sure exactly what the problem was, but apparently the Git child process lost some environment variable that was important. Preserving the environment in the `git rebase` invocation fixes the problem.
I introduced this error some time ago while resolving a rebase conflict. It is not caught by tests at the point in the test262 repo history where we currently are, but it will be covered by tests when we are all caught up.
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.
One fix is for a merge conflict resolution that I messed up. The other is a solution for a weird error that I got while rebasing, where
git rebasecould not find my.gitconfigfile.