diff options
| author | Karolin Seeger <kseeger@samba.org> | 2008-11-17 15:23:34 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-11-17 15:23:34 +0100 |
| commit | 0cba859f12177aaf3ef2d96663f0a51f61c24d56 (patch) | |
| tree | 0322b008f4ad5193423dba3e2996db403052b1c3 | |
| parent | 0e801722e335c1bd17897848bf63d2acf4576b2e (diff) | |
| download | samba-0cba859f12177aaf3ef2d96663f0a51f61c24d56.tar.gz samba-0cba859f12177aaf3ef2d96663f0a51f61c24d56.tar.bz2 samba-0cba859f12177aaf3ef2d96663f0a51f61c24d56.zip | |
s3 create-tarball.sh: Remove dashes in git commands.
Newer git versions (e.g. 1.6.0.2) do not provide the 'git-' commands
any longer.
Karolin
| -rwxr-xr-x | release-scripts/create-tarball | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball index 04728d835d..ab27f08222 100755 --- a/release-scripts/create-tarball +++ b/release-scripts/create-tarball @@ -137,7 +137,7 @@ function createReleaseTag return 0 fi - if [ "x`git-tag -l ${OPT_TAG}`" != "x" ]; then + if [ "x`git tag -l ${OPT_TAG}`" != "x" ]; then echo -n "Tag exists. Do you wish to overwrite? (y/N): " read answer @@ -155,7 +155,7 @@ function createReleaseTag fi fi - git-tag -u ${OPT_KEYID} ${OPT_TAG} + git tag -u ${OPT_KEYID} ${OPT_TAG} exitOnError $? "Failed to create tag" return 0 @@ -170,7 +170,7 @@ function main cd $TOPDIR - git-checkout ${OPT_BRANCH} + git checkout ${OPT_BRANCH} exitOnError $? "Invalid branch name \"${OPT_BRANCH}\"" (cd source3 && ./script/mkversion.sh) @@ -188,7 +188,7 @@ function main echo "Creating release tarball for Samba $version" /bin/rm -rf ../samba-${version} - git-archive --format=tar --prefix=samba-${version}/ HEAD | (cd .. && tar xf -) + git archive --format=tar --prefix=samba-${version}/ HEAD | (cd .. && tar xf -) exitOnError $? "Failed to create release directory tree" pushd ../samba-${version} |