Bug 1246998 - Take worktrees into account in git mozreview
--- a/git/commands/git-mozreview
+++ b/git/commands/git-mozreview
@@ -53,17 +53,24 @@ CLIENT_CAPABILITIES = {
'bzapikeys',
'jsonproto',
'commitid',
}
MAX_REVIEW_COMMITS = 100
-git_dir = os.environ.get('GIT_DIR')
+git_dir = os.environ.get('GIT_COMMON_DIR')
+if not git_dir:
+ git_dir = os.environ.get('GIT_DIR')
+if not git_dir:
+ git_dir = subprocess.check_output(
+ ['git', 'rev-parse', '--no-flags', '--git-common-dir']).rstrip('\n')
+# git versions before 2.5 don't support --git-common-dir, so fallback to
+# --git-dir
if not git_dir:
git_dir = subprocess.check_output(
['git', 'rev-parse', '--git-dir']).rstrip('\n')
def gethgui():
"""Obtain a Mercurial ui instance.