git pull 必须被调用两次——获取后停止，然后只执行 merge

Question

我遇到了与 git pull 命令相关的奇怪行为。似乎它只执行获取并在那之后停止。第二个 git pull 更新我的本地分支执行 merge 。

这是命令的输出:

$ git co develop
Switched to branch 'develop'
Your branch is behind 'origin/develop' by 45 commits, and can be fast-forwarded.
 (use "git pull" to update your local branch)

$ git pull
remote: Counting objects: 7, done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3 (delta 2), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.

$  git st
On branch develop
Your branch is behind 'origin/develop' by 47 commits, and can be fast-forwarded.
 (use "git pull" to update your local branch)
nothing to commit, working directory clean

$ git pull
Updating f80464f..61ee4c1
Fast-forward
.../i18n/Views.Account.Login.es.resx               |    2 +-
.../i18n/Views.Account.Login.fr.resx               |    2 +-
.../i18n/Views.Account.Login.id.resx               |    2 +-
...here goes list of files

我在 Windows 上使用 git bash，远程 git 服务器是 Atlassian 的 BitBucket。什么会导致这种行为？

Answer 1

可能是提取触发了后台垃圾收集，这可能会阻止后续 merge 。尝试设置 git config gc.autoDetach false 并查看之后是否发生这种情况。