[tor-commits] [tor-browser-bundle/master] Check out latest gitian-builder branch during fetch-inputs

[mikeperry at torproject.org]

commit b643a8406d76858710cab81193bf8c7b1b598754
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Mon Aug 19 02:54:34 2013 +0200

    Check out latest gitian-builder branch during fetch-inputs
    
    When using git checkout <name>, and <name> does not correspond to a
    locally existing branch but does correspond to a remotely existing
    branch, a local branch of that name is created, set to the contents of
    the remote branch, and then checked out. If a local branch with that
    name already exists (which happens when you run git checkout <name> for
    a second time) then only the local branch is checked out, without any
    regard for the remote content changes. Make sure we actually update to
    the remote content.
---
 gitian/fetch-inputs.sh |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index 63e7f16..6b85791 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -193,8 +193,9 @@ ln -sf "$OPENSSL_PACKAGE" openssl.tar.gz
 cd ..
 git remote set-url origin https://git.torproject.org/builders/gitian-builder.git
 git fetch origin
-git fetch --tags origin
+git fetch --tags origin # XXX - why do we fetch tags specifically?
 git checkout tor-browser-builder-2
+git merge origin/tor-browser-builder-2
 cd inputs
 
 while read dir url tag; do