From 047db2064cbc162d8fceff77ec6dd38eab135c6c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 26 Jun 2018 18:44:55 +0100 Subject: test suite: Test GIT_REFLOG_ACTION setting by git-debrebase Signed-off-by: Ian Jackson --- tests/tests/gdr-newupstream | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tests/tests/gdr-newupstream') diff --git a/tests/tests/gdr-newupstream b/tests/tests/gdr-newupstream index 536f49c..cfa0052 100755 --- a/tests/tests/gdr-newupstream +++ b/tests/tests/gdr-newupstream @@ -37,6 +37,7 @@ git tag v2.1 upstream t-git-debrebase new-upstream $v t-gdr-good laundered +git reflog | egrep 'debrebase new-upstream.*checkout' t-git-debrebase stitch t-gdr-good stitched @@ -54,8 +55,11 @@ anchor=$(perl <../anal.anch -ne ' exit; ') +GIT_REFLOG_ACTION='STUNT-RLA' \ t-git-debrebase --anchor=$anchor -fanchor-treated new-upstream $v upstream t-gdr-good laundered +git reflog | egrep 'STUNT-RLA: debrebase new-upstream' +git reflog | egrep 'STUNT-RLA: debrebase: launder for new upstream' t-git-debrebase stitch t-gdr-good stitched -- cgit v1.2.3 From 3fbce7431379321c745f304c0f0134ae9b066701 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 27 Jun 2018 21:41:38 +0100 Subject: test suite: gdr-viagit, gdr-newupstream: do not auto-import t-setup-gnupg. We provide a new mechanism for individual tests to disable the automatic t-setup-import of gnupg. We need to add this to all the other setup/ that these import, too. gdr-convert-gbp is particularly awkward because it wants gnupg if $ifarchive isn't `:'. There we arrange to suppress its automatic inclusion, but add it again by hand if appropriate. This fixes these two tests in chroots without gnupg. Closes:#902559. Signed-off-by: Ian Jackson --- tests/tests/gdr-newupstream | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/tests/gdr-newupstream') diff --git a/tests/tests/gdr-newupstream b/tests/tests/gdr-newupstream index cfa0052..ee987f5 100755 --- a/tests/tests/gdr-newupstream +++ b/tests/tests/gdr-newupstream @@ -1,5 +1,6 @@ #!/bin/bash set -e +autoimport= . tests/lib t-dependencies NO-DGIT GDR -- cgit v1.2.3 From 422f18bf5da933f789e8b2b818d558a66f4d5dcf Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 7 Jul 2018 00:31:09 +0100 Subject: test suite: gdr-newupstream: Test adding revision Signed-off-by: Ian Jackson --- tests/tests/gdr-newupstream | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests/tests/gdr-newupstream') diff --git a/tests/tests/gdr-newupstream b/tests/tests/gdr-newupstream index ee987f5..39ed24b 100755 --- a/tests/tests/gdr-newupstream +++ b/tests/tests/gdr-newupstream @@ -36,7 +36,8 @@ t-git-debrebase new-upstream $v git tag v2.1 upstream -t-git-debrebase new-upstream $v +t-git-debrebase new-upstream ${v%-*} + t-gdr-good laundered git reflog | egrep 'debrebase new-upstream.*checkout' -- cgit v1.2.3