diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-07-31 13:37:39 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-07-31 13:38:19 +0100 |
commit | cd06cd0cf3b1190fde3862684a18a1d7d56a834e (patch) | |
tree | c61612cb2bd49737d46057c8e30ac7d586fb7b2d /debian | |
parent | e5d430e4208757b874443779b75ca884a143aa6a (diff) |
git-debrebase: Improve error message for convert-from-gbp upstream discrepancy
Closes:#905078.
I don't intend to print `small' diffs because I think that kind of
dwim is probably more annoying than helpful.
I don't intend to factor this kind of pattern out throughout because:
The messages for these commands are generally not the actual diff rune
dgit or gdr ran, for various reasons (notably that dgit/gdr often use
object hashes). The result is that there is little duplication.
So I think the situation now is OK.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index dc87466..3948db7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ dgit (6.3~) unstable; urgency=medium * git-debrebase: convert-from-gbp: Use same algorithm for finding upstream commitish as new-upstream. Closes:#905062. * git-debrebase: Improve error messages for bad options. + * git-debrebase: Improve error message for convert-from-gbp + upstream discrepancy. Closes:#905078. -- |