chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ae14faf
)
Tests: t-prep-newpackage: Cope with source git which has a master already
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 16 May 2015 22:22:55 +0000
(23:22 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 31 May 2015 10:54:12 +0000
(11:54 +0100)
tests/lib
patch
|
blob
|
history
diff --git
a/tests/lib
b/tests/lib
index 1158f0a1448b0248a564e04e19d16e8f2a1db38f..abb2657a23bd6ee2c993422fe30819656d152f06 100644
(file)
--- 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 ..
}