From a57ec40ef6d57b5aea62fbd1c814175d1da3fd23 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Tue, 19 Oct 2021 09:46:00 -0500 Subject: Fix shazam for multiple git worktrees The shazam command makes assumptions that '.git' is a directory which is not the case with multiple worktree. Use 'git rev-parse' instead to retrieve the correct paths. Signed-off-by: Rob Herring Signed-off-by: Konstantin Ryabitsev Link: https://lore.kernel.org/r/20211019144600.225058-1-robh@kernel.org --- b4/mbox.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/b4/mbox.py b/b4/mbox.py index 50dd2c3..1b35623 100644 --- a/b4/mbox.py +++ b/b4/mbox.py @@ -307,9 +307,13 @@ def make_am(msgs, cmdargs, msgid): logger.critical('Unable to fetch from the worktree') logger.critical(out.strip()) sys.exit(ecode) - # Edit the FETCH_HEAD to give a better default merge message - fhf = os.path.join(topdir, '.git', 'FETCH_HEAD') - with open(fhf, 'r') as fhh: + gitargs = ['rev-parse', '--git-path', 'FETCH_HEAD'] + ecode, fhf = b4.git_run_command(topdir, gitargs, logstderr=True) + if ecode > 0: + logger.critical('Unable to find FETCH_HEAD') + logger.critical(out.strip()) + sys.exit(ecode) + with open(fhf.rstrip(), 'r') as fhh: contents = fhh.read() linkurl = config['linkmask'] % top_msgid if len(am_msgs) > 1: @@ -321,7 +325,13 @@ def make_am(msgs, cmdargs, msgid): with open(fhf, 'w') as fhh: fhh.write(new_contents) - mmf = os.path.join(topdir, '.git', 'b4-cover') + gitargs = ['rev-parse', '--git-dir'] + ecode, fhf = b4.git_run_command(topdir, gitargs, logstderr=True) + if ecode > 0: + logger.critical('Unable to find git directory') + logger.critical(out.strip()) + sys.exit(ecode) + mmf = os.path.join(fhf.rstrip(), 'b4-cover') if lser.has_cover: merge_template = DEFAULT_MERGE_TEMPLATE if config.get('shazam-merge-template'): @@ -358,7 +368,7 @@ def make_am(msgs, cmdargs, msgid): logger.info('You can now merge or checkout FETCH_HEAD') if lser.has_cover: - logger.info(' e.g.: git merge -F .git/b4-cover --signoff --edit FETCH_HEAD') + logger.info(' e.g.: git merge -F $(git rev-parse --git-dir)/b4-cover --signoff --edit FETCH_HEAD') thanks_record_am(lser, cherrypick=cherrypick) return -- cgit v1.2.3