Git Product home page Git Product logo

Comments (7)

j-palms avatar j-palms commented on September 22, 2024 9

you have to delete the _upgrade_master branch:
git branch -d _upgrade_master

from doomemacs.

hlissner avatar hlissner commented on September 22, 2024 1

Please run these commands in your .emacs.d directory and report back their output:

git name-rev --name-only HEAD
git fetch --force --tags _upgrade master:_upgrade_master

from doomemacs.

rubin55 avatar rubin55 commented on September 22, 2024 1

@hlissner I just did:

$ git pull --rebase
$ git diff 3f966f49d8f97202ef018b51e24f65f629750182

Which shows:

diff --git a/lisp/cli/install.el b/lisp/cli/install.el
index 1836489e8..edb96cd2a 100644
--- a/lisp/cli/install.el
+++ b/lisp/cli/install.el
@@ -67,7 +67,7 @@ Change `$DOOMDIR' with the `--doomdir' option, e.g.
                   (if (file-exists-p filename)
                       (print! (item "Skipping %s (already exists)...") (path filename))
                     (print! (item "Creating %s...") (path filename))
-                    (doom-file-write filename template)
+                    (with-temp-file template (insert-file-contents template))
                     (print! (success "Done!")))))
               (let ((template-dir (doom-path doom-emacs-dir "templates")))
                 `((,doom-module-init-file

Then I did doom sync -u and everything seems to be fine again.

from doomemacs.

hlissner avatar hlissner commented on September 22, 2024

This happens if there is a network connection issue. No other option but to try again later. As this isn't a bug Doom can do anything about, I will close this.

Side-note: git pull and doom upgrade is redundant. Either do doom upgrade alone or git pull && doom sync -u, not both.

from doomemacs.

rubin55 avatar rubin55 commented on September 22, 2024

@hlissner I really don't have a network issue! I'm posting this from the same computer. I know the git pull is redundant, but doom upgrade crashed so I figured it might have been fixed by manual pull first.

[rubin@FRAME .emacs.d (master)]$ git fetch --force --tags
[rubin@FRAME .emacs.d (master)]$ git remote -v
_upgrade	https://github.com/doomemacs/doomemacs (fetch)
_upgrade	https://github.com/doomemacs/doomemacs (push)
origin	https://github.com/hlissner/doom-emacs (fetch)
origin	https://github.com/hlissner/doom-emacs (push)
[rubin@FRAME .emacs.d (master)]$ git pull -a
Already up to date.

from doomemacs.

rubin55 avatar rubin55 commented on September 22, 2024

@hlissner

$ git name-rev --name-only HEAD
master
$ git fetch --force --tags _upgrade master:_upgrade_master
fatal: '_upgrade' does not appear to be a git repository
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.
$ git remote -v
origin	https://github.com/hlissner/doom-emacs (fetch)
origin	https://github.com/hlissner/doom-emacs (push)

from doomemacs.

arun-mani-j avatar arun-mani-j commented on September 22, 2024

Please run these commands in your .emacs.d directory and report back their output:

git name-rev --name-only HEAD
git fetch --force --tags _upgrade master:_upgrade_master
$ git name-rev --name-only HEAD
_upgrade_master

$ git fetch --force --tags _upgrade master:_upgrade_master
From https://github.com/doomemacs/doomemacs
 * [new branch]        master     -> _upgrade/master

Mine, if helpful, in anyway 😅

from doomemacs.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.