Skip to content
This repository was archived by the owner on Nov 27, 2020. It is now read-only.

add name-rev trying to retrieve a nice version #255

Merged
merged 1 commit into from
Jan 10, 2012
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion bin/vendors
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,19 @@ foreach ($deps as $name => $dep) {
if ('update' === $command || 'lock' === $command) {
ob_start();
system(sprintf('cd %s && git log -n 1 --format=%%H', escapeshellarg($installDir)));
$newversions[] = trim($name.' '.ob_get_clean());
$newversion = trim(ob_get_clean());

ob_start();
system(sprintf('cd %s && git name-rev --tags --name-only %s', escapeshellarg($installDir), $newversion));
// remove trailing ^0 from tags, those are the tags themselves
$niceversion = preg_replace('/\^0$/', '', trim(ob_get_clean()));

// undefined is returned in case no name-rev could be found
if ('undefined' !== $niceversion) {
$newversions[] = $name.' '.$niceversion;
} else {
$newversions[] = $name.' '.$newversion;
}
}
}

Expand Down