From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 16 May 2015 22:22:55 +0000 (+0100)
Subject: Tests: t-prep-newpackage: Cope with source git which has a master already
X-Git-Tag: debian/0.30~171
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=ca52f4f5f98de5f94128a75a4ae9079fa725e803

Tests: t-prep-newpackage: Cope with source git which has a master already
---

diff --git a/tests/lib b/tests/lib
index 1158f0a1..abb2657a 100644
--- a/tests/lib
+++ b/tests/lib
@@ -92,8 +92,10 @@ t-prep-newpackage () {
 	t-git-none
 	t-worktree $v
 	cd $p
-	git branch -m dgit/sid master
-	git remote rm dgit
+	if ! git-show-ref --verify --quiet refs/heads/master; then
+		git branch -m dgit/sid master
+		git remote rm dgit
+	fi
 	cd ..
 }