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:
cedb267
)
git-debrebase: test: use conventional branch names
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Thu, 15 Feb 2018 16:14:04 +0000
(16:14 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 18 Feb 2018 12:04:44 +0000
(12:04 +0000)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
tests/setup/gbp2gdr
patch
|
blob
|
history
diff --git
a/tests/setup/gbp2gdr
b/tests/setup/gbp2gdr
index 3f6d9a60f136ef42a2ff6e7435e0495b4052da5d..8088e9830ae7ab3d5036a91a776002bebcbd3423 100755
(executable)
--- a/
tests/setup/gbp2gdr
+++ b/
tests/setup/gbp2gdr
@@
-45,9
+45,13
@@
git commit -a -m "an upstream v2 update"
ust=example_2.0.orig.tar.gz
git archive -o ../$ust --prefix=example-2.0/ make-upstream
+: 'make branch names more conventional'
+git branch -D master
+git branch -m quilt-tip master
+
: 'see what gbp import-orig does'
-git checkout
quilt-tip
-gbp import-orig --
debian-branch=quilt-tip --
upstream-version=2.0 ../$ust
+git checkout
master
+gbp import-orig --upstream-version=2.0 ../$ust
not-gdr-processable