fix: resolve short SHAs in daemon cherry-pick synthesis#806
Merged
Conversation
…esis The daemon's cherry-pick source commit extraction only accepted full 40/64-char OIDs, silently dropping short SHAs and branch names. This caused "missing cherry-pick source commits" errors when users ran e.g. `git cherry-pick abc123` instead of the full SHA. Now collects all positional args as potential commit refs, then resolves them to full OIDs via `git rev-parse` in the async side-effect path (not the daemon critical path). This mirrors the existing pattern used for merge-squash source resolution. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
![devin-ai-integration[bot]](https://avatars.githubusercontent.com/in/811515?s=60&v=4){kind=small}
Apply rustfmt formatting and add a regression test verifying that `git rebase <short-sha>` correctly emits rebase_complete in daemon mode. Rebase already handles this via fallback paths (unlike cherry-pick which had a hard failure). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
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
1 participant
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
is_valid_oid, silently dropping short SHAs (e.g.757da0) and symbolic refs (e.g. branch names) passed on the command linecherry_pick_source_commits_from_command→cherry_pick_source_refs_from_commandto collect all positional args as potential commit refsresolve_cherry_pick_source_refsthat expands unresolved refs to full OIDs viagit rev-parsein the async side-effect path (not the daemon critical path), mirroring the existing pattern used for merge-squash source resolutioncherry_pick_completeis emitted with the full resolved SHATest plan
daemon_pure_trace_socket_cherry_pick_with_short_sha_emits_complete_eventpasses🤖 Generated with Claude Code