From 787ed37cb34003297e88a792de57f96f425e32a4 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 30 Nov 2011 11:40:35 -0500
Subject: [PATCH] git branches can share local clones

---
 src/lib/Hydra/Controller/API.pm   | 2 +-
 src/lib/Hydra/Helper/AddBuilds.pm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/Hydra/Controller/API.pm b/src/lib/Hydra/Controller/API.pm
index 69d85f7c..42e6e586 100644
--- a/src/lib/Hydra/Controller/API.pm
+++ b/src/lib/Hydra/Controller/API.pm
@@ -221,7 +221,7 @@ sub scmdiff : Chained('api') PathPart('scmdiff') Args(0) {
 	$diff .= `(cd $clonePath ; hg log -r $rev1 -r $rev2 -b $branch)`;
 	$diff .= `(cd $clonePath ; hg diff -r $rev1:$rev2)`;
     } elsif ($type eq "git") {
-        my $clonePath = scmPath . "/" . sha256_hex($uri.$branch);
+        my $clonePath = scmPath . "/" . sha256_hex($uri);
         die if ! -d $clonePath;
 	$diff .= `(cd $clonePath ; git log $rev1..$rev2)`;
 	$diff .= `(cd $clonePath ; git diff $rev1..$rev2)`;
diff --git a/src/lib/Hydra/Helper/AddBuilds.pm b/src/lib/Hydra/Helper/AddBuilds.pm
index df74b8ab..48764bf8 100644
--- a/src/lib/Hydra/Helper/AddBuilds.pm
+++ b/src/lib/Hydra/Helper/AddBuilds.pm
@@ -309,7 +309,7 @@ sub fetchInputGit {
 
     my $clonePath;
     mkpath(scmPath);
-    $clonePath = scmPath . "/" . sha256_hex($uri . $branch);
+    $clonePath = scmPath . "/" . sha256_hex($uri);
 
     my $stdout; my $stderr;
     if (! -d $clonePath) {