git-debrebase: Introduce term `anchor'

[dgit.git] / tests / lib-gdr

diff --git a/tests/lib-gdr b/tests/lib-gdr
index da119bca098ee1048250c7d7e419a21a6ef64eff..565e0b167ad1c104cd026e92c9637eda368c0775 100644 (file)
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -55,8 +55,8 @@ t-gdr-good () {
                Changelog/Packaging)                    ;;
                Changelog/Upstream)                     ;;
                Upstream/SAME)                          ;;
-               BreakwaterUpstreamMerge/Upstream)       ;;
-               BreakwaterUpstreamMerge/Packaging)      ;;
+               Anchor/Upstream)                        ;;
+               Anchor/Packaging)                       ;;
                *)
                        fail "etype=$etype ctype=$ctype cetype=$cetype $cid"
                        ;;
@@ -98,7 +98,7 @@ t-gdr-good () {
                Upstream/SAME)
                        git diff --quiet $expect..$cid -- ':debian'
                        ;;
-               BreakwaterUpstreamMerge)
+               Anchor)
                        break
                        ;;
                esac
@@ -203,6 +203,16 @@ t-maintainer-commit-some-changes () {
        t-git-next-date
 }
 
+t-nmu-causes-ff-fail () {
+       t-dgit fetch
+
+       t-expect-fail E:'Not.*fast-forward' \
+       git merge --ff-only dgit/dgit/sid
+
+       t-expect-fail E:'-fdiverged.*refs/remotes/dgit/dgit/sid' \
+       t-git-debrebase
+}
+
 t-nmu-reconciled-good () {
        local nmutree=$1