! [rejected] master -> master (non-fast forward)

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Git Mailing List <git@...>
Date: Sunday, November 18, 2007 - 11:12 am

What's causing this? I'm using stgit on the master branch.
I'm fixing it each time on the remote server by deleting the ref to master.

jonsmirl@terra:~/ds$ git push digispeaker
To ssh://jonsmirl1@git.digispeaker.com/~/projects/digispeaker-kernel.git
 ! [rejected]        master -> master (non-fast forward)
error: failed to push to
'ssh://jonsmirl1@git.digispeaker.com/~/projects/digispeaker-kernel.git'
jonsmirl@terra:~/ds$

On the server I have:
[core]
        repositoryformatversion = 0
        filemode = true
        bare = true
        logallrefupdates = true

bare was set false, I just flipped it to true. The server repo was
originally created via a clone from kernel.org and then renamed to be
a bare repo. Why do we need a 'bare' attribute?

-- 
Jon Smirl
jonsmirl@gmail.com
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
! [rejected] master -> master (non-fast forward), Jon Smirl, (Sun Nov 18, 11:12 am)
Re: ! [rejected] master -&gt; master (non-fast forward), Junio C Hamano, (Sun Nov 18, 2:10 pm)
Re: ! [rejected] master -&gt; master (non-fast forward), Catalin Marinas, (Mon Nov 19, 1:47 pm)
Re: ! [rejected] master -&gt; master (non-fast forward), Daniel Barkalow, (Mon Nov 19, 8:03 pm)
[PATCH 1/2] send-pack: cluster ref status reporting, Jeff King, (Tue Nov 20, 7:18 am)
Re: [PATCH 1/2] send-pack: cluster ref status reporting, Junio C Hamano, (Wed Nov 21, 3:24 am)
Re: [PATCH 1/2] send-pack: cluster ref status reporting, Junio C Hamano, (Wed Nov 21, 3:36 am)