[PATCH5 PR gdb/16959] gdb hangs in infinite recursion
Joel Brobecker
brobecker@adacore.com
Fri Mar 30 22:52:00 GMT 2018
I just emailed Weimin personally when I saw the branch creation,
but now I understand a little better:
> I just did my first patch:
>
> $ git push upstream fixes
> Enter passphrase for key '/home/wepan/.ssh/id_rsa':
> Counting objects: 17, done.
> Delta compression using up to 8 threads.
> Compressing objects: 100% (10/10), done.
> Writing objects: 100% (10/10), 2.43 KiB, done.
> Total 10 (delta 8), reused 0 (delta 0)
> To ssh://sourceware.org/git/binutils-gdb.git
> Â Â 0f59d5f..c9cf730Â fixes -> fixes
>
> and hope I did it correctly.
Actually, no :).
What you did is you pushed your branch called locally "fixes"
to the repository corresponding to "upstream". So, when you did
the "push" command above, what happened is that it created
the "fixes" branch on the upstream repository. This is not
what you want, because (1) it creates a branch on the remote
where you fix is (and pollutes the already existing branches),
and (2) does not change the "master" branch, and so your fix
is not really applied to the current development branch either.
With your permission, I will start by fixing the mistake, which
was to create the "fixes" branch on the upstream repository.
On your end, I think the simplest solution is for you to
push your current "fixes" branch to upstream's master:
$ git push upstream fixes:master
**HOWEVER**, BEFORE YOU DO SO, please do the following:
$ git log upstream/master..fixes
and verify that the list only shows the one path you are trying
to push. From your push of the "fixes" branch, I think that's correct,
but it's not a bad thing to be doing systematically, to make sure
you are pushing exactly what you think you are pushing.
I would like to recomment a book called "Pro Git" if you'd like
to learn about git. This is the book that allowed me to finally
break through git, and understand it.
--
Joel
More information about the Gdb-patches
mailing list