#21843: Switching from `make alpha` to `make nightly` doesn't work ------------------------------------------+---------------------- Reporter: tom | Owner: tbb-team Type: defect | Status: new Priority: Low | Milestone: Component: Applications/Tor Browser | Version: Severity: Normal | Keywords: Actual Points: | Parent ID: Points: | Reviewer: Sponsor: | ------------------------------------------+---------------------- Switching from make alpha to make nightly gives this error: {{{ updating: mac-langpacks/pt-BR.xpi (deflated 10%) You are not currently on a branch. Please specify which branch you want to merge with. See git-pull(1) for details.
git pull <remote> <branch> Makefile:97: recipe for target 'prep-nightly' failed make: *** [prep-nightly] Error 1 }}} This can be traced to this: https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/gitian /fetch-inputs.sh#n258 Because `make alpha` checked out a tag, `git pull` fails. We can detect a checkout tag with something like `git status | grep "HEAD detached"` and behave more intelligently. -- Ticket URL: <https://trac.torproject.org/projects/tor/ticket/21843> Tor Bug Tracker & Wiki <https://trac.torproject.org/> The Tor Project: anonymity online _______________________________________________ tor-bugs mailing list tor-bugs@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs