git push says everything up-to-date even though I

问题:

I have a remote gitosis server and a local git repository, and each time I make a big change in my code, I\'ll push the changes to that server too.

But today I find that even though I have some local changes and commit to local repository, when running git push origin master it says \'Everything up-to-date\', but when I use git clone to checkout files on the remote server, it doesn\'t contain lastest changes. And I have only one branch named master and one remote server named origin.

PS: This is what git displays when running ls-remote, I\'m not sure whether it helps

$ git ls-remote origin
df80d0c64b8e2c160d3d9b106b30aee9540b6ece        HEAD
df80d0c64b8e2c160d3d9b106b30aee9540b6ece        refs/heads/master
$ git ls-remote .
49c2cb46b9e798247898afdb079e76e40c9f77ea        HEAD
df80d0c64b8e2c160d3d9b106b30aee9540b6ece        refs/heads/master
df80d0c64b8e2c160d3d9b106b30aee9540b6ece        refs/remotes/origin/master
3a04c3ea9b81252b0626b760f0a7766b81652c0c        refs/tags/stage3

回答1:

You would not be working with a detached head by any chance ?

As in:

indicating that your latest commit is not a branch head.

$ git log -1
# note the SHA-1 of latest commit
$ git checkout master
# reset your branch head to your previously detached commit
$ git reset --hard <commit-id>

---

As mentioned in the git checkout man page (emphasis mine):

It is sometimes useful to be able to checkout a commit that is not at the tip of one of your branches.
The most obvious example is to check out the commit at a tagged official release point, like this:

$ git checkout v2.6.18

Earlier versions of git did not allow this and asked you to create a temporary branch using the -b option, but starting from version 1.5.0, the above command detaches your HEAD from the current branch and directly points at the commit named by the tag (v2.6.18 in the example above).

You can use all git commands while in this state.
You can use git reset --hard $othercommit to further move around, for example.
You can make changes and create a new commit on top of a detached HEAD.
You can even create a merge by using git merge $othercommit.

The state you are in while your HEAD is detached is not recorded by any branch (which is natural --- you are not on any branch).
What this means is that you can discard your temporary commits and merges by switching back to an existing branch (e.g. git checkout master), and a later git prune or git gc would garbage-collect them.
If you did this by mistake, you can ask the reflog for HEAD where you were, e.g.

$ git log -g -2 HEAD

回答2:

Err.. If you are a git noob are you sure you have git commit before git push? I made this mistake the first time!

回答3:

Maybe you\'re pushing a new local branch?

A new local branch must be pushed explicitly:

git push origin your-new-branch-name

Just one of those things about git... You clone a repo, make a branch, commit some changes, push... \"Everything is up to date\". I understand why it happens, but this workflow is extremely unfriendly to newcomers.

回答4:

Another situation that is important to be aware of: The sort of default state for git is that you are working in the \"master\" branch. And for a lot of situations, you\'ll just hang out in that as your main working branch (although some people get fancy and do other things).

Anyway, that\'s just one branch. So a situation I might get into is:

My active branch is actually NOT the master branch. ... But I habitually do the command: git push (and I had previously done git push origin master, so it\'s a shortcut for THAT).

So I\'m habitually pushing the master branch to the shared repo ... which is probably a good clean thing, in my case ...

But I have forgotten that the changes I have been working on are not yet IN the master branch !!!

So therefore everytime I try git push, and I see \"Everything up to date\", I want to scream, but of course, it is not git\'s fault! It\'s mine.

So instead, I merge my branch into master, and then do push, and everything is happy again.

回答5:

My issue was that my local branch had a different name than the remote branch. I was able to push by doing the following:

$ git push origin local-branch-name:remote-branch-name

(Credit to https://penandpants.com/2013/02/07/git-pushing-to-a-remote-branch-with-a-different-name/)

回答6:

$ git push origin local_branch:remote_branch

Explanation

I had the same error & spent hours trying to figure it out. Finally I found it. What I didn\'t know is that pushing like this git push origin branch-x will try to search for branch-x locally then push to remote branch-x.

In my case, I had two remote urls. I did a checkout from branch-x to branch-y when trying to push from y locally to x remote I had the message everything is up to date which is normal cause I was pushing to x of the second remote.

Long story short to not fall in this kind of trap you need to specify the source ref and the target ref:

$ git push origin local_branch:remote_branch

回答7:

See VonC\'s answer above - I needed an extra step:

$ git log -1
- note the SHA-1 of latest commit
$ git checkout master
- reset your branch head to your previously detached commit
$ git reset --hard <commit-id>

I did this, but when I then tried to git push remoterepo master, it said \"error: failed to push some refs. To prevent you from losing history, non-fast-forward updates were rejected, Merge the remote changes (e.g. \'git pull\') before pushing again.\"

So I did \'git pull remoterepo master\', and it found a conflict. I did git reset --hard <commit-id> again, copied the conflicted files to a backup folder, did git pull remoterepo master again, copied the conflicted files back into my project, did git commit, then git push remoterepo master, and this time it worked.

Git stopped saying \'everything is up to date\' - and it stopped complaining about \'fast forwards\'.

回答8:

I have faced a similar situation; when I made the changes and tried to git push origin master, it was saying everything was up to date.

I had to git add the changed file and then git push origin master. It started working from then on.

回答9:

From your git status, you probably has a different situation from mine.

But anyway, here is what happened to me.. I encountered the following error:

fatal: The remote end hung up unexpectedly
Everything up-to-date

The more informative message here is that the remote hung up. Turned out it is due to exceeding the http post buffer size. The solution is to increase it with

git config http.postBuffer 524288000

回答10:

I had this problem today and it didn\'t have anything to do with any of the other answers. Here\'s what I did and how I fixed it:

A repository of mine recently moved, but I had a local copy. I branched off of my local \"master\" branch and made some changes--and then I remembered that the repository had moved. I used git remote set-url origin https://<my_new_repository_url> to set the new URL but when I pushed it would just say \"Everything up to date\" instead of pushing my new branch to master.

I ended up solving it by rebasing onto origin/master and then pushing with explicit branch names, like this:

$ git rebase <my_branch> origin/master
$ git push origin <my_branch>

I hope this helps anyone who had my same problem!

回答11:

My mistake was different than everything so far mentioned. If you have no idea why you would have a detached head, then you probably don\'t. I was working on autopilot with git commit and git push, and hadn\'t read the output from git commit. Turns out, it was an error message because I forgot -am.

[colin] ~/github/rentap.js [master] M % git commit \'figured out some more stuff with the forms in views and started figuring out row and mode in models so also made matching routes and controllers\'
error: pathspec \'figured out some more stuff with the forms in views and started figuring out row and mode in models so also made matching routes and controllers\' did not match any file(s) known to git.
[colin] ~/github/rentap.js [master] M % git push
Enter passphrase for key \'/home/colin/.ssh/id_ecdsa\': 
Everything up-to-date

Fixed it by putting -am where I usually do:

[colin] ~/github/rentap.js [master] M % git commit -am \'figured out some more stuff with the forms in views and started figuring out row and mode in models so also made matching routes and controllers\'

回答12:

Super rare - but still: On Windows, it might be that packed-refs has a branch with one letter case (i.e dev/mybranch), while refs folder has another case (i.e Dev/mybranch) when core.ignorecase is set to true.

The solution is to manually delete the relevant row from packed-refs. Didn\'t find a cleaner solution.

回答13:

Verify you haven\'t goofed your remote URL.

I just wanted to also mention that I ran into this after enabling Git as a CVS in a local Jenkins build configuration. It appears that Jenkins checked out the most recent commit of the branch I gave it and also reset my remote to correspond to the paths I gave it to the repo. Had to checkout my feature branch again and fix my origin remote url with \'git remote set-url\'. Don\'t go pointing a build tool to your working directory or you\'ll have a bad time. My remote was set to a file path to my working directory, so it naturally reported everything up-to-date when I attempted to push changes with the same source and destination.

回答14:

Another possibility is that you named a directory in your .gitignore file that got excluded. So the new commits wouldn\'t be pushed. It happened to me that I named a directory to ignore \"search\", but that was also a directory in my source tree.

回答15:

I ran into this myself when I merged a branch on Github and continued to develop in it locally. My fix was a little different than the others that have been suggested.

First I branched a new local branch off my old local branch (that I couldn\'t push). Then I pushed the new local branch to the origin server (Github). I.e.

$ git checkout -b newlocalbranch oldlocalbranch
$ git push origin newlocalbranch

This got the changes to show up on Github, albeit in newlocalbranch rather than oldlocalbranch.

回答16:

There is a quick way I found. Go to your .git folder, open the HEAD file and change whatever branch you were on back to master. E.g. ref: refs/heads/master

回答17:

In my case I had 2 remote repos.

git remote -v
originhttps https://asim_kt@...
originhttps https://asim_kt@...
origin  ssh:[e-mail]:...
origin  ssh:[e-mail]:...

Both repo was same. Just one was https other was ssh. So removing the unwanted one, (In my case ssh. since I used https because ssh wasn\'t working!) fixed the issue for me.

回答18:

I had the same issue. In my case it was caused by having to names for the same remote. It created the standard \'origin\', but I\'ve been using \'github\' as my remote for a long time, so that was there too. As soon as I removed the \'origin\' remote, the error went away.

回答19:

I had this happen (commits in my git log were not on GitHub even though git said everything was up to date) and I\'m confident the problem was Github. I didn\'t get any error messages in git, but GitHub had status errors and my commits were there several hours later.

https://status.github.com/messages

The GitHub status messages were:

• We are investigating reports of service unavailability.
• We\'re investigating problems accessing GitHub.com.
• We\'re failing over a data storage system in order to restore access to GitHub.com.