#865573 git-buildpackage: gbp import-orig git_2.13.1.orig.tar.xz fails

Package:
pristine-tar
Source:
pristine-tar
Description:
regenerate pristine tarballs
Submitter:
Nishanth Aravamudan
Date:
2018-12-03 06:39:03 UTC
Severity:
normal
#865573#5
Date:
2017-06-22 20:01:09 UTC
From:
To:
Dear Maintainer,

The Ubuntu git importer is unable to import the orig tarballs for the
latest uploads to Debian for src:git, as pristine-tar is unable to
recreate the provided orig tarball.

Verbose log is:

# gbp import-orig ../git_2.13.1.orig.tar.xz --pristine-tar --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:debug: ['git', 'rev-parse', '--quiet', '--verify', 'master:debian/changelog']
What will be the source package name? [git]
What is the upstream version? [2.13.1]
gbp:debug: ['git', 'tag', '-l', 'upstream/2.13.1']
gbp:debug: tar ['-C', '../tmphDjmdz', '-a', '-xf', '../git_2.13.1.orig.tar.xz'] []
gbp:debug: Unpacked '../git_2.13.1.orig.tar.xz' to '../tmphDjmdz/git-2.13.1'
gbp:info: Importing '../git_2.13.1.orig.tar.xz' to branch 'upstream'...
gbp:info: Source package is git
gbp:info: Upstream version is 2.13.1
gbp:debug: ['git', 'show-ref', 'refs/heads/upstream']
gbp:debug: ['git', 'add', '-f', '.']
gbp:debug: ['git', 'write-tree']
gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'upstream']
gbp:debug: Will create missing branch 'upstream'...
gbp:debug: ['git', 'commit-tree', '517e235ade1f8ffecdaf048f7f7adb494383bbca']
gbp:debug: ['git', 'update-ref', '-m', 'gbp: New upstream version 2.13.1', 'refs/heads/upstream', '0ae0e594ef4d5a2756ca561e56c68c0ddee8e6ba']
gbp:debug: ['git', 'show-ref', 'refs/heads/pristine-tar']
gbp:debug: ['git', 'ls-tree', '-z', 'upstream', '--']
gbp:debug: ['git', 'mktree', '-z']
gbp:debug: /usr/bin/pristine-tar [] ['commit', '../git_2.13.1.orig.tar.xz', '517e235ade1f8ffecdaf048f7f7adb494383bbca']
gbp:error: Couldn't commit to 'pristine-tar' with upstream '517e235ade1f8ffecdaf048f7f7adb494383bbca': pristine-xz failed to reproduce build of ../git_2.13.1.orig.tar.xz
(Please file a bug report.)
pristine-tar: command failed: pristine-xz --no-verbose --no-debug --no-keep gendelta ../git_2.13.1.orig.tar.xz /tmp/pristine-tar.DKOKI61g5N/wrapper
pristine-tar: failed to generate delta
gbp:error: Import of ../git_2.13.1.orig.tar.xz failed: Couldn't commit to 'pristine-tar' with upstream '517e235ade1f8ffecdaf048f7f7adb494383bbca': pristine-xz failed to reproduce build of ../git_2.13.1.orig.tar.xz
(Please file a bug report.)
pristine-tar: command failed: pristine-xz --no-verbose --no-debug --no-keep gendelta ../git_2.13.1.orig.tar.xz /tmp/pristine-tar.DKOKI61g5N/wrapper
pristine-tar: failed to generate delta
gbp:error: Error detected, Will roll back changes.
gbp:info: Rolling back branch upstream by deleting it
gbp:debug: ['git', 'show-ref', 'refs/heads/upstream']
gbp:debug: ['git', 'symbolic-ref', 'HEAD']
gbp:debug: ['git', 'show-ref', 'refs/heads/master']
gbp:debug: ['git', 'branch', '-D', 'upstream']
gbp:info: Rolling back branch pristine-tar by deleting it
gbp:debug: ['git', 'show-ref', 'refs/heads/pristine-tar']
gbp:error: Rolled back changes after import error.
gbp:debug: rm ['-rf', '../tmphDjmdz'] []


And I'm reporting the bug as requested :)

#865573#10
Date:
2017-06-22 21:13:27 UTC
From:
To:
control: reassign -1 pristine-tar

That's an issue in pristine-tar. Reassigning. Can you add the
pristine-tar version you used?
Cheers,
 -- Guido

#865573#19
Date:
2017-06-22 21:31:42 UTC
From:
To:
D'oh! Sorry about that!

I reproduced the issue (the above is from the same env) in a Debian Sid
LXD.

# apt policy pristine-tar
pristine-tar:
  Installed: 1.38
  Candidate: 1.38
  Version table:
 *** 1.38 500
        500 http://httpredir.debian.org/debian sid/main amd64 Packages
        100 /var/lib/dpkg/status

#865573#24
Date:
2018-12-03 06:26:44 UTC
From:
To:
Dear Maintainer,

I believe this issue was fixed in pristine-tar 1.43 by commit 19ca81c.[1]
Running pristine-tar on git_2.13.1.orig.tar.xz from kernel.org[2]
correctly determines that `xz --check=crc32 -z -T6 -9` reproduces the
original xz file.

Cheers,
Kevin

1.  https://salsa.debian.org/debian/pristine-tar/commit/19ca81c392f7d7489aa24095c23ed31cb336e53f
2.  https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.13.1.tar.xz