From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17058 invoked by alias); 31 Mar 2018 00:31:57 -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 17049 invoked by uid 89); 31 Mar 2018 00:31:56 -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,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=Once X-HELO: aserp2120.oracle.com Received: from aserp2120.oracle.com (HELO aserp2120.oracle.com) (141.146.126.78) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 31 Mar 2018 00:31:55 +0000 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w2V0T3tP160839; Sat, 31 Mar 2018 00:31:46 GMT Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp2120.oracle.com with ESMTP id 2h1ytwg065-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 31 Mar 2018 00:31:46 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w2V03rKN015971 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 31 Mar 2018 00:03:53 GMT Received: from abhmp0007.oracle.com (abhmp0007.oracle.com [141.146.116.13]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w2V03qqI013406; Sat, 31 Mar 2018 00:03:52 GMT Received: from [10.132.96.98] (/10.132.96.98) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 30 Mar 2018 17:03:52 -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> <0bb09bd9-812c-0665-3112-353c0e9cef0e@oracle.com> <20180330234143.mtj7u2xcfi7oxli4@adacore.com> From: Weimin Pan Message-ID: <8c729b8f-24db-c746-e0e6-744ca7edd92f@oracle.com> Date: Sat, 31 Mar 2018 00:31: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: <20180330234143.mtj7u2xcfi7oxli4@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-1803300241 X-SW-Source: 2018-03/txt/msg00632.txt.bz2 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 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. >