From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 17 Feb 2018 18:46:04 +0000 (+0000)
Subject: git-debrebase: test suite: gdr-import-dgit: move switch back to master (nfc)
X-Git-Tag: archive/debian/5.0~177
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=inline;h=7a7d4edca749163adbed4c11093aa40d6b94e20b;p=dgit.git

git-debrebase: test suite: gdr-import-dgit: move switch back to master (nfc)

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

diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit
index db07321d..508f9997 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