Hello,

On Fri 24 Oct 2025 at 11:05am +01, Ian Jackson wrote:

> Package: git-debpush
> Version: 13.16
>
> Steps
>
>   git clone https://salsa.debian.org/python-team/packages/python-pywebview.git
>   git clone python-pywebview python-pywebview2
>   cd python-pywebview
>   git checkout 785853591bf76cca44d596e9fb26eb990e3de4b2
>   git remote add test $(cd ../python-pywebview2; pwd)
>   git-debpush --quilt=baredebian --force=detached 
> --force=superfluous-quilt-mode --force=remake-tag --remote=test
>
> Actual behaviour
>
>   git-debpush: warning: HEAD is detached; you probably don't want to debpush 
> it ('detached' check)
>   git-debpush: checking state at /volatile/ian/d/python-pywebview2
>   git-debpush: warning: unneeded --quilt=baredebian on command line, would 
> have autodetected it ('superfluous-quilt-mode' check)
>   error: corrupt patch at line 26
>   git-debpush: check failed: 'git apply' failed to apply patch 
> remove-dlls.patch ('patches-nonapplicable' check)
>   --- existing tag debian/6.1+dfsg-1
>   +++ tag we will make
>   @@ -1,7 +1,7 @@
>    object 785853591bf76cca44d596e9fb26eb990e3de4b2
>    type commit
>    tag debian/6.1+dfsg-1
>   -tagger Jonathan Carter <[email protected]> [date]
>   +tagger Ian Jackson <[email protected]> [date]
>
>    python-pywebview release 6.1+dfsg-1 for unstable
>
>   git-debpush: warning: tag already exists, and is different to the one we 
> propose to make ('remake-tag' check)
>   git-debpush: some non-overridden check(s) failed; you can pass -f/--force 
> to ignore them
>
> Expected behaviour
>
>   It should prompt me for the failed `patches-nonapplicable` check.
>
> Notes
>
> It repros in dry run mode, too, without needing the "test" remote:
>
>   git-debpush --quilt=baredebian --force=detached 
> --force=superfluous-quilt-mode --force=remake-tag --dry-run --print-tag-text

I wonder if this could be connected with how we pass --whitespace=nowarn
to git-apply.

-- 
Sean Whitton

Attachment: signature.asc
Description: PGP signature

Reply via email to