Package: git-buildpackage Version: 0.8.12.2 Severity: normal
As requested by the error message, I'm reporting this bug due to a failed merge and rollback. The git status is left with the merge staged, a simple hard reset finishes the rollback, the log shows the other refs are already clean. This is probably two bugs, the first being it should probably hang waiting for gpg-agent like a plain git commit does. -- Phil Morrell (emorrp1) --- $ git config commit.gpgsign true $ gpgconf --kill gpg-agent $ gbp import-orig --uscan --verbose gbp:debug: ['git', 'rev-parse', '--show-cdup'] gbp:debug: ['git', 'rev-parse', '--is-bare-repository'] gbp:debug: ['git', 'rev-parse', '--git-dir'] gbp:debug: ['git', 'for-each-ref', '--format=%(refname:short)', 'refs/heads/'] gbp:debug: ['git', 'show-ref', 'refs/heads/upstream'] gbp:debug: ['git', 'status', '--porcelain'] gbp:info: Launching uscan... uscan: Newest version of corsix-th on remote site is 0.62~beta1, local version is 0.61 uscan: => Newer package available from https://github.com/CorsixTH/CorsixTH/archive/v0.62-beta1.tar.gz uscan: Newest version of corsix-th on remote site is 0.62~beta1, specified download version is 0.62~beta1 gpgv: Signature made Tue 19 Jun 2018 12:04:14 BST gpgv: using RSA key DB147D8CD6737D34210D20235C251992033D3D7C gpgv: Good signature from "Stephen E. Baker <baker.stephe...@gmail.com>" gbp:info: using ../corsix-th_0.62~beta1.orig.tar.gz What is the upstream version? [0.62~beta1] gbp:debug: ['git', 'tag', '-l', 'upstream/0.62_beta1'] gbp:debug: tar ['-C', '../tmpGTL9A9', '-a', '-xf', '../corsix-th_0.62~beta1.orig.tar.gz'] [] gbp:debug: Unpacked '../corsix-th_0.62~beta1.orig.tar.gz' to '../tmpGTL9A9/CorsixTH-0.62-beta1' gbp:info: Importing '../corsix-th_0.62~beta1.orig.tar.gz' to branch 'upstream'... gbp:info: Source package is corsix-th gbp:info: Upstream version is 0.62~beta1 gbp:debug: ['git', 'show-ref', 'refs/heads/upstream'] gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'upstream'] gbp:debug: ['git', 'add', '-f', '.'] gbp:debug: ['git', 'write-tree'] gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'upstream'] gbp:debug: ['git', 'commit-tree', '919b2c7b3a2b47f228a0e9d565872459d6058d7d', '-p', '190b19595943f509ac539af75222d3d50f55b13d'] gbp:debug: ['git', 'update-ref', '-m', 'gbp: New upstream version 0.62~beta1', 'refs/heads/upstream', 'b0c68af6ca3c49131beb3181ebd220d28df81b69', '190b19595943f509ac539af75222d3d50f55b13d'] gbp:debug: ['git', 'show-ref', 'refs/heads/pristine-tar'] gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'pristine-tar'] gbp:debug: ['git', 'ls-tree', '-z', 'upstream', '--'] gbp:debug: ['git', 'mktree', '-z'] gbp:debug: /usr/bin/pristine-tar [] ['commit', '../corsix-th_0.62~beta1.orig.tar.gz', '919b2c7b3a2b47f228a0e9d565872459d6058d7d'] gbp:debug: ['git', 'tag', '-m', 'Upstream version 0.62~beta1', 'upstream/0.62_beta1', 'b0c68af6ca3c49131beb3181ebd220d28df81b69'] gbp:debug: ['git', 'show-ref', 'refs/heads/master'] gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'master'] gbp:info: Merging to 'master' gbp:debug: ['git', 'symbolic-ref', 'HEAD'] gbp:debug: ['git', 'show-ref', 'refs/heads/master'] gbp:debug: ['git', 'symbolic-ref', 'HEAD'] gbp:debug: ['git', 'show-ref', 'refs/heads/master'] gbp:debug: ['git', 'help', 'merge', '-m'] gbp:debug: ['git', 'merge', '--no-summary', '--no-edit', 'upstream/0.62_beta1'] gbp:error: Automatic merge failed. gbp:error: Error detected, Will roll back changes. gbp:info: Rolling back branch upstream by resetting it to 190b19595943f509ac539af75222d3d50f55b13d gbp:debug: ['git', 'update-ref', '-m', 'gbp import-orig: failure rollback of upstream', 'refs/heads/upstream', '190b19595943f509ac539af75222d3d50f55b13d'] gbp:info: Rolling back branch pristine-tar by resetting it to 977c78afc6f01e00be0dbe2389b66d92f2cae0d4 gbp:debug: ['git', 'update-ref', '-m', 'gbp import-orig: failure rollback of pristine-tar', 'refs/heads/pristine-tar', '977c78afc6f01e00be0dbe2389b66d92f2cae0d4'] gbp:info: Rolling back tag upstream/0.62_beta1 by deleting it gbp:debug: ['git', 'tag', '-l', 'upstream/0.62_beta1'] gbp:debug: ['git', 'tag', '-d', 'upstream/0.62_beta1'] gbp:info: Rolling back branch master by resetting it to 3b69a24ad49bf656e669525473cce349ba64ae2c gbp:debug: ['git', 'update-ref', '-m', 'gbp import-orig: failure rollback of master', 'refs/heads/master', '3b69a24ad49bf656e669525473cce349ba64ae2c'] gbp:info: Rolling back failed merge of upstream/0.62_beta1 gbp:debug: ['git', 'merge', '--abort'] gbp:error: Automatic rollback failed [('upstream/0.62_beta1', 'commit', 'abortmerge', None, GitRepositoryError('Error running git merge: fatal: There is no merge to abort (MERGE_HEAD missing).\n',))] gbp:error: Clean up manually and please report a bug: [('upstream/0.62_beta1', 'commit', 'abortmerge', None, GitRepositoryError('Error running git merge: fatal: There is no merge to abort (MERGE_HEAD missing).\n',))] gbp:debug: rm ['-rf', '../tmpGTL9A9'] [] -- System Information: Debian Release: 9.4 APT prefers stable-updates APT policy: (500, 'stable-updates'), (500, 'stable') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.9.0-6-amd64 (SMP w/4 CPU cores) Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8), LANGUAGE=en_GB:en (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) Versions of packages git-buildpackage depends on: ii devscripts 2.18.3~bpo9+1 ii git 1:2.11.0-3+deb9u3 ii man-db 2.7.6.1-2 ii python 2.7.13-2 ii python-dateutil 2.5.3-2 ii python-pkg-resources 33.1.1-1 ii python-six 1.10.0-3 Versions of packages git-buildpackage recommends: ii cowbuilder 0.85 ii pbuilder 0.228.7 ii pristine-tar 1.38 ii python-requests 2.12.4-1 Versions of packages git-buildpackage suggests: ii python-notify 0.1.1-4 ii sudo 1.8.19p1-2.1 ii unzip 6.0-21 -- no debconf information
signature.asc
Description: PGP signature