Merge pull request #14392 from williamdes/issue-14391-git-worktree

Add support for commondir file in .git dir
phpmyadmin · Jun 16, 2018 · d8199e2 · d8199e2
2 parents d6cfb36 + 13e34b4
commit d8199e2
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php
@@ -436,6 +436,10 @@ public function checkGitRevision(): void
             return;
         }
 
+        if ($common_dir_contents = @file_get_contents($git_folder . '/commondir')) {
+            $git_folder = $git_folder.DIRECTORY_SEPARATOR.trim($common_dir_contents);
+        }
+
         $branch = false;
         // are we on any branch?
         if (strstr($ref_head, '/')) {