-
-
Notifications
You must be signed in to change notification settings - Fork 31
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Support]: Unable to update/install magit, magit-section, transient, with-editor, ghub, borg, epkg #343
Comments
Thanks for taking the time to fill out a bug report. My advice is to update your declarations to use the main branch for those packages. e.g. (elpaca (magit :branch "main" :pre-build ("make" "info"))) @tarsius updated the MELPA recipes for several of his packages to |
@progfolio thank you for the response. Setting the branch resolves the issue. It seems more like a workaround than a fix though - I think most people would expect to be able to add |
Glad to hear it.
I can't control the recipes that are in the wild. |
Please share text instead of screenshots in the future.
The error in the log means that the version of transient you have installed is not new enough to work with the version of git-commit you have installed (which is needed for magit). If that does not work for you, please fill out a separate issue ticket and I can work with you there. |
I'm certainly willing and motivated to work with you on finding a solution. It's bed time now, but I'll come back here tomorrow evening. |
I will try to install transient on Monday. If it wont solve the problem, I will let you know! |
Initially I was going to suggest that elpaca and straight should ignore But with that approach at least two issues remain. Users would still have to add So I think it is better after all, if elpaca and straight continued to use the branch that is set in melpa's recipe. As far as I understand, elpaca and straight currently essentially fetch the latest version/snapshot/commit using
Have you considered using the same approach as melpa?:
This wouldn't just help in this case. Minor history rewrites happen all the time, e.g., "amend to HEAD to fix a typo" is quite common. For the emacsmirror I used to use the same approach as elpaca and straight currently use. Every time someone rewrote history and it happened to pull before and after the rewrite, the update would fail, and I would have to go look at the situation and resolve it manually. That meant that I had to look at very minor and inconsequential rewrites all the time. To avoid that, I eventually switched to an approach similar to the one used by melpa. |
I switched back to the package.el and I will try the elpaca later ... |
- This is related to progfolio/elpaca#343 - solution is to point to the branch main and not the melpa one (for now)
@progfolio Have you seen this suggestion and does it sound like a workable solution? |
I have. If I go that route, I will have to implement a check which fails the order if the user has local changes prior to the hard reset. There will also be some minor refactoring needed with recipe resolution. I will experiment with it when I have time. |
Great, thanks! |
I'm checking the generated I think my suggestion above still makes sense. |
Just chiming in to agree with not treating "melpa" branch specially. I also use a branch with that name, for a different reason. |
I have no plans of adding any branch-name based heuristics for Elpaca's behavior, so nothing to worry about there. |
Edit: Forget about this. I deleted my elpaca Directory and started "fresh". Now it works. Even with all sub-packages pinned to the main branch, i'm not able to get magit installed anymore. My Config for that now looks like this:
But transient and with-editor still fail to build
transient
I also tried with just magit pinned or pulling the dependencies through use-package, both don't seem to work for me. |
Please see: https://github.com/progfolio/elpaca/wiki/Troubleshooting#dont-delete-everything
This should no longer be necessary. The MELPA recipes have been reverted to track the main branch again: What will be necessary is to
This is to be expected as the The So the best course of action would be:
Elpaca should inherit from the updated recipes and install the packages based off those when Emacs is restarted. |
Confirmation
Elpaca Version
Elpaca edc0dc2 grafted, HEAD -> master, origin/master, origin/HEAD
installer: 0.7
emacs-version: GNU Emacs 29.1 (build 1, aarch64-apple-darwin23.5.0, Carbon Version 170 AppKit 2487.6)
git --version: git version 2.45.2
Operating System
Darwin Kernel Version 23.6.0: Mon Jul 29 21:14:30 PDT 2024; root:xnu-10063.141.2~1/RELEASE_ARM64_T6030 arm64 arm Darwin
Description
It fails to merge, because of the git error shown below. The same happens for some other packages as well, such as ghub, forge and with-editor. I notice that these are all trying to use the melpa branch, but on a different system they're on main. I don't think there's anything interesting in my magit configuration, but you can see it here if you need to: https://codeberg.org/djm/dotfiles/src/branch/master/.emacs.d/lisp/init-git.el#L73
The text was updated successfully, but these errors were encountered: