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>
Sat, 16 Jun 2018 15:04:33 +0000 (16:04 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
tests/tests/gdr-import-dgit

index db07321df1441f1e1c8d5e9f2370621ee2f1ab2f..508f99974568443702c7240ef5044ce10ea5f785 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