Package: git-buildpackage Version: 0.9.20 Severity: normal gbp invokes git merge expecting the default behaviour of -ff; however, my global config sets --no-ff as default so I end up with unexpected merge commits. gbp should explicitly pass --ff to git merge and git pull in order to get the behaviour it expects.
-- System Information: Debian Release: bullseye/sid APT prefers unstable-debug APT policy: (500, 'unstable-debug'), (500, 'unstable'), (500, 'testing'), (101, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 5.7.0-2-amd64 (SMP w/8 CPU threads) Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE Locale: LANG=en_ZA.utf8, LC_CTYPE=en_ZA.utf8 (charmap=UTF-8), LANGUAGE not set Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled Versions of packages git-buildpackage depends on: ii devscripts 2.20.4 ii git 1:2.28.0-1 ii man-db 2.9.3-2 ii python3 3.8.2-3 ii python3-dateutil 2.8.1-4 ii python3-pkg-resources 46.1.3-1 ii sensible-utils 0.0.12+nmu1 Versions of packages git-buildpackage recommends: ii cowbuilder 0.88 ii pbuilder 0.230.4 ii pristine-tar 1.48 ii python3-requests 2.23.0+dfsg-2 ii sbuild 0.79.1-1 Versions of packages git-buildpackage suggests: pn python3-notify2 <none> ii sudo 1.9.1-2 ii unzip 6.0-25 -- no debconf information
