diff options
author | QMK Bot <[email protected]> | 2022-07-26 16:38:06 +0000 |
---|---|---|
committer | QMK Bot <[email protected]> | 2022-07-26 16:38:06 +0000 |
commit | 61da9286a16fd2ad056316685e6d465801cdb4cd (patch) | |
tree | 374db8644e4db982f1cf4c00ae93b5db8f0cea35 /lib/python/qmk/git.py | |
parent | 0534b878c3750d45309dadfbcdceb66cd743e4da (diff) | |
parent | d1434b6d75865d91b6b6626a06b67e24bd81e145 (diff) | |
download | qmk_firmware-61da9286a16fd2ad056316685e6d465801cdb4cd.tar.gz qmk_firmware-61da9286a16fd2ad056316685e6d465801cdb4cd.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib/python/qmk/git.py')
-rw-r--r-- | lib/python/qmk/git.py | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/lib/python/qmk/git.py b/lib/python/qmk/git.py index 960184a0a2..7fa0306f5c 100644 --- a/lib/python/qmk/git.py +++ b/lib/python/qmk/git.py @@ -62,6 +62,25 @@ def git_get_tag(): return git_tag.stdout.strip() +def git_get_last_log_entry(branch_name): + """Retrieves the last log entry for the branch being worked on. + """ + git_lastlog = cli.run(['git', '--no-pager', 'log', '--pretty=format:%ad (%h) -- %s', '--date=iso', '-n1', branch_name]) + + if git_lastlog.returncode == 0 and git_lastlog.stdout: + return git_lastlog.stdout.strip() + + +def git_get_common_ancestor(branch_a, branch_b): + """Retrieves the common ancestor between for the two supplied branches. + """ + git_merge_base = cli.run(['git', 'merge-base', branch_a, branch_b]) + git_branchpoint_log = cli.run(['git', '--no-pager', 'log', '--pretty=format:%ad (%h) -- %s', '--date=iso', '-n1', git_merge_base.stdout.strip()]) + + if git_branchpoint_log.returncode == 0 and git_branchpoint_log.stdout: + return git_branchpoint_log.stdout.strip() + + def git_get_remotes(): """Returns the current remotes for a repo. """ |