From 4843a9dff1d9692a0bf49eb8879d5f04a4b7556e Mon Sep 17 00:00:00 2001
From: Karolin Seeger <kseeger@samba.org>
Date: Mon, 17 Nov 2008 15:23:34 +0100
Subject: [PATCH] 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
(cherry picked from commit 0cba859f12177aaf3ef2d96663f0a51f61c24d56)
(cherry picked from commit 3d64e67de2b50f7b781aa3f5ad13ec8e866d4333)
(cherry picked from commit aa41a80969bd413d5922c602c7309bd8c05f3181)
(cherry picked from commit 0b4dd0cb1f81126344a6fe3304b46f880089718d)
(cherry picked from commit 4d988d0c9f22dda706ee1802985830ce4999f4d5)
(cherry picked from commit b0f66f65e4d7cf0d70708783e5486fe3e1e5e8e8)
---
 release-scripts/create-tarball | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index 3463f012a5b..da39d89c902 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 source && ./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}
-- 
2.34.1