X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-import-dgit;fp=tests%2Ftests%2Fgdr-import-dgit;h=508f99974568443702c7240ef5044ce10ea5f785;hb=7a7d4edca749163adbed4c11093aa40d6b94e20b;hp=db07321df1441f1e1c8d5e9f2370621ee2f1ab2f;hpb=365c711e32f08d43d6f2eee5f66e2794c3a4a465;p=dgit.git 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