chiark / gitweb /
test suite: gbp-orig: Add a missing -m
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 7 Jan 2017 17:40:25 +0000 (17:40 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 8 Jan 2017 22:14:26 +0000 (22:14 +0000)
Without this, it would run an editor if stdout was a tty (!)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
debian/changelog
tests/tests/gbp-orig

index 7d84c7b..c3e4f58 100644 (file)
@@ -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!
+  * gbp-orig: Add a missing -m, without which git would run an
+    editor if stdout was a tty (!)
 
  --
 
index beea121..9a4937c 100755 (executable)
@@ -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