Re: Partial patch

[Gary V. Vaughan]

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.  But, since the power is there, hiding it can be 
dangerous too... so I'm leary of trusting emacs vcs mode to run things behind 
my back before I understand exactly what is going on behind the scenes. I'm 
still only half-way up the learning curve, but the time spent reading the 
online tutorial and the ORA git book helped a lot in getting this far.

On 17 Nov 2010, at 22:17, Bruce Korb wrote:
> On 11/17/10 02:35, Gary V. Vaughan wrote:
>> 
>> 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.

This means you've introduced a blank line into .gitignore, which you should fix 
before pushing.

> remote: error: hook declined to update refs/heads/topic/libposix
> To ssh://address@hidden/srv/git/gnulib
> ! [rejected]        master -> master (non-fast-forward)

This means that git was not able to find a straight forward patch from your 
local checkout to apply to the current state of the remote branch.  Most likely 
you didn't pick up my most recent patch?

> ! [remote rejected] topic/libposix -> topic/libposix (hook declined)
> 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.

This probably means you should:

  $ git stash  # move your local changes to one side
  $ git pull   # merge in the remote changesets: there might be some setup to 
do in .gitrc to allow this to work properly from the branch -- or you could 
look up the right syntax for pulling just changes from the branch to your local 
copy if noone chimes in with the right incantation
  $ git stash pop # merge back your local changes

Pay attention to any errors, as you might need to perform manual changes along 
the way if there are any conflicts.

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

worst case, send me your patch and I'll commit in your name :)

Cheers,
-- 
Gary V. Vaughan (address@hidden)

PGP.sig
Description: This is a digitally signed message part