From 9eb82d6ceb5a26ed05c110ad39e4f47254ecbcc9 Mon Sep 17 00:00:00 2001
From: Nathan Williams <nathan@teamtreehouse.com>
Date: Wed, 11 Mar 2015 12:21:08 -0700
Subject: [PATCH] use same cached volumes between branches

---
 shared/build/build.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/shared/build/build.go b/shared/build/build.go
index 850a2d57..cb2f60fa 100644
--- a/shared/build/build.go
+++ b/shared/build/build.go
@@ -362,7 +362,6 @@ func (b *Builder) run() error {
 	conf.Volumes = make(map[string]struct{})
 	for _, volume := range b.Build.Cache {
 		name := filepath.Clean(b.Repo.Name)
-		branch := filepath.Clean(b.Repo.Branch)
 		volume := filepath.Clean(volume)
 
 		// with Docker, volumes must be an absolute path. If an absolute
@@ -374,7 +373,7 @@ func (b *Builder) run() error {
 
 		// local cache path on the host machine
 		// this path is going to be really long
-		hostpath := filepath.Join(tmpPath, name, branch, volume)
+		hostpath := filepath.Join(tmpPath, name, volume)
 
 		// check if the volume is created
 		if _, err := os.Stat(hostpath); err != nil {