#1144142 git-debpush complains about missing 'git-merge-base'

#1144142#5
Date:
2026-08-11 15:10:07 UTC
From:
To:
My system upgraded me to this version, and I'm seeing these errors:

jas@frallan:~/dpkg/golang-github-charmbracelet-x$ git-debpush --remote=origin --quilt=unapplied --upstream=upstream/0.0_git20251028.0cf22f8+ds
git-debpush: checking state at git@salsa.debian.org:go-team/packages/golang-github-charmbracelet-x.git
/usr/bin/git-debpush: rad 1017: git-merge-base: kommandot finns inte

I made uploads rather recently with an earlier version and did not see
this, so I believe the error message was introduced recently.

/Simon

#1144142#10
Date:
2026-08-11 22:24:04 UTC
From:
To:
Simon Josefsson writes ("Bug#1144142: git-debpush complains about missing 'git-merge-base'"):

Hi.  Thanks for the report.

This seems to be a bug in commit 533683852981
  git-debpush: Push refs/heads/upstream too, when appropriate
which was in dgit 16.4.

I don't know why the tests didn't catch this (and I'm not in a position
to investigate that now).  It WFM locally because I have
/usr/lib/git-core on my personal PATH.

Yes.

I'll upload a fix shortly.  In the meantime downgrading to 16.3 would
help if you can get your apt machinery to do that.

Ian.

#1144142#17
Date:
2026-08-11 23:35:53 UTC
From:
To:
We believe that the bug you reported is fixed in the latest version of
dgit, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 1144142@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Ian Jackson <ijackson@chiark.greenend.org.uk> (supplier of updated dgit package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
Format: 1.8
Date: Tue, 11 Aug 2026 23:25:25 +0100
Source: dgit
Architecture: source
Version: 16.7
Distribution: unstable
Urgency: medium
Maintainer: Debian tag2upload Delegates <dgit-owner@debian.org>
Changed-By: Ian Jackson <ijackson@chiark.greenend.org.uk>
Closes: 1144142
Changes:
 dgit (16.7) unstable; urgency=medium
 .
   * git-debpush: Call `git merge-base`, not `git-merge-base`.
     [Report from Simon Josefsson]  Closes: #1144142.
Checksums-Sha1:
 3cf33c0abddaca1dd00ac7ca3e57573e5c3e1f82 2533 dgit_16.7.dsc
 e7530d165a5e191d28420122fae62d9e54e0d3aa 1067964 dgit_16.7.tar.gz
 27394c1b372b0db46fd8ce28a36df793638107bc 1371944 dgit_16.7.git.tar.xz
 308a01eea0765f3825c198e1a3fa43fb9ae7db70 17528 dgit_16.7_source.buildinfo
Checksums-Sha256:
 b4e11dfca38e6a45c8909586391fff8f9a93ba07d189c06a56de9a675d73ec17 2533 dgit_16.7.dsc
 9d31f2cd27d1e1f08f29f3f7f8b023fb2a4b1f9355ad5b22d4d5940137d79487 1067964 dgit_16.7.tar.gz
 fc661a35f600b504205f07de87e3953eac32094dfdc9db20d53e2c6ec72b2c17 1371944 dgit_16.7.git.tar.xz
 d0cc77155cff269cf97280171db7b07e1caa2aef466eb2114b4f09c92f45053b 17528 dgit_16.7_source.buildinfo
Files:
 e67ace964cf26d5e7d255a52f6ffb76a 2533 devel optional dgit_16.7.dsc
 4298d88ed5b25d949126f6bfe6bd804e 1067964 devel optional dgit_16.7.tar.gz
 401381dab7b8f8a1f553e9a79d99b68a 1371944 devel optional dgit_16.7.git.tar.xz
 8ff54916ea6db227c0f4f82354e006dc 17528 devel optional dgit_16.7_source.buildinfo
Git-Tag-Info: tag=4aefba1198daa89ba4cf79a95343a1b88f8408fc fp=41638114d132883b25a20ddd47515757d8002456
Git-Tag-Tagger: Ian Jackson <ijackson@chiark.greenend.org.uk>
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEN02M5NuW6cvUwJcqYG0ITkaDwHkFAmp7q/wACgkQYG0ITkaD
wHl8ChAA5LtAS5cHEDQfrJy5JY72IbowTIEGk/9DvAcgG+z22xE0pKNtwJH0bpxy
IHJJHKq5Bckl1V8vqXxQFj88bXA3PUFiviXMf6WpJw+U5rzAwdlWt2gbkbFNYuvY
2dvWDfBV1uSe7sn1j4TSr8tyvMC8eqSD5AzGX1KFNf9aBF1cK7tq1gs/CVjn6uM7
wMCSW5zbBMKpZUtbxQp+EDmIyYYmil70lBms+pp0vmk7gzpBVmkHfI+R+aMJyW6x
/QX0cbPTzWF3pQ1O0AYIeG3UO8okr3my62cu8yMMw4TP1+f6nOAAVjgeP9/MYr7T
R2dexXgnAM9wfME0Iju7R1Vq2oe+4Ufi6UlfwTe4GB+6Uj3LBB1DAAhk7vZmPHpn
nX/IIa8SC/j8mUEN4BLfM+n5bUUcyV7ZnubahW8tbTrhzhJLhUFxhV9RxZqZonyV
z4IsWlM6lgfgB5NPT9xWGvE5KU608X4Te6z2yWAtARyTfvj3ekOPc/43NnSsGRxg
1gcJLunxIK1Mb7hreHXUxqmdHthHpX9w5ly6CYuAnfXUv6ukOacnxmPIn+tducWC
/SOD1ykzryugBXIWXxCUkP+kJOKxhg7Cy417noGYCe385zt/+x4IN1VqFVZSt/JY
ybpG2KdB90OQ+Gs+/wDorgtxLA/Rn2ahWev01jvjse9jgZkCXKc=
=C5rK
-----END PGP SIGNATURE-----