AstroNvim / AstroNvim

AstroNvim is an aesthetic and feature-rich neovim config that is extensible and easy to use with a great set of plugins
https://AstroNvim.com
GNU General Public License v3.0
12.74k stars 927 forks source link

:AstroUpdate error #978

Closed rebdeg closed 2 years ago

rebdeg commented 2 years ago

Question

I recently installed AstroVIM. Now I ran :AstroUpdate, but that results in the following error: Error checking out branch: origin/main How can I fix this?

User Configuration

No response

mehalter commented 2 years ago

How did you install AstroNvim? If you go to your AstroNvim installation folder, something like ~/.config/nvim in a terminal and run git status what do you get?

azinsharaf commented 2 years ago

git status shows main as current branch, Can I check out nightly here in terminal instead of changing it in user/init.lua file. I expect that AstroUpdate would do it.

azinsharaf commented 2 years ago

@mehalter I have updated neovim to v 0.8 and wants to use Astronvim ver 2.0. Can you please show how the updater table should be? I can't make it to work. I am using the user/init.lua file.

mehalter commented 2 years ago

https://github.com/AstroNvim/AstroNvim/discussions/1020

Check out the discussion here

azinsharaf commented 2 years ago

this is my updater table but doesn't update to ver 2.0.

updater = {
    remote = "origin", -- remote to use
    channel = "nightly", -- "stable" or "nightly"
    version = "latest", -- "latest", tag name, or regex search like "v1.*" to only do updates before v2 (STABLE ONLY)
    branch = "nightly", -- branch name (NIGHTLY ONLY)
    commit = nil, -- commit hash (NIGHTLY ONLY)
    pin_plugins = nil, -- nil, true, false (nil will pin plugins on stable only)
    skip_prompts = false, -- skip prompts about breaking changes
    show_changelog = true, -- show the changelog after performing an update
    auto_reload = false, -- automatically reload and sync packer after a successful update
    auto_quit = false, -- automatically quit the current session after a successful update
    -- remotes = { -- easily add new remotes to track
    --   ["remote_name"] = "https://remote_url.come/repo.git", -- full remote url
    --   ["remote2"] = "github_user/repo", -- GitHub user/repo shortcut,
    --   ["remote3"] = "github_user", -- GitHub user assume AstroNvim fork
    -- },
  },
mehalter commented 2 years ago

What do you see if you do :AstroUpdate? Also if you go to your nvim config directory in a terminal (~/.config.nvim) what do you see when you do git status

azinsharaf commented 2 years ago
:AstroUpdate
Switching to branch: origin/nightly

Error checking out branch: origin/nightly
Press ENTER or type command to continue
$ git status
On branch nightly
Your branch is behind 'origin/nightly' by 8 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)

nothing to commit, working tree clean
mehalter commented 2 years ago

hm very strange. If you go to the directory again and run git rev-parse --abbrev-ref HEAD what do you get?

azinsharaf commented 2 years ago

nightly

mehalter commented 2 years ago

I wonder why it is getting an error, it's running that exact git command to get the branch (nightly) would be returned and we are comparing it to the branch we are trying to check out which is also nightly 🤔

If you go into the folder are you able to pull?

azinsharaf commented 2 years ago

I am fine to install a fresh version. I just don't know which updater i should use.

azinsharaf commented 2 years ago
$git pull
Updating 7cd7fc4..de74668
error: Your local changes to the following files would be overwritten by merge:
        init.lua
        lua/configs/lspconfig.lua
        lua/core/autocmds.lua
        lua/core/mappings.lua
        lua/core/options.lua
        lua/core/utils/lsp.lua
        lua/core/utils/status.lua
        lua/core/utils/ui.lua
        lua/user_example/init.lua
Please commit your changes or stash them before you merge.
Aborting
mehalter commented 2 years ago

you can make the updater settings to something as simple as:

updater = { branch = "nightly" }

you will need to remove changes made to the core files. This is unsupported and breaks the update path.

azinsharaf commented 2 years ago

ok, after a fresh install.

$nvim.exe version
NVIM v0.8.0-1210-gd367ed9b2
Build type: RelWithDebInfo
LuaJIT 2.1.0-beta3
Compiled by runneradmin@fv-az177-603

Features: -acl +iconv +tui
See ":help feature-compile"

   system vimrc file: "$VIM\sysinit.vim"
  fall-back for $VIM: "C:/Program Files (x86)/nvim/share/nvim"

Run :checkhealth for more info
  updater = {
    -- remote = "origin", -- remote to use
    -- channel = "nightly", -- "stable" or "nightly"
    -- version = "latest", -- "latest", tag name, or regex search like "v1.*" to only do updates before v2 (STABLE ONLY)
    branch = "nightly", -- branch name (NIGHTLY ONLY)
    -- commit = nil, -- commit hash (NIGHTLY ONLY)
    -- pin_plugins = nil, -- nil, true, false (nil will pin plugins on stable only)
    -- skip_prompts = false, -- skip prompts about breaking changes
    -- show_changelog = true, -- show the changelog after performing an update
    -- auto_reload = false, -- automatically reload and sync packer after a successful update
    -- auto_quit = false, -- automatically quit the current session after a successful update
    -- remotes = { -- easily add new remotes to track
    --   ["remote_name"] = "https://remote_url.come/repo.git", -- full remote url
    --   ["remote2"] = "github_user/repo", -- GitHub user/repo shortcut,
    --   ["remote3"] = "github_user", -- GitHub user assume AstroNvim fork
    -- },
  },

:Astroversion -- > v1.10.0-71-gde74668

:AstroUpdate                                                                                                                                 
No updates available                                                                                        
Press ENTER or type command to continue 
mehalter commented 2 years ago

looks perfect @azinsharaf !

azinsharaf commented 2 years ago

but it still shows 1.10 version. I wanted to use 2.0.

mehalter commented 2 years ago

@azinsharaf v2.0 has not been released yet. The version you have is showing that you have 71 commits after v1.10.0. If you have a stable version installed then it will just show the number. v2.0 gets tagged on Friday