From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 95108 invoked by alias); 30 Mar 2018 23:32:30 -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 95091 invoked by uid 89); 30 Mar 2018 23:32:29 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_PASS,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=amazon, Amazon X-HELO: userp2120.oracle.com Received: from userp2120.oracle.com (HELO userp2120.oracle.com) (156.151.31.85) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 30 Mar 2018 23:32:28 +0000 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w2UNWHUa165899; Fri, 30 Mar 2018 23:32:17 GMT Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp2120.oracle.com with ESMTP id 2h1xscg14y-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Mar 2018 23:32:17 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w2UN4HhP012172 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Mar 2018 23:04:17 GMT Received: from abhmp0001.oracle.com (abhmp0001.oracle.com [141.146.116.7]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w2UN4Gnn020459; Fri, 30 Mar 2018 23:04:17 GMT Received: from [10.132.96.98] (/10.132.96.98) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 30 Mar 2018 16:04:16 -0700 Subject: Re: [PATCH5 PR gdb/16959] gdb hangs in infinite recursion To: Joel Brobecker Cc: Simon Marchi , gdb-patches@sourceware.org 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> <20180330225218.fqhgvt7pzaqewic3@adacore.com> From: Weimin Pan Message-ID: <46f00b2c-cf52-c50d-1948-4cdfb3b598bd@oracle.com> Date: Fri, 30 Mar 2018 23:32:00 -0000 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <20180330225218.fqhgvt7pzaqewic3@adacore.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8848 signatures=668697 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1803300232 X-SW-Source: 2018-03/txt/msg00628.txt.bz2 Hi Joel, On 3/30/2018 3:52 PM, Joel Brobecker wrote: > 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. Yes, please go ahead. Thanks. > > 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 Yes, the log command does show the correct patch. It was actually my fault by following:   git push  with "fixes" as the branch name, as opposed to Simon's suggestion of "master:master". > > 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. > OK, will see if Amazon carries it. Thanks. Weimin