Seb35 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378223 )
Change subject: Improve GitInfo for reading packed refs
......................................................................
Improve GitInfo for reading packed refs
GitInfo only reads branches in files /refs/heads/*; it should also
read those in /.git/packed-refs.
Bug: T155747
Change-Id: Icccdf3ec797788582f836e2d8e267a1d714d50dc
---
M includes/GitInfo.php
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/23/378223/1
diff --git a/includes/GitInfo.php b/includes/GitInfo.php
index 4351acc..3c600ed 100644
--- a/includes/GitInfo.php
+++ b/includes/GitInfo.php
@@ -191,8 +191,14 @@
} else {
// If not a SHA1 it may be a ref:
$refFile = "{$this->basedir}/{$head}";
+ $packedRefs = "{$this->basedir}/packed-refs";
+ $headRegex = preg_quote( $head, '/' );
if ( is_readable( $refFile ) ) {
$sha1 = rtrim( file_get_contents(
$refFile ) );
+ } elseif ( is_readable( $packedRefs ) &&
+ preg_match( "/^([0-9A-Fa-f]{40})
$headRegex$/m", file_get_contents( $packedRefs ), $matches )
+ ) {
+ $sha1 = $matches[1];
}
}
$this->cache['headSHA1'] = $sha1;
--
To view, visit https://gerrit.wikimedia.org/r/378223
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icccdf3ec797788582f836e2d8e267a1d714d50dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Seb35 <se...@seb35.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
