From: Ian Jackson Date: Sat, 11 Aug 2018 11:00:24 +0000 (+0100) Subject: test suite: lib-gdr: t-gdr-good: Introduce $anal X-Git-Tag: archive/debian/6.7~134 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=e7178a4a4eafad6d816a48c18c2a159f4dd3e40c;ds=sidebyside test suite: lib-gdr: t-gdr-good: Introduce $anal NFC Signed-off-by: Ian Jackson --- diff --git a/tests/lib-gdr b/tests/lib-gdr index 849e3f64..a13696d7 100644 --- a/tests/lib-gdr +++ b/tests/lib-gdr @@ -51,9 +51,10 @@ t-gdr-good () { pushed-interop) etypes=Pseudomerge-AddPatchesInterop-Upstream ;; esac - t-git-debrebase analyse >../anal.check + anal=../anal + t-git-debrebase analyse >$anal.check expect=`git rev-parse HEAD` - exec <../anal.check + exec <$anal.check local cid ctype info nparents while read cid ctype info; do : ===== $cid $ctype $info ===== @@ -108,9 +109,9 @@ t-gdr-good () { : 'reject pointless pseudomerges' local overwritten=${parents/$expect/} overwritten=${overwritten// /} - t-git-debrebase analyse $overwritten >../anal.overwr + t-git-debrebase analyse $overwritten >$anal.overwr local ocid otype oinfo - read <../anal.overwr ocid otype oinfo + read <$anal.overwr ocid otype oinfo case "$otype" in Pseudomerge) test "x$info" != "x$oinfo" ;; esac