From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id F32AB385E006 for ; Fri, 27 Mar 2020 15:48:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org F32AB385E006 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=simark.ca Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=simark@simark.ca Received: from [10.0.0.11] (unknown [192.222.164.54]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 2DBD21E581; Fri, 27 Mar 2020 11:48:29 -0400 (EDT) Subject: Re: [PATCH 2/2] Add git sha information to the gdb version string To: Andrew Burgess Cc: Joel Brobecker , gdb-patches@sourceware.org References: <16599d81be47851f9ce53d7da037d9a1cdeba490.1585311874.git.andrew.burgess@embecosm.com> <0b4bb502-4632-207c-cae6-94eeecb85f32@simark.ca> <20200327152834.GC587@embecosm.com> From: Simon Marchi Message-ID: Date: Fri, 27 Mar 2020 11:48:28 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: <20200327152834.GC587@embecosm.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US-large Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-13.6 required=5.0 tests=BAYES_00, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Mar 2020 15:48:31 -0000 On 2020-03-27 11:28 a.m., Andrew Burgess wrote: > * Simon Marchi [2020-03-27 09:56:35 -0400]: > >> On 2020-03-27 8:27 a.m., Andrew Burgess wrote: >>> + >>> + # Use the remote url pattern from the remote-repository file to >>> + # find the local name for the remote git repository. >>> + remote_name=$( (cd "$srcdir" && git remote -v) \ >>> + | grep "${remote_repo_pattern}" | grep \(fetch\) \ >>> + | awk -F '\t' '{print $1}') >> >> I just tried it locally, this is what I get: >> >> GNU gdb (GDB) 10.0.50.20200327-git (c13ff238f921--0) >> >> I identifier the problem to the fact that I have two remotes that match the given >> URL: >> >> $ git remote -v | grep 'sourceware.org/git/binutils-gdb.git' >> origin git://sourceware.org/git/binutils-gdb.git (fetch) >> origin git://sourceware.org/git/binutils-gdb.git (push) >> upstream ssh://sourceware.org/git/binutils-gdb.git (fetch) >> upstream ssh://sourceware.org/git/binutils-gdb.git (push) > > OK. I hadn't considered that. But challenge accepted :) > > The new version should handle multiple remotes and identify the most > up to date and use that one. > > If try the version below and do 'git remote rename origin zzzzz', then > we should still find and use the zzzzz remote. I've done a bit of > basic testing but more exposure would be great. > > Thanks, > Andrew It works here, if you think this is worth the extra complexity, I am fine with it. Simon