Remote rejected (shallow update not allowed) after changing Git remote URL

前端 未结 6 968
悲&欢浪女
悲&欢浪女 2020-11-28 02:16

I have a project under Git version control that I worked on both a server and my local computer. I originally had the remote origin set as my local computer but I would now

相关标签:
6条回答
  • 2020-11-28 02:47

    In case your repo is origin, and the original repo is upstream:

    git fetch --unshallow upstream
    
    0 讨论(0)
  • 2020-11-28 02:52

    As it seems you have used git clone --depth <number> to clone your local version. This results in a shallow clone. One limitation of such a clone is that you can't push from it into a new repository.

    You now have two options:

    1. if you don't care about you're current or missing history, take a look at this question
    2. if you want to keep your full history, then continue reading:

    So, you want to keep your history, eh? This means that you have to unshallow your repository. To do so you will need to add your old remote again.

    git remote add old <path-to-old-remote>
    

    After that we use git fetch to fetch the remaining history from the old remote (as suggested in this answer).

    git fetch --unshallow old
    

    And now you should be able to push into your new remote repository.


    Note: After unshallowing your clone you can obviously remove the old remote again.

    0 讨论(0)
  • 2020-11-28 02:52

    Based on the most upvoted answer, I created an alias to automate things:

    Add to your .gitconfig:

    [alias]
        unshallow = !"git fetch --unshallow \"${1:-origin}\" # Unshallow from remote $1 (defaults to origin)"
    

    Usage:

    • git unshallow # unshallow current branch based on the origin remote
    • git unshallow other-remote # unshallow current branch from remote other-remote
    0 讨论(0)
  • 2020-11-28 02:55

    If you want to push the new repo as it is, you can try this:

    • First remove the old git folder from your current repo,sudo rm -rf .git
    • Then initialize the git again git init
    • Then add the new remote repo git remote add your-new-repo
    • Then Push it.
    0 讨论(0)
  • 2020-11-28 02:55

    Another option if you want to keep the repo as is with the new commits you have added since the shallow, initial commit is this: Amend this commit with an interactive rebase.

    • Start an interactive rebase including the first (root) commit with

      git rebase --interactive --root
      
    • Change the pick of the initial commit(s) to edit and save & close the file.

      If you've cloned the repo with greater depth than 1, you may need to do the same for all of those commits. Or, alternatively, execute fixup for all of these during the interactive rebase.

    • Convert this commit to a regular, unshallow commit with

      git commit --amend --no-edit
      

      This will also change the commit ID and add you as co-author to this initial commit.

    • Don't forget to finish your rebase

      git rebase --continue
      
    0 讨论(0)
  • 2020-11-28 02:56

    If fetching --unshallow doesn't work. There must be some problems with your branch. Fix it with the following command before pushing it.

    git filter-branch -- --all
    

    Do this only with --unshallow doesn't work since there's a SAFETY concern.

    0 讨论(0)
提交回复
热议问题