From: Michael M Slusarz Date: Tue, 30 Dec 2008 22:06:17 +0000 (-0700) Subject: Merge from CVS HEAD 1.14 X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=8f496bf1fe975c830cf8b13f81e3138320692f6c;p=horde.git Merge from CVS HEAD 1.14 --- diff --git a/framework/Vcs/lib/Horde/Vcs/Git.php b/framework/Vcs/lib/Horde/Vcs/Git.php index afc8a04a9..10e54d2b4 100644 --- a/framework/Vcs/lib/Horde/Vcs/Git.php +++ b/framework/Vcs/lib/Horde/Vcs/Git.php @@ -220,7 +220,7 @@ class Horde_Vcs_Diff_git extends Horde_Vcs_Diff */ public function getRevisionRange($rep, $file, $r1, $r2) { - $cmd = $rep->getCommand() . ' rev-list ' . $r1 . '..' . $r2; + $cmd = $rep->getCommand() . ' rev-list ' . $r1 . '..' . $r2 . ' -- "' . $file->queryModulePath() . '"'; $pipe = popen($cmd, 'r'); if (!is_resource($pipe)) { throw new Horde_Vcs_Exception('Unable to run ' . $cmd . ': ' . error_get_last()); @@ -234,7 +234,6 @@ class Horde_Vcs_Diff_git extends Horde_Vcs_Diff } } - $revs[] = $r1; pclose($pipe); return $revs;