Re: Partial patch

[Bruce Korb]

On 11/17/10 07:39, Eric Blake wrote:
>> 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?

To both?  If it is possible to inadvertently push to both, then
the git interface needs some serious work.

> 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.

My most frequent work flow habit is to use one development thread.

> 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.

$ git pull --rebase ; git push
Current branch topic/libposix is up to date.
Counting objects: 199, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (132/132), done.
Writing objects: 100% (133/133), 10.69 KiB, done.
Total 133 (delta 126), reused 0 (delta 0)
To ssh://address@hidden/srv/git/gnulib
   e633b39..2d39e49  topic/libposix -> topic/libposix
 ! [rejected]        master -> master (non-fast-forward)
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

On 11/17/10 07:47, Gary V. Vaughan wrote:
> Hi Bruce,
>
> I often feel like I'm driving a tank just to pick milk
> up from the store with git too... it's hugely overpowered
> for a great deal of the basic stuff that ought to be a lot easier.


Amen.  ;)  Meanwhile, I'll keep it as simple as possible,
I will (more or less):

> rm -rf gnulib
> git clone ssh://address@hidden/srv/git/gnulib
> cd gnulib
> git checkout topic/liposix
> patch -p1 < /tmp/saved-patch
> git commit -a -m'install headers in subdirectory'
> git push

I confess that I get impatient when ought-to-be-easy
things are made obtuse.  This seems beyond obtuse.