diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-24 22:35:04 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-24 22:39:27 +0100 |
| commit | fbf9b5517d1c8d3a5e906477b9e4a11866168559 (patch) | |
| tree | 3d4892924dea8ef2469aaa021a99c450795317f3 | |
| parent | 626c5a5851ebabb54e01e3fe3e15b3971f62555b (diff) | |
test suite: lib-gdr: Check that we made patches with gdr
Conveniently, the places where we don't want this, and are
deliberately looking for dgit-self-made patches, are gdr-makepatches7
and mix-it in gdr-subcommands; there, we don't push, so don't end up
checking t-gdr-made-patches.
We also add this check to the appropriate place in gdr-subcommands.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| -rw-r--r-- | tests/lib-gdr | 11 | ||||
| -rwxr-xr-x | tests/tests/gdr-subcommands | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/tests/lib-gdr b/tests/lib-gdr index 9ea5af5..acbfa92 100644 --- a/tests/lib-gdr +++ b/tests/lib-gdr @@ -21,6 +21,12 @@ t-gdr-good () { # stitched # pushed + case $state in + pushed*) + t-gdr-made-patches + ;; + esac + git diff --quiet ${beforetag-t.before} -- ':.' ':!debian/patches' LC_MESSAGES=C t-git-debrebase status >../status.check @@ -360,3 +366,8 @@ t-gdr-gbp-import-core () { git branch -D master git branch -m quilt-tip master } + +t-gdr-made-patches () { + git log -n1 --'pretty=format:%B' \ + | egrep '^\[git-debrebase' +} diff --git a/tests/tests/gdr-subcommands b/tests/tests/gdr-subcommands index 4197ab0..672ddc9 100755 --- a/tests/tests/gdr-subcommands +++ b/tests/tests/gdr-subcommands @@ -168,6 +168,7 @@ make_check () { P*) t-dgit -wgf --quilt=nofix quilt-fixup git diff HEAD~ debian/patches | egrep . + t-gdr-made-patches git diff --quiet HEAD~ -- ':.' ':!debian/patches' git reset --hard HEAD~ ;; |