Merge pull request #5035 from bpoldrack/fix-gh-5030

datalad · Oct 14, 2020 · c8dd728 · c8dd728
2 parents 7e5dca1 + 908d3e8
commit c8dd728
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/datalad/cmd.py b/datalad/cmd.py
@@ -1091,7 +1091,12 @@ def _get_bundled_path():
             alongside = False
         else:
             annex_path = op.dirname(op.realpath(annex_fpath))
-            alongside = op.lexists(op.join(annex_path, 'git'))
+            bundled_git_path = op.join(annex_path, 'git')
+            # we only need to consider bundled git if it's actually different
+            # from default. (see issue #5030)
+            alongside = op.lexists(bundled_git_path) and \
+                        bundled_git_path != op.realpath(find_executable('git'))
+
         return annex_path if alongside else ''
 
     @staticmethod