commit ff22f6b3c8662a6bfcd67c17f86a4ca98564099c Author: Georg Koppen gk@torproject.org Date: Tue Dec 6 19:55:17 2016 +0000

Bug 20903: Update gitian branch for nightlies if needed --- gitian/fetch-inputs.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 50daec0..bf60ca3 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -254,7 +254,13 @@ cd .. git remote set-url origin https://git.torproject.org/builders/gitian-builder.git git fetch origin git fetch --tags origin # XXX - why do we fetch tags specifically? -git checkout "$GITIAN_TAG" +# If we're not verifying tags, then the branch requires an update. +if [ $VERIFY_TAGS -eq 0 ]; +then + git pull +else + git checkout "$GITIAN_TAG" +fi cd inputs

while read dir url tag; do