svn commit: r448094 - branches/2017Q3/devel/git

[Jan Beich]

Mark Felder <feld at FreeBSD.org> writes:

> On Thu, Aug 17, 2017, at 13:11, Jan Beich wrote:
>> Mark Felder <feld at FreeBSD.org> writes:
>> 
>> > Author: feld
>> > Date: Thu Aug 17 13:15:25 2017
>> > New Revision: 448094
>> > URL: https://svnweb.freebsd.org/changeset/ports/448094
>> >
>> > Log:
>> >   MFH: r445615 r446083 r447205 r447721 r447759
>> [...]
>> >   Update devel/git to 2.14.1
>> 
>> Why did you ignore devel/git-cinnabar regression this causes
>> and my patch for 2.13.5 sent to ports-secteam@ ?
>> 
>
> For some reason I cannot find this email you're talking about...

Attached at the end.

> What's the current status of the 2017Q3 branch for devel/git-cinnabar then?

Broken.

> What is the best solution for resolving the regression?

Backporting upstream fix from `master` branch. Simply updating to `master`
snapshot is risky due to metadata upgrade which would obviously make a clone
incompatible with git-cinnabar from `release` branch.

$ pkg install git-cinnabar # 0.5.0.b2_3
$ git clone hg::https://hg.mozilla.org/projects/nss
$ pkg upgrade git-cinnabar # master snapshot
$ (cd nss; git fetch)
ERROR Git-cinnabar metadata needs upgrade. Please run `git cinnabar upgrade`.

-------------- next part --------------
An embedded message was scrubbed...
From: Jan Beich <jbeich at FreeBSD.org>
Subject: Re: svn commit: r447721 - head/devel/git
Date: Fri, 11 Aug 2017 00:04:55 +0200
Size: 10045
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20170818/b3538386/attachment.mht>
-------------- next part --------------

--
[1] https://github.com/glandium/git-cinnabar/commit/0fad12ddedc5#commitcomment-23507145