[Xen-devel] [OSSTEST PATCH 1/6] git: Use "git foo" rather than "git-foo"

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

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@xxxxxxxxxxxxx>
---
 adhoc-revtuple-generator  |    4 ++--
 ap-fetch-version          |    4 ++--
 ap-fetch-version-baseline |    2 +-
 ap-fetch-version-old      |    4 ++--
 cr-for-branches           |   12 ++++++------
 cr-publish-flight-logs    |    2 +-
 cri-common                |    2 +-
 mg-execute-flight         |    4 ++--
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/adhoc-revtuple-generator b/adhoc-revtuple-generator
index b9f9eb9..9efc3dc 100755
--- 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 1f3c6e9..dbd3fb7 100755
--- 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 474b90f..e693e16 100755
--- 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 353a817..d2f8b94 100755
--- 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 4c26a69..8bb1ac5 100755
--- 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 56100da..d299329 100755
--- 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 477b013..497d4e3 100644
--- 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 20067b3..287caa0 100755
--- 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
-- 
1.7.10.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel