From 440ab3535cc22ce1b027fc7196cdda103fdd29b8 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Sat, 19 Mar 2016 15:29:08 +0000 Subject: [PATCH] gb-vendor: fix recursive dependency fetching with -branch The branch indication was being carried on to the recursive dependencies because the global branch variable was getting shadowed before being cleared. Reported in FiloSottile/gvt#25 --- cmd/gb-vendor/fetch.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/gb-vendor/fetch.go b/cmd/gb-vendor/fetch.go index ee818be..7b20ea2 100644 --- a/cmd/gb-vendor/fetch.go +++ b/cmd/gb-vendor/fetch.go @@ -110,7 +110,7 @@ func fetch(ctx *gb.Context, path string, recurse bool) error { return err } - branch, err := wc.Branch() + b, err := wc.Branch() if err != nil { return err } @@ -119,7 +119,7 @@ func fetch(ctx *gb.Context, path string, recurse bool) error { Importpath: path, Repository: repo.URL(), Revision: rev, - Branch: branch, + Branch: b, Path: extra, }