Bug#922462: git debrebase convert-from-gbp fails on cups-filters with unhelpful error message
Ian Jackson writes ("Re: Bug#922462: git debrebase convert-from-gbp fails on
cups-filters with unhelpful error message"):
> Doing that git-diff rune shows that you have made changes to the
> toplevel .gitignore which are not in any patch.
>
> I'm not sure whether git-debrebase convert-from-gbp should
> automatically turn your .gitignore changes into a delta queue commit.
> What do people think ?
I should expand on this to explain why the answer to this question is
not simply `yes'. ISTM that in a number of cases, the maintainer will
want instead to drop (some of) the .gitignore changes.
For example, in this case the change made to the upstream .gitignore
was precisely to ignore `.pc'. Of course with git-debrebase one never
encounters a .pc directory and there is no need to have it in
.gitignore.
So, Didier:
If you git rm your .gitignore, you can do the conversion. You will
unfortunately encounter another half-broken error message. In that
case, the correct message would be:
git-debrebase: snag detected (-funexpected-upstream-changes): history between
upstream (upstream/1.22.1) and HEAD contains direct changes to upstream files -
are you sure this is a gbp (patches-unapplied) branch?
list expected changes with: git log --stat --ancestry-path
0030fffefd69db302f302c3494a08f192609b2a2..HEAD -- :/ ':!/debian'
and running this shows two commits: `Merge upstream 1.22.1 version and
refresh git-dpm patches' where presumably .gitignore came in, and the
one I made which removed .gitignore again. This is as expected,
under the circumstances.
With -funexpected-upstream-changes the conversion seems to go ahead.
I will fix the broken messages.
Ian.
--
Ian JacksonThese opinions are my own.
If I emailed you from an address @fyvzl.net or @evade.org.uk, that is
a private address which bypasses my fierce spamfilter.
Bug#922462: git debrebase convert-from-gbp fails on cups-filters with unhelpful error message
Didier 'OdyX' Raboud writes ("Bug#922462: git debrebase convert-from-gbp fails
on cups-filters with unhelpful error message"):
> Just after importing cups-filters' latest upstream releas, I considered moving
> to git debrebase (for the occasional patches); but didn't manage:
>
> $ export LANG=C
> $ git clone -b debian/experimental
> https://salsa.debian.org/printing-team/cups-filters/ cups-filters
> $ cd cups-filters
> $ git debrebase convert-from-gbp
> .gitignore | 1 +
> 1 file changed, 1 insertion(+)
> Use of uninitialized value $_[1] in sprintf at
> /usr/share/dgit/gdr/perl5/Debian/Dgit/I18n.pm line 26.
> at /usr/share/dgit/gdr/perl5/Debian/Dgit.pm line 145.
> Debian::Dgit::__ANON__("Use of uninitialized value \$_[1] in
> sprintf at /usr/share/dgi"...) called at
> /usr/share/dgit/gdr/perl5/Debian/Dgit/I18n.pm line 26
> Debian::Dgit::I18n::f_("upstream (%s) and HEAD are
> not\x{a}identical in upstream files. "..., undef, undef) called at
> /usr/bin/git-debrebase line 2562
> main::cmd_convert_from_gbp() called at /usr/bin/git-debrebase
> line 3050
Well, I have fixed bug which was just in the error handling. The
message you should have received is this:
git-debrebase: error: upstream (upstream/1.22.1) and HEAD are not
git-debrebase: identical in upstream files. See diffstat above, or run
git-debrebase: git diff 0030fffefd69db302f302c3494a08f192609b2a2 HEAD --
:!/debian :/
Doing that git-diff rune shows that you have made changes to the
toplevel .gitignore which are not in any patch.
I'm not sure whether git-debrebase convert-from-gbp should
automatically turn your .gitignore changes into a delta queue commit.
What do people think ?
Ian.
--
Ian JacksonThese opinions are my own.
If I emailed you from an address @fyvzl.net or @evade.org.uk, that is
a private address which bypasses my fierce spamfilter.
Bug#922462: git debrebase convert-from-gbp fails on cups-filters with unhelpful error message
Didier 'OdyX' Raboud writes ("Bug#922462: git debrebase convert-from-gbp fails
on cups-filters with unhelpful error message"):
> Package: git-debrebase
> Version: 8.3
> Severity: important
>
> Hi there,
>
> Just after importing cups-filters' latest upstream releas, I considered moving
> to git debrebase (for the occasional patches); but didn't manage:
>
> $ export LANG=C
> $ git clone -b debian/experimental
> https://salsa.debian.org/printing-team/cups-filters/ cups-filters
> $ cd cups-filters
> $ git debrebase convert-from-gbp
> .gitignore | 1 +
> 1 file changed, 1 insertion(+)
> Use of uninitialized value $_[1] in sprintf at
> /usr/share/dgit/gdr/perl5/Debian/Dgit/I18n.pm line 26.
> at /usr/share/dgit/gdr/perl5/Debian/Dgit.pm line 145.
Indeed it does this for me too. This is clearly a bug.
For my reference: the input commit is
3d4187026eb5d427f287059b694dbe6543e34bce
Ian.
Bug#922462: git debrebase convert-from-gbp fails on cups-filters with unhelpful error message
Package: git-debrebase
Version: 8.3
Severity: important
Hi there,
Just after importing cups-filters' latest upstream releas, I considered moving
to git debrebase (for the occasional patches); but didn't manage:
$ export LANG=C
$ git clone -b debian/experimental
https://salsa.debian.org/printing-team/cups-filters/ cups-filters
$ cd cups-filters
$ git debrebase convert-from-gbp
.gitignore | 1 +
1 file changed, 1 insertion(+)
Use of uninitialized value $_[1] in sprintf at
/usr/share/dgit/gdr/perl5/Debian/Dgit/I18n.pm line 26.
at /usr/share/dgit/gdr/perl5/Debian/Dgit.pm line 145.
Debian::Dgit::__ANON__("Use of uninitialized value \$_[1] in
sprintf at /usr/share/dgi"...) called at
/usr/share/dgit/gdr/perl5/Debian/Dgit/I18n.pm line 26
Debian::Dgit::I18n::f_("upstream (%s) and HEAD are
not\x{a}identical in upstream files. "..., undef, undef) called at
/usr/bin/git-debrebase line 2562
main::cmd_convert_from_gbp() called at /usr/bin/git-debrebase line
3050
-- System Information:
Debian Release: buster/sid
APT prefers buildd-unstable
APT policy: (990, 'buildd-unstable'), (500, 'unstable-debug'), (500,
'oldstable-proposed-updates'), (500, 'unstable'), (500, 'testing'), (500,
'stable'), (100, 'experimental'), (1, 'experimental-debug')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.19.0-3-amd64 (SMP w/4 CPU cores)
Kernel taint flags: TAINT_WARN, TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=fr_CH.UTF-8, LC_CTYPE=fr_CH.UTF-8 (charmap=UTF-8),
LANGUAGE=fr_CH:fr (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Versions of packages git-debrebase depends on:
ii devscripts 2.19.2
ii git [git-core] 1:2.20.1-2
ii git-core1:2.15.0~rc0-1
ii libdpkg-perl1.19.4
ii libfile-fnmatch-perl0.02-2+b6
ii liblocale-gettext-perl 1.07-3+b4
ii perl5.28.1-4
Versions of packages git-debrebase recommends:
ii dgit 8.3
ii git-buildpackage 0.9.13
git-debrebase suggests no packages.
-- no debconf information
