Package: git-debrebase Version: 6.6 Severity: normal Hi,
after seeing your nice Debconf talk I wanted to try git-debrebase with one of my gbp packages: ~> gbp clone g...@salsa.debian.org:science-team/ros-catkin-pkg.git gbp:info: Cloning from 'g...@salsa.debian.org:science-team/ros-catkin-pkg.git' ~> cd ros-catkin-pkg/ ~/ros-catkin-pkg> git debrebase convert-from-gbp last finished-looking changelog entry: (0.4.8-1) unstable fatal: Not a valid object name archive/debian/0.4.8-1 git-debrebase: failed command: git merge-base debian/0.4.8-1 archive/debian/0.4.8-1 cannot stitch in dgit view: git-debrebase: error: subprocess failed with error exit status 128 gbp:info: Trying to apply patches at '890d18fdad1d01ebe1a4c63bf29fe085df941939' gbp:info: 1 patches listed in 'debian/patches/series' imported on 'patch-queue/gdr-internal' OK, you are ahead of refs/remotes/origin/master HEAD is now at 64f563f Set default ROS_DISTRO to debian I'm not sure why it wants the archive/debian/0.4.8-1 object (it's not part of my gbp workflow at least), but creating it somehow solves it: ~/ros-catkin-pkg> cd .. ~> rm -rf ros-catkin-pkg/ ~> gbp clone g...@salsa.debian.org:science-team/ros-catkin-pkg.git gbp:info: Cloning from 'g...@salsa.debian.org:science-team/ros-catkin-pkg.git' ~> cd ros-catkin-pkg/ ~/ros-catkin-pkg> git tag archive/debian/0.4.8-1 debian/0.4.8-1 ~/ros-catkin-pkg> git debrebase convert-from-gbp last finished-looking changelog entry: (0.4.8-1) unstable warning: tag 'debian/0.4.8-1' is really 'archive/debian/0.4.8-1' here will stitch in dgit view, archive/debian/0.4.8-1 gbp:info: Trying to apply patches at '890d18fdad1d01ebe1a4c63bf29fe085df941939' gbp:info: 1 patches listed in 'debian/patches/series' imported on 'patch-queue/gdr-internal' OK, you are ahead of refs/remotes/origin/master HEAD is now at 34c0148 git-debrebase import: declare ff from dgit archive view As far es I can see, the second variant adds a merge commit (declare ff from dgit archive view) on top. I think having errors during such a conversion at least gives some doubts on the correctness, so would be great if you could look into this. Cheers Jochen -- System Information: Debian Release: buster/sid APT prefers unstable APT policy: (500, 'unstable') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.17.0-3-amd64 (SMP w/4 CPU cores) Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), LANGUAGE=de_DE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) Versions of packages git-debrebase depends on: ii git [git-core] 1:2.18.0-1 ii libdpkg-perl 1.19.0.5 ii libfile-fnmatch-perl 0.02-2+b5 ii perl 5.26.2-7 Versions of packages git-debrebase recommends: ii dgit 6.6 ii git-buildpackage 0.9.9 git-debrebase suggests no packages. -- no debconf information
