From 4311d14688d39a907eb8de329a8d5c57fd9ef316 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Fri, 5 Apr 2013 00:11:32 +0200 Subject: [PATCH] gentree: fix describe version bug With the --git-revision option, that revision needs to be used for the output version, not 'HEAD'. Signed-off-by: Johannes Berg --- gentree.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gentree.py b/gentree.py index 5c59a059f825..ad1240cd6657 100755 --- a/gentree.py +++ b/gentree.py @@ -379,7 +379,8 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None, # write the versioning file backports_version = backport_version_name or git.describe(tree=source_dir) - kernel_version = kernel_version_name or git.describe(tree=args.kerneldir) + kernel_version = kernel_version_name or git.describe(rev=args.git_revision or 'HEAD', + tree=args.kerneldir) f = open(os.path.join(args.outdir, 'versions'), 'w') f.write('BACKPORTS_VERSION="%s"\n' % backports_version) f.write('BACKPORTED_KERNEL_VERSION="%s"\n' % kernel_version) -- 2.30.2