git: Use "git foo" rather than "git-foo"

All of our machines now have "git foo" and have done for some time,
and some are going to not have "git-foo".

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/adhoc-revtuple-generator b/adhoc-revtuple-generator
index b9f9eb984f7be3f3357edde0ea65e77c97fac3cd..9efc3dc8877a0c00cc14dd33e8ad2c7df8baa804 100755 (executable)
--- a/adhoc-revtuple-generator
+++ b/adhoc-revtuple-generator
@@ -106,7 +106,7 @@ END
     print DEBUG "GIT-GEN UPCMD\n$upcmd\n";
     shellcmd($upcmd) if $doupdate;
     my $cmd= "cd $c{Repos}/$treename &&".
-        " git-log --pretty=raw --date-order $tree->{Latest}";
+        " git log --pretty=raw --date-order $tree->{Latest}";
     print DEBUG "GIT-GEN CMD $cmd\n";
     my $fh= new IO::File;
     open $fh, "$cmd |" or die $!;
@@ -305,7 +305,7 @@ sub xu_withtag_generator ($) {
                die unless $targetqemu =~ m/^[^-]/;
                $!=0; $?=0;
                $targetqemu= `cd $c{Repos}/$qemutree &&
-                              git-rev-parse '$targetqemu^0'`;
+                              git rev-parse '$targetqemu^0'`;
                die "$! $?" if (!defined $targetqemu) or $?;
                chomp $targetqemu;
            }

diff --git a/ap-fetch-version b/ap-fetch-version
index 1f3c6e97f1d1cd69e4c768c18032f8fd6ae16ab4..dbd3fb77d13640da1694838f7eaf6a422c653eec 100755 (executable)
--- a/ap-fetch-version
+++ b/ap-fetch-version
@@ -70,8 +70,8 @@ linuxfirmware)
                $UPSTREAM_TREE_LINUXFIRMWARE master daily-cron.$branch
        ;;
 osstest)
-       git-fetch $HOME/testing.git pretest:ap-fetch >&2
-        git-rev-parse ap-fetch^0
+       git fetch $HOME/testing.git pretest:ap-fetch >&2
+        git rev-parse ap-fetch^0
         ;;
 *)
        echo >&2 "branch $branch ?"

diff --git a/ap-fetch-version-baseline b/ap-fetch-version-baseline
index 474b90f248031bcf47a6a2c99a3b7311e72d9479..e693e16845a96fba2dd5284ad20cb222e52bb3f6 100755 (executable)
--- a/ap-fetch-version-baseline
+++ b/ap-fetch-version-baseline
@@ -31,7 +31,7 @@ case "$branch" in
 #linux)
 #      cd $repos/xen
 #      git fetch -f $BASE_TREE_LINUX $BASE_TAG_LINUX:$BASE_LOCALREV_LINUX
-#      git-rev-parse $BASE_LOCALREV_LINUX^0
+#      git rev-parse $BASE_LOCALREV_LINUX^0
 #      ;;
 *)
        exec ./ap-fetch-version-old "$@"

diff --git a/ap-fetch-version-old b/ap-fetch-version-old
index 353a8174f949a529c9a2f6b243d4d41317b72af6..d2f8b94c9958cd4ab6463a6a2361c44dc2090c73 100755 (executable)
--- a/ap-fetch-version-old
+++ b/ap-fetch-version-old
@@ -74,8 +74,8 @@ linuxfirmware)
                $TREE_LINUXFIRMWARE master daily-cron-old.$branch
        ;;
 osstest)
-       git-fetch -f $HOME/testing.git incoming:ap-fetch
-        git-rev-parse ap-fetch^0
+       git fetch -f $HOME/testing.git incoming:ap-fetch
+        git rev-parse ap-fetch^0
         ;;
 *)
        echo >&2 "branch $branch ?"

diff --git a/cr-for-branches b/cr-for-branches
index 4c26a69c7c2745cd3be6ec80d660d59b2eb0fa68..8bb1ac5761913fc57b1a59503e194c091dc81ea0 100755 (executable)
--- a/cr-for-branches
+++ b/cr-for-branches
@@ -43,8 +43,8 @@ with-lock-ex $fetchwlem data-tree-lock bash -ec '
        exec >>$LOGFILE
        date
         printf "%s\n" "$FOR_LOGFILE"
-       git-pull . incoming:master 2>&1 ||:
-       git-checkout HEAD
+       git pull . incoming:master 2>&1 ||:
+       git checkout HEAD
 '
 
 export OSSTEST_TEST_PULLFROM=`pwd`
@@ -91,10 +91,10 @@ for branch in $BRANCHES; do
 
                log ...
 
-               git-fetch $OSSTEST_TEST_PULLFROM master:incoming 2>&1 ||:
-               git-fetch $OSSTEST_TEST_PULLFROM incoming:incoming 2>&1 ||:
-               git-pull --no-commit . incoming:master 2>&1 ||:
-               git-checkout HEAD
+               git fetch $OSSTEST_TEST_PULLFROM master:incoming 2>&1 ||:
+               git fetch $OSSTEST_TEST_PULLFROM incoming:incoming 2>&1 ||:
+               git pull --no-commit . incoming:master 2>&1 ||:
+               git checkout HEAD
 
                set +e
                "$@" 2>&1

diff --git a/cr-publish-flight-logs b/cr-publish-flight-logs
index 56100daff13c13a84d72a11a639ca8c84cdafb70..d299329136779923b2ce804e22fe9d6242938885 100755 (executable)
--- a/cr-publish-flight-logs
+++ b/cr-publish-flight-logs
@@ -43,7 +43,7 @@ if ($push_harness) {
     my $githost= $c{HarnessPublishGitUserHost};
     my $gitdir= $c{HarnessPublishGitRepoDir};
 
-    system_checked("git-push $githost:$gitdir HEAD:flight-$flight");
+    system_checked("git push $githost:$gitdir HEAD:flight-$flight");
     system_checked("ssh $githost 'cd $gitdir && git update-server-info'");
 }
 

diff --git a/cri-common b/cri-common
index 477b013450c90b70ca7a0a69dbfa068561546805..497d4e3bb62e6696cdd9541d2024b22ad0a40669 100644 (file)
--- a/cri-common
+++ b/cri-common
@@ -32,7 +32,7 @@ repo_tree_rev_fetch_git () {
        fi
        cd $repos/$treename
        git fetch -f $realurl $remotetag:$localtag >&2
-       git-rev-parse $localtag^0
+       git rev-parse $localtag^0
 }
 
 select_xenbranch () {

diff --git a/mg-execute-flight b/mg-execute-flight
index 20067b329ed825d08fb823bbd15438a2e8a4d4c3..287caa06825878316a761cc4b776d4faee6c3d33 100755 (executable)
--- a/mg-execute-flight
+++ b/mg-execute-flight
@@ -53,7 +53,7 @@ if [ x"$flight" = x ]; then badusage; fi
 
 set +e
 tty=`exec 2>/dev/null; tty`
-branch=`exec 2>/dev/null; git-branch | sed -n 's/^\* //p'`
+branch=`exec 2>/dev/null; git branch | sed -n 's/^\* //p'`
 set -e
 
 export OSSTEST_RESOURCE_PRIORITY=${OSSTEST_RESOURCE_PRIORITY--8}
@@ -80,7 +80,7 @@ Subject: [adhoc test] $subject
 $OSSTEST_RESOURCE_PREINFO
 END
 
-git-log -n1 --pretty=format:'harness %h: %s' | perl -pe 's/(.{70}).+/$1.../'
+git log -n1 --pretty=format:'harness %h: %s' | perl -pe 's/(.{70}).+/$1.../'
 echo
 
 cat <tmp/$flight.report