diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2024-04-11 22:39:37 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2024-04-12 00:36:15 +0100 |
| commit | 3a9cf5355290ecba47dde0377e1c8914a9762b45 (patch) | |
| tree | eeabc3321f7110c341b53fc3a6b65f8df2209944 | |
| parent | bcfeb4763d9b0641b07b236f5ccb7c646dbcb056 (diff) | |
git-debrebase: Recommend --trust-changelog in a message
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| -rwxr-xr-x | git-debrebase | 2 | ||||
| -rwxr-xr-x | tests/tests/gdr-import-nostitch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/git-debrebase b/git-debrebase index d66fd9a..e06963b 100755 --- a/git-debrebase +++ b/git-debrebase @@ -2584,7 +2584,7 @@ END print STDERR f_ <<END, "$@"; Cannot confirm dgit view: %s Failed to stitch in dgit view (see messages above). -dgit --overwrite will be needed on the first dgit push after conversion. +dgit --trust-changelog will be needed on the first dgit push after conversion. END } diff --git a/tests/tests/gdr-import-nostitch b/tests/tests/gdr-import-nostitch index c32b71e..3833c2e 100755 --- a/tests/tests/gdr-import-nostitch +++ b/tests/tests/gdr-import-nostitch @@ -25,6 +25,6 @@ t-git-debrebase -fupstream-has-debian -funused-patches -fseries-comments \ convert-from-gbp \ 2>&1 | tee ../convert-msg -grep -e 'dgit --overwrite will be needed' ../convert-msg >/dev/null +grep -e 'dgit --trust-changelog will be needed' ../convert-msg >/dev/null t-ok |