Re: Partial patch

[Eric Blake]

On 11/17/2010 08:17 AM, Bruce Korb wrote:
> On 11/17/10 02:35, Gary V. Vaughan wrote:
>> Hey Bruce,
>>
>> On 17 Nov 2010, at 04:49, Bruce Korb wrote:
>>> Hi Gary, I'd as soon push this part now and debug
>>> the other issues later....
>>
>> For the topic/libposix right?  All looks fine to me!
> 
> $ git push
> Counting objects: 195, done.
> Delta compression using up to 4 threads.
> Compressing objects: 100% (128/128), done.
> Writing objects: 100% (129/129), 10.42 KiB, done.
> Total 129 (delta 123), reused 0 (delta 0)
> remote: libposix/.gitignore:49: new blank line at EOF.
> remote: error: hook declined to update refs/heads/topic/libposix
> To ssh://address@hidden/srv/git/gnulib
>  ! [rejected]        master -> master (non-fast-forward)
>  ! [remote rejected] topic/libposix -> topic/libposix (hook declined)

Are you trying to push to both master and libposix, or just libposix?
There are some git configurations for controlling whether 'git push'
tries to push to one or all possible branches; whether it makes sense to
tune them different from the defaults depends on your most frequent
workflow habits.

> error: failed to push some refs to 'ssh://address@hidden/srv/git/gnulib'
> To prevent you from losing history, non-fast-forward updates were rejected
> Merge the remote changes before pushing again.  See the 'Note about
> fast-forwards' section of 'git push --help' for details.
> 
> `git push --help' yields gobbledygook about "fast-forward".
> I had a clean repo, did a "git checkout topic/libposix", made
> my edits, did a "git commit" and now it is complaining about
> fast forwarding.

Rather, it's complaining that your commit would _not_ be a fast-forward,
because someone else pushed a commit in between the time that you
checked out and now that you are trying to push your new patch.

Try 'git pull --rebase' to incorporate your patches on top of the
existing tree, so that your push can once again be a fast-forward.
There's also some git configuration options to make rebasing on top of
upstream an automatic part of 'git pull'; I use it for all repositories
where upstream prefers a merge-less history.

-- 
Eric Blake   address@hidden    +1-801-349-2682
Libvirt virtualization library http://libvirt.org

signature.asc
Description: OpenPGP digital signature