Skip to content

Two fixes that are not rebases #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 20, 2025
Merged

Two fixes that are not rebases #313

merged 2 commits into from
Mar 20, 2025

Conversation

ptomato
Copy link
Contributor

@ptomato ptomato commented Mar 18, 2025

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 rebase could not find my .gitconfig file.

ptomato added 2 commits March 18, 2025 12:22
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.
@ptomato ptomato requested review from justingrant and 12wrigja March 18, 2025 19:45
Copy link
Contributor

@justingrant justingrant left a comment

Choose a reason for hiding this comment

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

👍

@ptomato ptomato merged commit 26c7df4 into main Mar 20, 2025
19 checks passed
@ptomato ptomato deleted the misc branch March 20, 2025 01:28
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.

2 participants