Re: [PATCH (Apple Git) 06/13] Set Apple Git version during build
- Date: Wed, 30 Jan 2019 11:45:27 -0800
- From: Jeremy Huddleston Sequoia <jeremyhu@xxxxxxxxx>
- Subject: Re: [PATCH (Apple Git) 06/13] Set Apple Git version during build
> On Jan 30, 2019, at 05:43, Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote:
> Hi Jeremy,
> On Tue, 29 Jan 2019, Jeremy Huddleston Sequoia wrote:
>> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@xxxxxxxxx>
>> GIT-VERSION-GEN | 4 ++++
>> 1 file changed, 4 insertions(+)
>> diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
>> index d1a2814ec7..6fb90854b9 100755
>> --- a/GIT-VERSION-GEN
>> +++ b/GIT-VERSION-GEN
>> @@ -3,6 +3,10 @@
>> +if [ -n "$RC_ProjectSourceVersion" ] ; then
>> + DEF_VER="$DEF_VER (Apple Git-$RC_ProjectSourceVersion)"
> This seems awfully specific to a very specific setup. It won't work when
> building from a Git checkout, either, as `DEF_VER` is not even used then.
Yes. This one was one of the ones I thought obviously fell into the "this is certainly not upstreamable, but let's discuss a general solution to this problem" category. Sorry if that wasn't clear.
> And the existing facility is the `version` file. Since you want to build
> this in some sort of automated fashion anyway, you should probably execute
> sed -n "s/^DEF_VER=\\(.*\\)/\\1 (Apple Git-$RC_ProjectSourceVersion)/p" \
> <GIT-VERSION-GEN >version
> in your automation script. As a bonus, this will work with any unpatched
> Git source code, too!
Oh nice! Thanks for getting rid of one of our patches.
>> 2.20.0 (Apple Git-115)