From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 110174 invoked by alias); 30 Mar 2018 23:41:49 -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 110146 invoked by uid 89); 30 Mar 2018 23:41:48 -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=telling, HContent-Transfer-Encoding:8bit 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 23:41:47 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id C20F71167A0; Fri, 30 Mar 2018 19:41:45 -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 NONFEfNeRvu9; Fri, 30 Mar 2018 19:41:45 -0400 (EDT) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id 91EAF116768; Fri, 30 Mar 2018 19:41:45 -0400 (EDT) Received: by joel.gnat.com (Postfix, from userid 1000) id D14FE8330A; Fri, 30 Mar 2018 16:41:43 -0700 (PDT) Date: Fri, 30 Mar 2018 23:41: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: <20180330234143.mtj7u2xcfi7oxli4@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> <20180330225218.fqhgvt7pzaqewic3@adacore.com> <0bb09bd9-812c-0665-3112-353c0e9cef0e@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <0bb09bd9-812c-0665-3112-353c0e9cef0e@oracle.com> User-Agent: NeoMutt/20170113 (1.7.2) X-SW-Source: 2018-03/txt/msg00630.txt.bz2 > $ 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. 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. -- Joel