From ce5a97fd2e7ef65e72be01a695015e883840f83d Mon Sep 17 00:00:00 2001
From: Laurence Withers <lwithers@rhodium.calleva.guralp.com>
Date: Mon, 18 Aug 2008 18:42:22 +0000
Subject: [PATCH] Replace 'git-foo' with 'git foo' as the former is now
 deprecated

---
 README             |  4 ++--
 scripts/release.sh |  4 ++--
 scripts/version.sh | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README b/README
index df561e2..c4dc50f 100644
--- a/README
+++ b/README
@@ -32,7 +32,7 @@ user-editable variables live. Variables are generally only set here if
 they are not exported in the environment; this allows variables to be
 overridden in a wrapper script, with the defaults specified.
 
-This might be a good point to run `git-init-db', if you intend to use
+This might be a good point to run `git init-db', if you intend to use
 the git SCM system.
 
 Instantiating Modules
@@ -121,7 +121,7 @@ order. The following commands may be used:
 
   push					(git only)
     If this is a git repository, does a `git push' as well as a
-    `git-push --tags'. This is a good way to ensure that any tags you
+    `git push --tags'. This is a good way to ensure that any tags you
     create are pushed to a central repository (this normally needs to be
     done separately).
 
diff --git a/scripts/release.sh b/scripts/release.sh
index 3b46fc7..9f685a3 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -36,7 +36,7 @@ PKGNAME="$(basename ${REPOS})-${VER}"
 echo "Cloning repository..."
 do_cmd cd "${DIR}" || exit 1
 do_cmd rm -rf "${PKGNAME}" "${PKGNAME}-doc" || exit 1
-do_cmd git-clone --local --shared -n "${REPOS}" "${PKGNAME}" || exit 1
+do_cmd git clone --local --shared -n "${REPOS}" "${PKGNAME}" || exit 1
 do_cmd cd "${PKGNAME}" || exit 1
 print_success "Done"
 
@@ -44,7 +44,7 @@ print_success "Done"
 
 # Check out a new copy of the library from git
 echo "Checking out tag ${VER}..."
-do_cmd git-checkout -b releaseprivate "${VER}" || exit 1
+do_cmd git checkout -b releaseprivate "${VER}" || exit 1
 print_success "Done"
 
 
diff --git a/scripts/version.sh b/scripts/version.sh
index 8b9e1ab..38378f9 100755
--- a/scripts/version.sh
+++ b/scripts/version.sh
@@ -19,7 +19,7 @@ then
     echo "  libmajor LIB  - as major but for soversion"
     echo "  libmicro LIB  - as micro but for soversion"
     echo "  tag           - tag version"
-    echo "  push          - do a git-push with --tags"
+    echo "  push          - do a git push with --tags"
 
     exit 1
 fi
@@ -39,7 +39,7 @@ edit_versions() {
         SEDCMD="${SEDCMD} -e s,^${var}=.*$,${var}=${value},"
     done
     sed ${SEDCMD} -i "${file}"
-    git-commit -m "Bump version" "${file}"
+    git commit -m "Bump version" "${file}"
 }
 
 bump_major() {
@@ -69,12 +69,12 @@ bump_somicro() {
 
 do_tag() {
     source version
-    git-tag "${VERMAJOR}.${VERMINOR}.${VERMICRO}"
+    git tag "${VERMAJOR}.${VERMINOR}.${VERMICRO}"
 }
 
 do_push() {
-    git-push
-    git-push --tags
+    git push
+    git push --tags
 }
 
 set -ex