commit 0ace2525a42723ccf617b515903cdac7a19f98f58f90f1b59461216a1088152a from: Stefan Sperling date: Tue Aug 25 14:13:07 2026 UTC fix bogus "bad object" errors from 'got merge -a' when merging a tag commit - 614334a6840b30c6c7bbb68a5eea55aed0b56896ef9f0555e4506dc2e988dbd2 commit + 0ace2525a42723ccf617b515903cdac7a19f98f58f90f1b59461216a1088152a blob - e8f4d8d63c7021d42d26fd7b5853ce6e6eb25d2d727aaa3d0dc54ef82c31ab93 blob + 0e54e9849439e83fd350131493c23782a55efbcd8c604751bf6c42dd40efa32b --- lib/worktree.c +++ lib/worktree.c @@ -9259,7 +9259,8 @@ got_worktree_merge_abort(struct got_worktree *worktree if (err) goto done; - err = got_ref_resolve(&merged_commit_id, repo, commit_ref); + err = got_ref_resolve_commit_or_tag(&merged_commit_id, repo, + commit_ref); if (err) goto done;