chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test suite: gdr-subcommands: Use $peel, not $work, for a few checks
[dgit.git]
/
tests
/
tests
/
gdr-makepatches7
diff --git
a/tests/tests/gdr-makepatches7
b/tests/tests/gdr-makepatches7
index 9c3971004a1627ea525e98669f70b3981f960247..52462d4a5367e597ab1a1f58d59a84d0d0d1597f 100755
(executable)
--- a/
tests/tests/gdr-makepatches7
+++ b/
tests/tests/gdr-makepatches7
@@
-4,10
+4,20
@@
set -e
t-dependencies GDR
t-dependencies GDR
+t-tstunt-parsechangelog
t-setup-import gdr-convert-gbp
cd $p
t-setup-import gdr-convert-gbp
cd $p
+git checkout upstream/2.0
+echo '*patch*' >>.gitignore
+git commit -m nasty .gitignore
+git tag v2.1
+GZIP=-1 git archive -o ../${p}_2.1.orig.tar.gz --prefix ${p}/ v2.1
+
+git checkout master
+t-git-debrebase new-upstream 2.1-1
+
t-some-changes for-rebase-fixup m
t-git-debrebase
t-some-changes for-rebase-fixup m
t-git-debrebase