chiark / gitweb /
test suite: gdr-subcommands: Test raw conversion from gbp
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 19 Aug 2018 17:48:47 +0000 (18:48 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 19 Aug 2018 17:50:34 +0000 (18:50 +0100)
Make a branch which strips off the pseudomerge generated by gdr to
stitch the dgit history, and then run some tests on that.

These new tests detect #905975.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
tests/tests/gdr-subcommands

index b739fd7..323c108 100755 (executable)
@@ -25,6 +25,11 @@ mix-it () {
        t-git-next-date
 }
 
+git checkout -b raw-converted-from-gbp converted-from-gbp
+test "$(git diff --stat HEAD^2)"
+git diff --exit-code --stat HEAD^1
+git reset --hard HEAD^1
+
 git checkout -b stitched-laundered master
 mix-it
 t-git-debrebase quick
@@ -51,7 +56,8 @@ git show-ref
 subcmd () {
        local subcmd=$1
        shift
-       for startbranch in {stitched,unstitched}-{laundered,mixed}; do
+       for startbranch in {stitched,unstitched}-{laundered,mixed} \
+                       raw-converted-from-gbp; do
                work="work-$subcmd-$startbranch"
 
                : "---------- $subcmd $startbranch ----------"
@@ -191,20 +197,20 @@ Ec="F:No ongoing git-debrebase session"
 Ep="F:Patch export produced patch amendments"
 
 # input state:
-#  stitched?           st'd    st'd    unst'd  unst'd
-#  laundered?          laund'd mixed   laund'd mixed
+#  stitched?           st'd    st'd    unst'd  unst'd  convert
+#  laundered?          laund'd mixed   laund'd mixed   -from-gbp
 #
 # "mixed" means an out of order branch
 # containing mixed commits and patch additions,
 # but which needs even more patches
 #
-subcmd ''              Ult     Ull     Vlt     Vl
-subcmd stitch          Ns      Nu      Sltf    Stf
-subcmd prepush         ns      nu      Sltf    Stf
-subcmd quick           ns      Sl      Sltf    Sl
-subcmd conclude        "$Ec"   "$Ec"   Sltf    Sl
-subcmd scrap           Ns      Ns      Z       Z
-subcmd make-patches    sPft    "$Ep"   uPft    "$Ep"
+subcmd ''              Ult     Ull     Vlt     Vl      nU
+subcmd stitch          Ns      Nu      Sltf    Stf     Ns
+subcmd prepush         ns      nu      Sltf    Stf     ns
+subcmd quick           ns      Sl      Sltf    Sl      n
+subcmd conclude        "$Ec"   "$Ec"   Sltf    Sl      N
+subcmd scrap           Ns      Ns      Z       Z       N
+subcmd make-patches    sPft    "$Ep"   uPft    "$Ep"   Pn
 #
 # result codes, each one is a check:
 #   E:$pat     } this is an error (must come first)