claude-code - 💡(How to fix) Fix [BUG] New session branch is created from first repository commit instead of selected branch HEAD [2 comments, 2 participants]

Error Messages/Logs

TL;DR

The issue can likely be resolved by ensuring that the working branch created for the session is updated to the current HEAD of the selected branch, possibly by modifying the git commands used to initialize the session.

Guidance

• Verify that the git log --oneline command is correctly showing the commit history for the selected branch, and check if the working branch is correctly set to the current HEAD of the selected branch.
• Investigate the git commands used to initialize the session and consider modifying them to include a git pull or git rebase command to update the working branch to the current HEAD of the selected branch.
• Check the documentation for Claude Code to see if there are any configuration options or settings that can be adjusted to control how the working branch is initialized.
• Test the session with a different branch or repository to see if the issue is specific to the current setup.

Example

No code snippet is provided as the issue does not explicitly mention any specific code that needs to be modified.

Notes

The issue may be related to how Claude Code handles git branches and commits, and further investigation into the git commands used by Claude Code may be necessary to resolve the issue.

Recommendation

Apply workaround: Modify the git commands used to initialize the session to include a git pull or git rebase command to update the working branch to the current HEAD of the selected branch, as manually running git rebase origin/main resolved the issue in the reported case.