git push fails

[Neal Becker]

How do I debug this?

git push
To ssh://[e-mail]/mercurial
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 
'ssh://[e-mail]/mercurial'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again.  See the
'Note about fast-forwards' section of 'git push --help' for details.

[Stanislav Ochotnicky]

On 03/02/2011 01:17 PM, Neal Becker wrote:
> How do I debug this?
>
> git push
> To ssh://[e-mail]/mercurial
>  ! [rejected]        master -> master (non-fast-forward)
> error: failed to push some refs to 
> 'ssh://[e-mail]/mercurial'
> To prevent you from losing history, non-fast-forward updates were rejected
> Merge the remote changes (e.g. 'git pull') before pushing again.  See the
> 'Note about fast-forwards' section of 'git push --help' for details.

I am pretty sure you didn't fetch/pull before push. F15 mass rebuild
caused new commits.

You'll need to do:
git fetch
git rebase origin/master
# fix rebase conflicts
git add *spec
git rebase --continue
git push

[Andreas Schwab]

Stanislav Ochotnicky  writes:
> You'll need to do:
> git fetch
> git rebase origin/master

or git pull --rebase

Andreas.

[Neal Becker]

Thanks.

I'll have to say, git's error message here is not helpful.

[Kyle McMartin]

On Wed, Mar 02, 2011 at 07:17:16AM -0500, Neal Becker wrote:
> How do I debug this?
>
> git push
> To ssh://[e-mail]/mercurial
>  ! [rejected]        master -> master (non-fast-forward)
> error: failed to push some refs to 
> 'ssh://[e-mail]/mercurial'
> To prevent you from losing history, non-fast-forward updates were rejected
> Merge the remote changes (e.g. 'git pull') before pushing again.  See the
> 'Note about fast-forwards' section of 'git push --help' for details.

http://pkgs.fedoraproject.org/gitweb/?p=mercurial.git

If I had to guess, you don't have that top commit in your tree.

Just run git pull or git merge origin/master to merge your changes with
the commit from Dennis, and you should be able to push.

Fedora disallows you to trample over other peoples commits by pushing a
discontinuity in the history.

--Kyle

[Darryl L. Pierce]

On Wed, Mar 02, 2011 at 07:17:16AM -0500, Neal Becker wrote:
> How do I debug this?
>
> git push
> To ssh://[e-mail]/mercurial
>  ! [rejected]        master -> master (non-fast-forward)
> error: failed to push some refs to 
> 'ssh://[e-mail]/mercurial'
> To prevent you from losing history, non-fast-forward updates were rejected
> Merge the remote changes (e.g. 'git pull') before pushing again.  See the
> 'Note about fast-forwards' section of 'git push --help' for details.

This is a non-fast forwarding push; i.e., it has the same end patch as
the destination, which is the "non-fast forward" part. I hit this
problem several times at work.

It's blocked since there's no way for git to go through the list of all
commits on both your repo and the remote repo to make sure that your
push isn't eliminating some historical patch in the remote. That's why
it's blocked by default.