From ca52f4f5f98de5f94128a75a4ae9079fa725e803 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 16 May 2015 23:22:55 +0100
Subject: Tests: t-prep-newpackage: Cope with source git which has a master
 already

---
 tests/lib | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/lib b/tests/lib
index 1158f0a..abb2657 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 ..
 }
 
-- 
cgit v1.2.3