ref(pkg): merge pkg/gitreceive/git into pkg/git

Aaron Schlesinger · Aaron Schlesinger · commit 8dbe172219d8 · 2016-03-30T16:52:23.000-07:00
diff --git a/pkg/git/sha.go b/pkg/git/sha.go
diff --git a/pkg/git/sha_test.go b/pkg/git/sha_test.go
diff --git a/pkg/gitreceive/build.go b/pkg/gitreceive/build.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 
 	"github.com/deis/builder/pkg"
-	"github.com/deis/builder/pkg/gitreceive/git"
+	"github.com/deis/builder/pkg/git"
 	"github.com/deis/builder/pkg/storage"
 	"github.com/deis/builder/pkg/sys"
 	"github.com/deis/pkg/log"
diff --git a/pkg/gitreceive/controller.go b/pkg/gitreceive/controller.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/deis/builder/pkg"
-	"github.com/deis/builder/pkg/gitreceive/git"
+	"github.com/deis/builder/pkg/git"
 	"github.com/deis/pkg/log"
 )
 
diff --git a/pkg/gitreceive/controller_test.go b/pkg/gitreceive/controller_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/arschles/assert"
 	"github.com/deis/builder/pkg"
-	"github.com/deis/builder/pkg/gitreceive/git"
+	"github.com/deis/builder/pkg/git"
 )
 
 const (
diff --git a/pkg/gitreceive/slug_builder_info.go b/pkg/gitreceive/slug_builder_info.go
@@ -2,6 +2,8 @@ package gitreceive
 
 import (
 	"fmt"
+
+	"github.com/deis/builder/pkg/git"
 )
 
 const (

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"strings"`
`10`	`10`
`11`	`11`	`"github.com/deis/builder/pkg"`
`12`		`- "github.com/deis/builder/pkg/gitreceive/git"`
	`12`	`+ "github.com/deis/builder/pkg/git"`
`13`	`13`	`"github.com/deis/pkg/log"`
`14`	`14`	`)`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`
`6`	`6`	`"github.com/arschles/assert"`
`7`	`7`	`"github.com/deis/builder/pkg"`
`8`		`- "github.com/deis/builder/pkg/gitreceive/git"`
	`8`	`+ "github.com/deis/builder/pkg/git"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@ package gitreceive`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
	`5`	`+`
	`6`	`+ "github.com/deis/builder/pkg/git"`
`5`	`7`	`)`
`6`	`8`
`7`	`9`	`const (`