diff options
| author |  David Adam <zanchey@ucc.gu.uwa.edu.au> | 2014-09-07 09:37:43 +0800 |
|---|---|---|
| committer | David Adam <zanchey@ucc.gu.uwa.edu.au> | 2014-09-07 09:37:43 +0800 |
| commit | cb46ed370176215a10279b2de907e2174d233a85 (patch) | |
| tree | 58dd5a3748236b0890ff9014d08a45207a10e6b1 | |
| parent | 15cf06438e4438e21ec4048b1848f6e1bf60e072 (diff) | |
make_tarball: build from the current checkout, ignore Travis
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rwxr-xr-x | build_tools/make_tarball.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 94ef0ab2..57cd0fd8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,6 @@ .gitattributes export-ignore .gitignore export-ignore +.travis.yml export-ignore /build_tools/make_svn_completions.fish export-ignore /build_tools/description-pak export-ignore /build_tools/make_hg_completions.fish export-ignore diff --git a/build_tools/make_tarball.sh b/build_tools/make_tarball.sh index a044d2f2..4f02411b 100755 --- a/build_tools/make_tarball.sh +++ b/build_tools/make_tarball.sh @@ -30,7 +30,7 @@ path=~/fish_built/$prefix.tar rm -f "$path" "$path".gz # git starts the archive -git archive --format=tar --prefix="$prefix"/ master > "$path" +git archive --format=tar --prefix="$prefix"/ HEAD > "$path" # tarball out the documentation, generate a configure script and version file # Don't use autoreconf since it invokes commands that may not be installed, like aclocal |