From 7a7d4edca749163adbed4c11093aa40d6b94e20b Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 17 Feb 2018 18:46:04 +0000 Subject: git-debrebase: test suite: gdr-import-dgit: move switch back to master (nfc) Signed-off-by: Ian Jackson --- tests/tests/gdr-import-dgit | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/tests') diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit index db07321..508f999 100755 --- a/tests/tests/gdr-import-dgit +++ b/tests/tests/gdr-import-dgit @@ -30,6 +30,8 @@ nmu-upload-2 () { dput -c $tmp/dput.cf test-dummy $c t-archive-process-incoming sid + cd $p + git checkout master } : 'non-dgit upload (but we prepare it with dgit anyway)' @@ -41,8 +43,6 @@ nmu-upload-2 : 'done the nmu, switching back to the maintainer hat' -cd $p -git checkout master t-dgit fetch git merge --ff-only dgit/dgit/sid -- cgit v1.2.3