git pull fails “unable to resolve reference” “unable to update local ref”

问题

由于有人rebase了分支，或者不知道怎么搞的。其他人拉取代码的时候，发现拉不下来。

>git fetch

error: cannot lock ref 'refs/remotes/origin/xxx-branch': is at 8117caf7b1c88b2d5dfebd7581f6891d87b9abee but expected f38e8d35ae8ea7f177c537a98f4140dd76b8e2bd
From xxxxxxx-git-url
 ! f38e8d35..9d7b8e7a  xxx-branch -> origin/xxx-branch  (unable to update local ref)

解决方案

尝试clean本地git

$ git gc --prune=now
$ git remote prune origin

man git-gc(1):

git-gc - Cleanup unnecessary files and optimize the local repository

git gc [--aggressive] [--auto] [--quiet] [--prune= | --no-prune]

  Runs a number of housekeeping tasks within the current >repository, such as compressing file revisions
  (to reduce disk space and increase performance) and removing unreachable objects which may have been
  created from prior invocations of git add.

  Users are encouraged to run this task on a regular basis within each repository to maintain good disk
  space utilization and good operating performance.

man git-remote(1):

git-remote - manage set of tracked repositories

git remote prune [-n | --dry-run]

      Deletes all stale remote-tracking branches under <name>. These stale branches have already been
      removed from the remote repository referenced by <name>, but are still locally available in
      "remotes/<name>".