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>

diff --git a/debian/changelog b/debian/changelog
index 7d84c7bb8433f30627a2950420b1bbc83c723506..c3e4f58e81d6df8b0d4c9f14232ac4057252eeaa 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ dgit (2.17~) unstable; urgency=medium
   * badcommit-rewrite: Fix operation using installed version of fixup.
   * Arrange to pass --debug-quick-random to gpg-agent.
   * Strip block count out of find -ls output - it is unstable!
   * badcommit-rewrite: Fix operation using installed version of fixup.
   * Arrange to pass --debug-quick-random to gpg-agent.
   * Strip block count out of find -ls output - it is unstable!

+  * gbp-orig: Add a missing -m, without which git would run an
+    editor if stdout was a tty (!)

 
  --
 
 
  --
 

diff --git a/tests/tests/gbp-orig b/tests/tests/gbp-orig
index beea12169d711f415aadc13598744998430ff2ad..9a4937cb1e6f0fc91a9fd6a17d8152d45a13c709 100755 (executable)
--- 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
 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
 
 
 v=1.0-1