HBASE-20106 [api compliance chacker] Fix Bug Where Branch Isn't Found While git rev-parse, sometimes the branch cannot be found unless the remote is specified. This fix tries to use "origin" if the remote is not specified and the branch is not found.
Signed-off-by: Sean Busbey <bus...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2f3632a2 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2f3632a2 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2f3632a2 Branch: refs/heads/HBASE-19397-branch-2 Commit: 2f3632a2a47cc7a24f475460532fc14b0cf47254 Parents: f71c00c Author: Alex Leblang <alex.lebl...@cloudera.com> Authored: Thu Sep 7 12:31:53 2017 -0400 Committer: Sean Busbey <bus...@apache.org> Committed: Wed Feb 28 11:54:31 2018 -0600 ---------------------------------------------------------------------- dev-support/checkcompatibility.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/2f3632a2/dev-support/checkcompatibility.py ---------------------------------------------------------------------- diff --git a/dev-support/checkcompatibility.py b/dev-support/checkcompatibility.py index 83189cf..ea9c229 100755 --- a/dev-support/checkcompatibility.py +++ b/dev-support/checkcompatibility.py @@ -116,7 +116,12 @@ def checkout_java_tree(rev, path): def get_git_hash(revname): """ Convert 'revname' to its SHA-1 hash. """ - return check_output(["git", "rev-parse", revname], + try: + return check_output(["git", "rev-parse", revname], + cwd=get_repo_dir()).strip() + except: + revname = "origin/" + revname + return check_output(["git", "rev-parse", revname], cwd=get_repo_dir()).strip()
