[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3156-g0b4dd0c

Karolin Seeger kseeger at samba.org
Mon Nov 17 14:34:55 GMT 2008


The branch, v3-2-test has been updated
       via  0b4dd0cb1f81126344a6fe3304b46f880089718d (commit)
      from  0a7fb721cdc0d825cf246d53075ad32a81b2b31d (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 0b4dd0cb1f81126344a6fe3304b46f880089718d
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Nov 17 15:23:34 2008 +0100

    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)

-----------------------------------------------------------------------

Summary of changes:
 release-scripts/create-tarball |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index 3463f01..da39d89 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}


-- 
Samba Shared Repository


More information about the samba-cvs mailing list