git push origin master 不推送文件

Question

我已经在我的 mac 上设置了我的远程 git 和本地 git我能够在远程机器 (Linux) 上创建一个 git repo (git init myrepo)添加了几个文件并没有问题地提交它们(git add，git commit -m "test")

在我的本地，我能够毫无问题地从远程克隆 repo (git clone ssh://user@IP/Path)

到目前为止一切顺利，没有任何问题。

我在本地创建了几个文件并使用 git add 和 commit 然后尝试使用 git push origin master 将它们推送到远程服务器

最初我收到一条错误消息并搜索解决方案是直接在远程服务器上运行此命令:git config receive.denyCurrentBranch 忽略

这解决了问题，现在我可以成功推送了:

$ git push origin master

git add test.sh 
git add git*
git commit -m "Adding 2 new files and updating test.sh"
[master 4dd11a0] Adding 2 new files and updating test.sh
3 files changed, 109 insertions(+)
create mode 100644 gitHowToUrls.txt
create mode 100644 git_howto.txt
git push origin master
Counting objects: 7, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (5/5), done.
Writing objects: 100% (5/5), 1.91 KiB | 0 bytes/s, done.
Total 5 (delta 0), reused 0 (delta 0)
To ssh://root@IP/path/myrepo
ad4a8b2..4dd11a0  master -> master

$ git push -u origin master

Branch master set up to track remote branch master from origin.
Everything up-to-date

$ git push origin HEAD:master

Everything up-to-date

我什至检查以确保文件匹配

$ git ls-远程源

52543130bff4f9f37a23b01b0c44c7549ab82dd9        HEAD
52543130bff4f9f37a23b01b0c44c7549ab82dd9        refs/heads/master

$ git ls-remote

From ssh://root@IP/path/myrepo
52543130bff4f9f37a23b01b0c44c7549ab82dd9        HEAD
52543130bff4f9f37a23b01b0c44c7549ab82dd9        refs/heads/master

然而，当我访问我的远程仓库时(root@IP/path/myrepo)我看不到任何新文件!!!知道我做错了什么吗？

我在远程服务器上运行了 git log，我看到了我所有的笔记:

root@IP [myrepo]# git log
 commit 52543130bff4f9f37a23b01b0c44c7549ab82dd9
Author: joe d <myemail@myemail>
Date:   Sat Mar 22 15:56:30 2014 -0700

    adding again, since first time didn't work

 commit 4dd11a0235cdabe528f8755253989ce85df4fa8b
Author: joe d <myemail@myemail>
Date:   Sat Mar 22 15:48:08 2014 -0700

    Adding 2 new files and updating test.sh

 commit ad4a8b224989dc2131b6a33f41b95ce8b2a5c96a
Author: joe d <myemail@myemail>
Date:   Sat Mar 22 11:33:34 2014 -0700

   test

 commit 956ff16e081587fa59a8cec73fc383744c5c3a5e
Author: joe d <myemail@myemail>
Date:   Sat Mar 22 18:32:30 2014 +0000

    test

我的远程仓库:

root@IP [myrepo]# ls -la
total 20
drwxr-xr-x 4 root    root    4096 Mar 22 18:32 .
drwxr-x--- 6 joe nobody  4096 Mar 22 18:30 ..
drwxr-xr-x 8 root    root    4096 Mar 22 18:38 .git
drwxr-xr-x 2 joe joe 4096 Mar 21 22:12 images
-rw-r--r-- 1 root    root     992 Mar 22 18:31 index.html

我的本​​地仓库:

localmachine:myrepo joe$ ls -la
total 32
drwxr-xr-x   8 joe  1668562246   272 Mar 22 16:42 .
drwxr-xr-x   3 joe  1668562246   102 Mar 22 11:33 ..
drwxr-xr-x  15 joe  1668562246   510 Mar 22 16:07 .git
-rw-r--r--   1 joe  1668562246   445 Mar 22 16:42 gitHowToUrls.txt
-rw-r--r--   1 joe  1668562246  3291 Mar 22 15:56 git_howto.txt
-rwxr-xr-x   1 joe  1668562246    81 Mar 22 15:43 test.sh
drwxr-xr-x   6 joe  1668562246   204 Mar 22 11:33 images
-rw-r--r--   1 joe  1668562246   992 Mar 22 11:33 index.html

谢谢

新注释:

好的，所以我肯定没有使用裸分支，我认为它是我在远程系统上运行的命令

git config receive.denyCurrentBranch ignore

我已经删除了本地和远程的两个 repos 并重新创建了它(肯定不是 bare)

然后像这样尝试推送并收到此错误:

localrepo$ git push origin master
Counting objects: 6, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (5/5), done.
Writing objects: 100% (5/5), 1.98 KiB | 0 bytes/s, done.
Total 5 (delta 0), reused 0 (delta 0)
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 to
remote: error: 'ignore' or 'warn' in the remote repository to allow pushing into
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 some
remote: error: other way.
remote: error: 
remote: error: To squelch this message and still keep the default behaviour, set
remote: error: 'receive.denyCurrentBranch' configuration variable to 'refuse'.
To ssh://root@IP/path/myrepo
 ! [remote rejected] master -> master (branch is currently checked out)
error: failed to push some refs to 'ssh://root@IP/path/myrepo'

这次我输入的是拒绝而不是忽略

git config receive.denyCurrentBranch refuse

运行 git push 产生了一条新的错误信息:

localRepo$ git push origin master

Counting objects: 6, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (5/5), done.
Writing objects: 100% (5/5), 1.98 KiB | 0 bytes/s, done.
Total 5 (delta 0), reused 0 (delta 0)
remote: error: refusing to update checked out branch: refs/heads/master
To ssh://root@IP/path/myrepo
 ! [remote rejected] master -> master (branch is currently checked out)
error: failed to push some refs to 'ssh://root@IP/path/myrepo'

如何取消选中分支以便成功地从本地推送到远程仓库？

Answer 1

您正在推送到一个非裸仓库(因为 receive.denyCurrentBranch 被设置为忽略)。

但是您的远程非裸仓库有可能:

• 检查了与 master 不同的分支(并且因为你正在推送到 master，工作树的内容不会改变)
• 或已 checkout 一个提交(意味着您在 detached HEAD state 中，您可以使用该存储库中的 git 分支确认，以查看是否有任何这些分支被标记为已 checkout )。

---

I have deleted both repos on local and remote and created it again (No bare for sure)

默认，receive.denyCurrentBranch设置为 ' refuse '，因此您的错误消息与此一致。

尝试将其设置为“忽略”，因为您的远程仓库在 master 上，您的推送将通过。

但是您不会看到任何文件:您需要一个接收后 Hook 来检查您的工作树或将其重置为 HEAD，以便文件实际出现。

例如参见“Git: making pushes to non-bare repositories safe”

my post-receive hook looks like this:

export GIT_WORK_TREE=..
git checkout -f HEAD

---

OP报道 in the comments :

the answer to the original issue is run this on the remote server:

git config receive.denyCurrentBranch ignore 

Then Add export GIT_WORK_TREE=.. git checkout -f HEAD To your gitrepo <PATH>/.git/hooks/post-receive

That did the trick and I am now able to push files from my local to the remote repo!!!