Re: [PATCH] t4014-format-patch: Adjust git_version regex to better handle distro changes to DEF_VER
Show 10 quoted lines
> On Oct 9, 2016, at 20:04, Josh Triplett <josh@joshtriplett.org> wrote:
>
> On October 9, 2016 7:53:23 PM PDT, Jeremy Huddleston Sequoia <jeremyhu@apple.com> wrote:
>> Regressed-in: 480871e09ed2e5275b4ba16b278681e5a8c122ae
>> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
>> CC: Josh Triplett <josh@joshtriplett.org>
>> CC: Junio C Hamano <gitster@pobox.com>
>
> Looks reasonable to me. Didn't realize git versions could have spaces.
> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Thanks, Josh.
If anyone feels strongly that they shouldn't, I'd be happy to change our DEF_VER patch to play nicer.
cf https://github.com/jeremyhu/git/commit/f99905d0752d923e5ec61e14c675a300c6d04284
Show 20 quoted lines
>
>> t/t4014-format-patch.sh | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
>> index 8d90a6e..33f6940 100755
>> --- a/t/t4014-format-patch.sh
>> +++ b/t/t4014-format-patch.sh
>> @@ -754,7 +754,7 @@ test_expect_success 'format-patch
>> --ignore-if-in-upstream HEAD' '
>> git format-patch --ignore-if-in-upstream HEAD
>> '
>>
>> -git_version="$(git --version | sed "s/.* //")"
>> +git_version="$(git --version | sed "s/git version //")"
>>
>> signature() {
>> printf "%s\n%s\n\n" "-- " "${1:-$git_version}"
>
> Jeremy Huddleston Sequoia <jeremyhu@apple.com>