summaryrefslogtreecommitdiff
path: root/tests/tests
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-07 17:40:25 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-08 22:14:26 +0000
commit7bff1293fb88d8cd1c3548aaf7a04fdbc12724d3 (patch)
treeffb9068467019e682386a721a43e9548d49dfedb /tests/tests
parent8dd1a763317ffb423a6e08a118d638215946269d (diff)
test suite: gbp-orig: Add a missing -m
Without this, it would run an editor if stdout was a tty (!) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests')
-rwxr-xr-xtests/tests/gbp-orig2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/tests/gbp-orig b/tests/tests/gbp-orig
index beea121..9a4937c 100755
--- a/tests/tests/gbp-orig
+++ b/tests/tests/gbp-orig
@@ -38,7 +38,7 @@ git commit -m 'Import 1.0'
git tag upstream/1.0
git checkout quilt-tip
-t-git-pseudo-merge upstream
+t-git-pseudo-merge -m 'gbp-orig pseudomerge' upstream
v=1.0-1