parser fails when getting git sources that have merge conflicts
Metadata
Current evaluation
Fixed by snapcore/snapcraft#1052, merged as commit d22880fdc, making Git pulls more resilient to history changes and merge conflicts.
Resolution: closed resolved
Reason: The parser issue was resolved by PR snapcore/snapcraft#1052, whose change is recorded in commit d22880fdc as making Git pulls less error-prone when repository history changes.
Evaluated by: mr-cal-bot
No scores available.
Issue body
This shouldn't bring the parser to a grinding halt.
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed resolved | Fixed by snapcore/snapcraft#1052, merged as commit d22880fdc, making Git pulls more resilient to history changes and merge conflicts. | |
| stealth/space-bunny-alpha | — | closed resolved | Parser Git-source merge failures were fixed by merged PR snapcraft#1052 in commit d22880fdc, making Git pulls safer when repository history changes. | |
| stealth/space-bunny-alpha | — | closed resolved | Fixed by merged PR #1052 (commit d22880fdc), making Git pulls resilient to source history changes and preventing parser failures after merge conflicts. | |
| stealth/space-bunny-alpha | — | closed stale | Closed without a recorded fix after about nine years of inactivity; no resolving PR or commit was found for the parser failure on conflicted git sources. | |
| qwen/qwen3.6-35b-a3b | — | — | Closed without resolution. The parser crash when fetching git sources with merge conflicts received no comments and remained inactive for over nine years, indicating abandonment. | |
| qwen/qwen3.6-35b-a3b | — | — | Closed without resolution. The parser failure on git sources with merge conflicts received no discussion or fix details. | |
| qwen/qwen3.6-35b-a3b | — | — | Closed without a documented fix or resolution. The parser halting on git sources with merge conflicts was abandoned, as no comments or associated pull requests were recorded. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Closed without a fix or comments. The parser failure on git sources with merge conflicts remains unresolved, likely due to project inactivity. |
Update history
| Date | Change |
|---|---|
| created |
Related work
-
Likely Fixed By:
snapcore/snapcraft#1052
(confidence 99%)
The linked PR was merged as commit d22880fdc and directly addressed Git pull failure caused by history changes and merge conflicts.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #1817907 building part with git source-commit not found in master fails | snapcraft (launchpad) | closed | Fixed in snapcore/snapcraft#2968 (commit 3941e7918): Snapcraft now fetches a specified source-commit before checkout, including commits outside the default branch. | |
| #217 added test for git sources in the get() method in snapcraft/sources.py | snapcraft | closed | Closed unmerged; its Git-source tests were reworked and merged through successor PR #233 in commit f909dc292. | |
| #1516228 missing " git://" in the source crashes the snapcraft | snapcraft (launchpad) | closed | Fixed in Snapcraft 0.5/master: a bare GitHub source no longer crashes and now reports "local source is not a directory" through pull-step handling (PR #448). | |
| #1828548 Git source pull crashes if git not installed | snapcraft (launchpad) | closed | Resolved by bundling Git with Snapcraft, removing the need for a system Git executable; the issue was closed after a maintainer confirmed the bundle. | |
| #1957767 no way to use non-recursive git source | snapcraft (launchpad) | closed | Merged in snapcore/snapcraft#3629, adding configurable Git submodule fetching so non-recursive clones can be requested. |