Update source/dist refs when a commit is recovered from, fixes composer#1130

Seldaek · Seldaek · commit f6666fe60141 · 2014-01-01T18:22:35.000+01:00
diff --git a/src/Composer/Downloader/GitDownloader.php b/src/Composer/Downloader/GitDownloader.php
@@ -43,7 +43,12 @@ public function doDownload(PackageInterface $package, $path)
         $this->runCommand($commandCallable, $package->getSourceUrl(), $path, true);
         $this->setPushUrl($package, $path);
 
-        $this->updateToCommit($path, $ref, $package->getPrettyVersion(), $package->getReleaseDate());
+        if ($newRef = $this->updateToCommit($path, $ref, $package->getPrettyVersion(), $package->getReleaseDate())) {
+            if ($package->getDistReference() === $package->getSourceReference()) {
+                $package->setDistReference($newRef);
+            }
+            $package->setSourceReference($newRef);
+        }
     }
 
     /**
@@ -72,7 +77,12 @@ public function doUpdate(PackageInterface $initial, PackageInterface $target, $p
         };
 
         $this->runCommand($commandCallable, $target->getSourceUrl(), $path);
-        $this->updateToCommit($path, $ref, $target->getPrettyVersion(), $target->getReleaseDate());
+        if ($newRef =  $this->updateToCommit($path, $ref, $target->getPrettyVersion(), $target->getReleaseDate())) {
+            if ($target->getDistReference() === $target->getSourceReference()) {
+                $target->setDistReference($newRef);
+            }
+            $target->setSourceReference($newRef);
+        }
     }
 
     /**
@@ -183,6 +193,15 @@ protected function reapplyChanges($path)
         }
     }
 
+    /**
+     * Updates the given apth to the given commit ref
+     *
+     * @param string $path
+     * @param string $reference
+     * @param string $branch
+     * @param DateTime $date
+     * @return null|string if a string is returned, it is the commit reference that was checked out if the original could not be found
+     */
     protected function updateToCommit($path, $reference, $branch, $date)
     {
         $template = 'git checkout %s && git reset --hard %1$s';
@@ -264,7 +283,7 @@ protected function updateToCommit($path, $reference, $branch, $date)
             if (0 === $this->process->execute($command, $output, $path)) {
                 $this->io->write('    '.$reference.' is gone (history was rewritten?), recovered by checking out '.$newReference);
 
-                return;
+                return $newReference;
             }
         }
 
