[macports-base] 12/18: fetch: Always use port:git for fetch.type git

[Ryan Schmidt]

On Mar 20, 2018, at 04:58, Clemens Lang wrote:

> On 20 Mar, 2018, at 02:58, Ryan Schmidt wrote:
> 
>> On Mar 18, 2018, at 19:20, Rainer Müller wrote:
>> 
>>> Rainer Müller (raimue) pushed a commit to branch vcs-fetch
>>> in repository macports-base.
>>> 
>>> 
>>> https://github.com/macports/macports-base/commit/784fee88e8ef1495febbd4c53a2b1394b718d802
>>> 
>>> commit 784fee88e8ef1495febbd4c53a2b1394b718d802
>>> 
>>> Author: Rainer Müller
>>> AuthorDate: Sun Mar 18 11:28:23 2018 +0100
>>> 
>>>    fetch: Always use port:git for fetch.type git
>>> 
>>>    The output format changed in git 1.8.1.1 due to a bugfix for long
>>>    filenames in archives. Therefore old versions of git would produce
>>>    different output. As I do not know which version of Xcode contained
>>>    which git version, the solution is to always require port:git for
>>>    fetching.
>>> 
>>> ---
>>> src/port1.0/portfetch.tcl | 10 ++++------
>>> 1 file changed, 4 insertions(+), 6 deletions(-)
>>> 
>>> 
>>> diff --git a/src/port1.0/portfetch.tcl b/src/port1.0/portfetch.tcl
>>> index 4fad52f..0532ffc 100644
>>> --- a/src/port1.0/portfetch.tcl
>>> +++ b/src/port1.0/portfetch.tcl
>>> @@ -198,12 +198,10 @@ proc portfetch::set_fetch_type {option action args} {
>>>                 default distname {${name}-${svn.revision}}
>>>             }
>>>             git {
>>> -                # Mavericks is the first OS X version whose git supports modern
>>> TLS cipher suites.
>>> -                if {${os.major} >= 13 || ${os.platform} ne "darwin"} {
>>> -                    depends_fetch-append bin:git:git
>>> -                } else {
>>> -                    depends_fetch-append port:git
>>> -                }
>>> +                # Always use the git port and not /usr/bin/git.
>>> +                # The output format changed with git @1.8.1.1 due to a bugfix.
>>> +                #
>>> https://github.com/git/git/commit/22f0dcd9634a818a0c83f23ea1a48f2d620c0546
>>> +                depends_fetch-append port:git
>> 
>> This change shouldn't be necessary. The earliest Xcode that works on Mavericks,
>> Xcode 5.0.1, contains git version 1.8.3.4 (Apple Git-47).
> 
> Unfortunately that version of git has a bug in its 'git archive' that was later fixed.
> However, this bug causes the output to change, which breaks the entire approach of having
> checksums for the archives generated by this branch.
> 
> Remember that checksums for files downloaded from GitHub would suddenly change? If we
> don't want to end up in the same situation, we'll need this dependency.

Are you referring to the bug that was fixed in git 1.8.1.1 by the commit Rainer linked above? If so, 1.8.3.4 should contain that fix.