summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-02-17 18:46:04 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 16:04:33 +0100
commit7a7d4edca749163adbed4c11093aa40d6b94e20b (patch)
treee35f2486dc34f8e98375698a0591d1206da9ec0c
parent365c711e32f08d43d6f2eee5f66e2794c3a4a465 (diff)
git-debrebase: test suite: gdr-import-dgit: move switch back to master (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xtests/tests/gdr-import-dgit4
1 files changed, 2 insertions, 2 deletions
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