Hi,

On Mon, Nov 07, 2016 at 09:25:40PM +0100, Lawrence Velázquez wrote:
>   src/macports1.0/macports.tcl | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
>  diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
>  index 14d628f..6aafa73 100644
>  --- a/src/macports1.0/macports.tcl
>  +++ b/src/macports1.0/macports.tcl
>  @@ -2435,7 +2435,8 @@ proc macports::GetVCSUpdateCmd portDir {
>           set autostash ""
>           if {![catch {exec $git --version} git_version_string] && \
>               [regexp -nocase "git version (\[^ ]+)" $git_version_string -> 
> gitversion] && \
>  -            [vercmp $gitversion 1.8.4] >= 0} {
>  +            [vercmp $gitversion 2.9.0] >= 0} {
>  +            # 
> https://github.com/git/git/blob/v2.9.0/Documentation/RelNotes/2.9.0.txt#L84-L86
>               set autostash " --autostash"
>           }
>           return [list Git "$git pull --rebase${autostash}" $portDir]

Please fix the test in src/macports1.0/tests/macports.test, too.

-- 
Clemens

Reply via email to