git push: failed to push some refs and missing commit

Hello!

Error 1:

When doing git-push once I get:

chdebfl0@u0160:~/public_html/nello$ git-push
Counting objects: 43, done.
Compressing objects: 100% (19/19), done.
Writing objects: 100% (24/24), 6.94 KiB, done.
Total 24 (delta 17), reused 3 (delta 2)
Unpacking objects: 100% (24/24), done.
To /home/server/git/web/nello/.git
   9299071..06c9c06  master -> master
error: failed to push some refs to '/home/server/git/web/nello/.git'
chdebfl0@u0160:~/public_html/nello$ git-status
# On branch master
nothing to commit (working directory clean)

Doing git-fetch does not fetch, as there is nothing new, git-push succeeds the second time:

chdebfl0@u0160:~/public_html/nello$ git-fetch chdebfl0@u0160:~/public_html/nello$ git-push Everything up-to-date chdebfl0@u0160:~/public_html/nello$

Error 2:

I miss a commit, that removed the function hideContent();

If I do

% git-log -p -ShideContent

I see two commits:

- the first one, that introduced the function
- the second one that I used to git checkout <firstcommit> filename it again

It seems some other files have been modified without having an log entry.

Anyone an idea, what could be the reason for it?

Sincerly

Nico

PS: Please CC me, I am not subscribed.

Nico Schottelius [Mon, Apr 28, 2008 at 07:10:20PM +0200]:

I found out that one of our webdevs used git push -f, which may be a good reason for that.

Could error 1 also be caused by that?

Nico