have_rev = process.returncode == 0
if not have_rev:
- v.status('Fetching ref "%s" from %s' % (channel.git_ref, channel.git_repo))
+ v.status(
+ 'Fetching ref "%s" from %s' %
+ (channel.git_ref, channel.git_repo))
# We don't use --force here because we want to abort and freak out if forced
# updates are happening.
process = subprocess.run(['git',
channel.git_ref])
v.result(process.returncode == 0)
+ if hasattr(channel, 'old_git_revision'):
+ v.status(
+ 'Verifying rev is an ancestor of previous rev %s' %
+ channel.old_git_revision)
+ process = subprocess.run(['git',
+ '-C',
+ channel.git_cachedir,
+ 'merge-base',
+ '--is-ancestor',
+ channel.old_git_revision,
+ channel.git_revision])
+ v.result(process.returncode == 0)
+
def compare_tarball_and_git(
v: Verification,