Re: [PATCH 2/2] Add git sha information to the gdb version string

Simon Marchi
2020-03-27T15:48:29Z

On 2020-03-27 11:28 a.m., Andrew Burgess wrote:
> * Simon Marchi <simark@simark.ca> [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