From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 17 Nov 2013 16:36:43 +0000 (+0000)
Subject: autopkgtests: fixes
X-Git-Tag: debian/0.19~21
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=c4ed4e776fe57b77e1f4c2194a8377b09690ec04

autopkgtests: fixes
---

diff --git a/debian/tests/control b/debian/tests/control
index ed68bf50..651e118f 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
-Tests: clone-nogit
+Tests: clone-nogit fetch-nogit push-newpackage
 Tests-Directory: tests/tests
 Depends: @
diff --git a/tests/lib b/tests/lib
index 1d2d06ad..94c4c796 100644
--- a/tests/lib
+++ b/tests/lib
@@ -103,7 +103,7 @@ t-clean-on-branch () {
 
 t-git-get-ref () {
 	local ref=$1
-	git-show-ref -d $1 | perl -ne '
+	git show-ref -d $1 | perl -ne '
 		$x = $1 if m#^(\w+) \Q'$1'\E(?:\^\{\})?$#;
 		END { print "$x\n" if length $x; }
 	'
diff --git a/tests/tests/push-newpackage b/tests/tests/push-newpackage
index 2d016572..92c9361b 100755
--- a/tests/tests/push-newpackage
+++ b/tests/tests/push-newpackage
@@ -7,8 +7,8 @@ t-git-none
 t-worktree 3-1
 v=3-1
 cd $p
-git-branch -m dgit/sid master
-git-remote rm dgit
+git branch -m dgit/sid master
+git remote rm dgit
 
 LANG=C t-dgit push 2>&1 \
 	| tee /dev/stderr \