From: Ian Jackson Date: Sat, 7 Jan 2017 17:40:25 +0000 (+0000) Subject: test suite: gbp-orig: Add a missing -m X-Git-Tag: archive/debian/3.0~96 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7bff1293fb88d8cd1c3548aaf7a04fdbc12724d3;p=dgit.git 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 --- diff --git a/debian/changelog b/debian/changelog index 7d84c7bb..c3e4f58e 100644 --- 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! + * 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 beea1216..9a4937cb 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