From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6473 invoked by alias); 30 Mar 2018 22:52:23 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 6462 invoked by uid 89); 30 Mar 2018 22:52:23 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.2 spammy=book, pushing, emailed, learn X-HELO: rock.gnat.com Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 30 Mar 2018 22:52:21 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 8AFFB116A3A; Fri, 30 Mar 2018 18:52:20 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id aQmLnS0y-U3A; Fri, 30 Mar 2018 18:52:20 -0400 (EDT) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id 5AA8E116A39; Fri, 30 Mar 2018 18:52:20 -0400 (EDT) Received: by joel.gnat.com (Postfix, from userid 1000) id A6F028330A; Fri, 30 Mar 2018 15:52:18 -0700 (PDT) Date: Fri, 30 Mar 2018 22:52:00 -0000 From: Joel Brobecker To: Weimin Pan Cc: Simon Marchi , gdb-patches@sourceware.org Subject: Re: [PATCH5 PR gdb/16959] gdb hangs in infinite recursion Message-ID: <20180330225218.fqhgvt7pzaqewic3@adacore.com> References: <1522269884-129860-1-git-send-email-weimin.pan@oracle.com> <20cf4b23322670e4dc513183ef2dda45@polymtl.ca> <96ab9fda-2c03-a9c6-1da9-70e807e69e5c@oracle.com> <3505af0b-d303-b556-0a4c-c416ac88a064@polymtl.ca> <337f2b1f-6fe8-07f3-f4cd-a9b5a3d5456d@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <337f2b1f-6fe8-07f3-f4cd-a9b5a3d5456d@oracle.com> User-Agent: NeoMutt/20170113 (1.7.2) X-SW-Source: 2018-03/txt/msg00627.txt.bz2 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