chiark / gitweb /
git-debrebase: test suite: gdr-import-dgit: move switch back to master (nfc)
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 17 Feb 2018 18:46:04 +0000 (18:46 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 18 Feb 2018 12:04:45 +0000 (12:04 +0000)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
tests/tests/gdr-import-dgit

index df2b2dcc42739d6bac5e3d362fc3342692ef61ea..cb018792a5d92679ae2dddb1bd4f88f404ae58b2 100755 (executable)
@@ -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