diff options
Diffstat (limited to 'tests')
| -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~ ;; |