diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-05-16 23:22:55 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-05-31 11:54:12 +0100 |
commit | ca52f4f5f98de5f94128a75a4ae9079fa725e803 (patch) | |
tree | 5cc91dedf89fe36eaa8fd123c41ae098576fd812 | |
parent | ae14faf72b4e06be6bdf9d88db2f524facc6dcc9 (diff) |
Tests: t-prep-newpackage: Cope with source git which has a master already
-rw-r--r-- | tests/lib | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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 .. } |