X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fgdr-import-dgit;h=a9a318779877eac49c1e10a785856309cf70907d;hp=0522818bb6f17ea89f43cc0cab96b22d34330e4e;hb=08ff874d10d649cb4ac3664772ac605873445aab;hpb=7f492dae0db33085a692ece232936313be7b44c1 diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit index 0522818b..a9a31877 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