Your message dated Thu, 5 Mar 2026 18:50:24 +0000
with message-id <[email protected]>
and subject line Re: Bug#1129577: git-debrebase: make-patches prevents CI build
has caused the Debian Bug report #1129577,
regarding git-debrebase: make-patches prevents CI build
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
1129577: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1129577
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: git-debrebase
Version: 14.9

When using the recommended salsa-ci script from
https://diziet.dreamwidth.org/20851.html , then the builds will start
to fail when it was finally possible to get all patches upstreamed.

Let us have a look at the problematic part in the CI script:

  - git-debrebase make-patches
  # make an orig tarball using the upstream tag, not a gbp upstream/ tag
  # https://salsa.debian.org/salsa-ci-team/pipeline/-/issues/541
  - git-deborig

If no patch could be extracted from the git branch (because all of
them were upstreamed - yeah!!!), make-patches will print:

No (more) patches to export.

This is a failure, according to the git-debrebase script - even when
it would be a goal which every Debian package should try to achieve.
The git-debrebase script will return a 255 error in this situation.
Because of this return value, the CI will stop the processing -
git-deborig will therefore never run.

The whole CI run will then stop with an error like:

/usr/bin/bash: line 260: cd: /builds/whatever/foobar/debian/output: No
such file or directory


When git-debrebase wants to become a viable option then it should not
force anyone to switch back-and-forth between git-debrebase and
git-merge based workflow whenever a Debian package switches between
(long standing) patches and when not needing patches at all.

--- End Message ---
--- Begin Message ---
Ian Jackson writes ("Bug#1129577: git-debrebase: make-patches prevents CI 
build"):
> Ian Jackson writes ("Bug#1129577: git-debrebase: make-patches prevents CI 
> build"):
> > This seems to be a global option, rather than an option to
> > make-patches.  So
> > 
> >     git-debrebase --noop-ok make-patches
> 
> Please let me know if this works for you.  If so I should probably
> edit the blog post, given that we still don't have first-class support
> in the Salsa CI pipeline.

I have now edited the blog post, in the hope of preventing anyone else
from tripping over this.  Sorry for the inconvenience, and thanks for
the report.

Ian.

-- 
Ian Jackson <[email protected]>   These opinions are my own.  

Pronouns: they/he.  If I emailed you from @fyvzl.net or @evade.org.uk,
that is a private address which bypasses my fierce spamfilter.

--- End Message ---

Reply via email to