Re: [PATCH5 PR gdb/16959] gdb hangs in infinite recursion

[Weimin Pan <weimin.pan@oracle.com>]

On 3/30/2018 4:41 PM, Joel Brobecker wrote:
>> $ git push upstream fixes:master
>> Enter passphrase for key '/home/wepan/.ssh/id_rsa':
>> To ssh://sourceware.org/git/binutils-gdb.git
>>   ! [rejected]        fixes -> master (non-fast-forward)
>> error: failed to push some refs to
>> 'ssh://sourceware.org/git/binutils-gdb.git'
>> 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.
>>
>> Does it mean that I  need to do a "git merge"?
> Not quite. It is telling you that your "fixes" branch is behind
> upstream's "master".  You need to do a "rebase" your "fixes" branch
> instead (while having the "fixes" being the current branch):
>
>      $ git rebase upstream/master
>
> You may have some conflicts to resolve, particularly around
> ChangeLog files.

After the "git rebase" command, it no longer points to my branch:

$ git show
commit d8611974cf819e5f8cb9eb36907251f3e2d721c6
Author: Simon Marchi <simon.marchi@polymtl.ca>
Date:   Fri Mar 30 17:18:56 2018 -0400
....

$ git branch
* (no branch)
   fixes
   master

> Once that's done, do a "git show" to make sure your commit looks
> exactly the way you think it should look (in particular, that
> the "diff" contains exactly the changes you mean to push).
> And then, once done, try the push command again.
>