Question

我的闪存驱动器上有一个本地工作副本仓库和一个远程仓库。我之前已经推到了闪存盘，但我似乎无法再这样做了。

在这里，我进入了我的flashdrive上的远程仓库，看看我在哪个分支上查看日志。然后我回到我的工作副本本地仓库，编辑了一个文件，添加了该文件，做了一个提交并尝试将其推送到我的flashdrive但它没有用。可以说出我做错了吗？

David-Adamss-MacBook-Pro:~ davidadams$ cd /volumes/thumbdrive/repo/releventz
David-Adamss-MacBook-Pro:releventz davidadams$ git status
# On branch master
# Your branch is ahead of 'origin/master' by 2 commits.
#
nothing to commit (working directory clean)
David-Adamss-MacBook-Pro:releventz davidadams$ git branch
* master
David-Adamss-MacBook-Pro:releventz davidadams$ git log
commit 65328c9603f62b7a2058f38fb441605b0c4c431e
Author: David Adams <adams.david.10@gmail.com>
Date:   Wed Jun 29 23:30:40 2011 -0500

    third commit

commit b3883fa933609db634b98d747299c1e9c96e8269
Author: David Adams <adams.david.10@gmail.com>
Date:   Wed Jun 29 23:10:53 2011 -0500

    second commit

commit 54832381a6fe898408c9e07bc8409a2982ec6274
Author: David Adams <adams.david.10@gmail.com>
Date:   Wed Jun 29 22:20:04 2011 -0500

    changed checklist.php

commit 1955664689313a589543576477e0a134f26cc313
Author: David Adams <adams.david.10@gmail.com>
Date:   Wed Jun 29 22:12:53 2011 -0500

    first releventz commit
David-Adamss-MacBook-Pro:releventz davidadams$ cd
David-Adamss-MacBook-Pro:~ davidadams$ cd
David-Adamss-MacBook-Pro:~ davidadams$ cd /applications/mamp/htdocs/releventz
David-Adamss-MacBook-Pro:releventz davidadams$ git status
# On branch master
nothing to commit (working directory clean)
David-Adamss-MacBook-Pro:releventz davidadams$ git status
# On branch master
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#   modified:   application/libraries/calendarclass.php
#
no changes added to commit (use "git add" and/or "git commit -a")
David-Adamss-MacBook-Pro:releventz davidadams$ git add .
David-Adamss-MacBook-Pro:releventz davidadams$ git status
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#   modified:   application/libraries/calendarclass.php
#
David-Adamss-MacBook-Pro:releventz davidadams$ git commit -m 'blah blah'
[master 853232d] blah blah
 1 files changed, 1 insertions(+), 1 deletions(-)
David-Adamss-MacBook-Pro:releventz davidadams$ git push flashdrive master
Counting objects: 17, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (12/12), done.
Writing objects: 100% (12/12), 1.89 KiB, done.
Total 12 (delta 8), reused 0 (delta 0)
Unpacking objects: 100% (12/12), done.
remote: error: refusing to update checked out branch: refs/heads/master
remote: error: By default, updating the current branch in a non-bare repository
remote: error: is denied, because it will make the index and work tree inconsistent
remote: error: with what you pushed, and will require 'git reset --hard' to match
remote: error: the work tree to HEAD.
remote: error: 
remote: error: You can set 'receive.denyCurrentBranch' configuration variable t
remote: error: 'ignore' or 'warn' in the remote repository to allow pushing int
remote: error: its current branch; however, this is not recommended unless you
remote: error: arranged to update its work tree to match what you pushed in som
remote: error: other way.
remote: error: 
remote: error: To squelch this message and still keep the default behaviour, se
remote: error: 'receive.denyCurrentBranch' configuration variable to 'refuse'.
gTo /volumes/thumbdrive/repo/releventz
 ! [remote rejected] master -> master (branch is currently checked out)
    error: failed to push some refs to '/volumes/thumbdrive/repo/releventz'

Answer 1

您不能推送到已签出代码的其他存储库。 Git拒绝更新它。

如果你真的需要闪存驱动器上的备份仓库，而且你永远不会在其中编辑内容，那么请将其改为裸仓库。

如果您将其用作编辑内容的第二个位置，那么请转到该回购并从基于磁盘的回购中取出。 IE，总是拉进入一个活跃使用的存储库，永远不会推送。

[是的，你可以解决这个问题，但你不应该这样做]

Answer 2

今天我遇到了同样的错误。我就像Bill Door的回答一样解决了问题。也许你可以这样做：

David-Adamss-MacBook-Pro:~ davidadams$ cd /volumes/thumbdrive/repo/releventz
David-Adamss-MacBook-Pro:~ davidadams$ git checkout subbranch
David-Adamss-MacBook-Pro:~ davidadams$ cd /applications/mamp/htdocs/releventz
David-Adamss-MacBook-Pro:~ davidadams$ git push flashdrive master

Answer 3

Wes提供了两个很好的答案。另一种解决方案是创建第二个分支。转到源存储库并检出第二个分支。您现在可以从工作存储库推送到主分支。

cd master_repo
git checkout -b stepaside
cd work_repo
git push

后续推送您可以替换为

cd master_repo
git checkout stepaside
cd work_repo
git push

Answer 4

另一种选择是不在flashdrive上拥有完整的非裸（甚至是裸）repo（因为它确保很多文件正确复制到远程存储设备上，但要更新 bundle 。

git包是一个文件（通过USB驱动器更容易复制）您可以从该文件中提取，以便在您需要的任何地方重新创建完整的回购请参阅“How to synchronize two git repositories”作为插图。

git push remote repo

4 个答案: