chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: test suite: gdr-import-dgit: introduce nmu-fold
[dgit.git]
/
tests
/
tests
/
gdr-import-dgit
diff --git
a/tests/tests/gdr-import-dgit
b/tests/tests/gdr-import-dgit
index c4ca1ba053166babd0de2e8e50a77bd075161b34..62ae1241ea1ea1f58c26cf58204906acdf4bc7c2 100755
(executable)
--- a/
tests/tests/gdr-import-dgit
+++ b/
tests/tests/gdr-import-dgit
@@
-43,18
+43,23
@@
nmu-upload-2
: 'done the nmu, switching back to the maintainer hat'
: 'done the nmu, switching back to the maintainer hat'
-t-dgit fetch
-git merge --ff-only dgit/dgit/sid
+nmu-fold () {
+ t-dgit fetch
+ git merge --ff-only dgit/dgit/sid
-git diff --exit-code patch-queue/nmu
+ git diff --exit-code patch-queue/$nmubranch
-git branch t.before
+ git branch unlaundered.$nmubranch
-t-git-debrebase
-t-gdr-good laundered
+ t-git-debrebase
+
+ t-gdr-good laundered
+
+ t-git-debrebase stitch
+ t-gdr-good stitched
+}
-t-git-debrebase stitch
-t-gdr-good stitched
+nmu-fold
v=2.0-3
t-dch-commit -v $v -m "incorporate nmu"
v=2.0-3
t-dch-commit -v $v -m "incorporate nmu"