diff options
| author | Dave Cheney <dave@cheney.net> | 2015-09-04 08:47:40 +1000 |
|---|---|---|
| committer | Dave Cheney <dave@cheney.net> | 2015-09-04 02:10:56 +0000 |
| commit | c20b8e145a471f242fba18f30dc830dac71ce50e (patch) | |
| tree | aeab1ba2bd14b46ac630683b4794a97781203ac2 | |
| parent | 5aa3ba8673a060345e264216650cb145de124d66 (diff) | |
| download | go-c20b8e145a471f242fba18f30dc830dac71ce50e.tar.gz go-c20b8e145a471f242fba18f30dc830dac71ce50e.zip | |
[release-branch.go1.5] build: Fix bootstrap.bash for official source tarballs
At the moment, bootstrap.bash assumes it is called from a git working
copy. Hence, it fails to complete when running in an unpacked official
source tarball where .git and .gitignore do not exist. This fix adds a
test for existence for .git and a -f switch for the removal of
.gitignore.
Fixes #12223
Change-Id: I7f305b83b38d5115504932bd38dadb7bdeb5d487
Reviewed-on: https://go-review.googlesource.com/13770
Reviewed-by: Dave Cheney <dave@cheney.net>
Reviewed-by: Andrew Gerrand <adg@golang.org>
Reviewed-on: https://go-review.googlesource.com/14281
| -rwxr-xr-x | src/bootstrap.bash | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/bootstrap.bash b/src/bootstrap.bash index 60d6151ccd..1b5ba7c536 100755 --- a/src/bootstrap.bash +++ b/src/bootstrap.bash @@ -35,8 +35,10 @@ cp -R "$src" "$targ" cd "$targ" echo echo "#### Cleaning $targ" -rm .gitignore -git clean -f -d +rm -f .gitignore +if [ -e .git ]; then + git clean -f -d +fi echo echo "#### Building $targ" echo |