diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-17 11:21:51 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:03:11 +0100 |
| commit | 08ff874d10d649cb4ac3664772ac605873445aab (patch) | |
| tree | 20e69da76a6eb0d0121d4b90e37f0e392c6135a5 | |
| parent | 7f492dae0db33085a692ece232936313be7b44c1 (diff) | |
git-debrebase: test suite: do not dgit pull (sets a bad example)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| -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 |