diff options
| -rwxr-xr-x | tests/tests/gdr-import-dgit | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit index 0522818..a9a3187 100755 --- a/tests/tests/gdr-import-dgit +++ b/tests/tests/gdr-import-dgit @@ -32,7 +32,8 @@ t-archive-process-incoming sid cd $p git checkout master -t-dgit pull +t-dgit fetch +git merge --ff-only dgit/dgit/sid git diff --exit-code nmu |