diff --git a/ciq-cherry-pick.py b/ciq-cherry-pick.py index 513f65d..3cac8bd 100644 --- a/ciq-cherry-pick.py +++ b/ciq-cherry-pick.py @@ -1,11 +1,12 @@ import argparse import os import subprocess +import git from ciq_helpers import CIQ_cherry_pick_commit_standardization from ciq_helpers import CIQ_original_commit_author_to_tag_string # from ciq_helpers import * -MERGE_MSG = '.git/MERGE_MSG' +MERGE_MSG = git.Repo(os.getcwd()).git_dir + '/MERGE_MSG' if __name__ == '__main__': print("CIQ custom cherry picker")