Repository navigation
fix(push): avoid fatal errors when pushing a branch with no own commits - #83
Merged
Merged
Conversation
get_push_list found the base commit by diffing the first-parent histories of the current and main branches. When both are identical (a fresh branch with no commits of its own) diff prints nothing, so it fell back to origin/<main>..HEAD, which fails loudly when the main branch isn't on the remote. Fall back to git merge-base, and only use origin/<main> when that ref actually exists. Affects gitb push, gitb commit fp and the branch-switch summary. Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_01CJJ6pKYtogfzy6MJFMpYgo
|
🎉 This PR is included in version 5.3.1 🎉 The release is available on: Your semantic-release bot 📦🚀 |
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
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.
Summary
get_push_listfound the base commit by runningdiff -uon the first-parent histories of the current and main branches. When the two are identical (a new branch with no commits of its own, e.g.developjust created frommain),diffprints nothing. The code then fell back toorigin/<main>..HEAD, which printedfatal: ambiguous argument ... unknown revisiontwice when that ref isn't on the remote.git merge-baseand only usesorigin/<main>when that ref actually exists. Otherwise it lists the branch's history, the same as the existing new-repo case.gitb push,gitb commit fp, and the branch-switch summary, since all three callget_push_list.Linked issue
None. Reported directly by the user, with screenshots of
gitb pandgitb c fp.Type of change
Test plan
tests/test_repository_helpers.bats. The empty-branch test fails without the fix and passes with it.tests/test_repository_helpers.batsandtests/test_git_operations.batspass (58/58)tests/bash32_compat_check.shpassesCompatibility
git merge-baseandgit rev-parse --verify --quiet)Checklist
gitinvocations are quoted🤖 Generated with Claude Code
https://claude.ai/code/session_01CJJ6pKYtogfzy6MJFMpYgo
Generated by Claude Code