From e3a7c9c0818b88f6a60cf8dfcf5bb3c47954c533 Mon Sep 17 00:00:00 2001 From: Darryl Green Date: Thu, 25 Jul 2019 14:33:33 +0100 Subject: [PATCH] Change worktree_rev to HEAD for rev-parse Due to how the checking script is run in docker, worktree_rev is ambiguous when running rev-parse. We're running it in the checked out worktree, so we can use HEAD instead, which is unambiguous. --- scripts/abi_check.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/abi_check.py b/scripts/abi_check.py index 533aaea3d..e19f2c0c6 100755 --- a/scripts/abi_check.py +++ b/scripts/abi_check.py @@ -107,7 +107,7 @@ class AbiChecker(object): ) self.log.debug(worktree_output.decode("utf-8")) version.commit = subprocess.check_output( - [self.git_command, "rev-parse", worktree_rev], + [self.git_command, "rev-parse", "HEAD"], cwd=git_worktree_path, stderr=subprocess.STDOUT ).decode("ascii").rstrip()