diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | tests/tests/gbp-orig | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 7d84c7b..c3e4f58 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 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 |