From d678d4bf33b6de7894125dca26595989cb9f1d07 Mon Sep 17 00:00:00 2001 From: Rick Olson Date: Mon, 25 May 2015 12:20:50 -0600 Subject: [PATCH] update import paths --- commands/command_clean.go | 2 +- commands/command_env.go | 2 +- commands/command_init.go | 2 +- commands/command_logs.go | 2 +- commands/command_ls_files.go | 2 +- commands/command_pointer.go | 2 +- commands/command_push.go | 4 ++-- commands/command_smudge.go | 2 +- commands/command_status.go | 2 +- commands/command_track.go | 2 +- commands/command_untrack.go | 2 +- commands/command_update.go | 2 +- commands/command_version.go | 2 +- commands/commands.go | 2 +- commands/commands_pre_push.go | 2 +- commands/commands_test.go | 2 +- commands/init_test.go | 2 +- commands/pointer_test.go | 2 +- commands/smudge_test.go | 2 +- git/git.go | 2 +- lfs/client.go | 2 +- lfs/config_test.go | 2 +- lfs/http.go | 2 +- lfs/lfs.go | 2 +- lfs/pointer_smudge.go | 6 +++--- lfs/pointer_test.go | 2 +- lfs/scanner.go | 2 +- lfs/ssh.go | 2 +- lfs/upload_queue.go | 2 +- lfs/util_test.go | 2 +- vendor/_nuts/github.com/ogier/pflag/flag.go | 2 +- vendor/_nuts/github.com/olekukonko/ts/doc.go | 2 +- 32 files changed, 35 insertions(+), 35 deletions(-) diff --git a/commands/command_clean.go b/commands/command_clean.go index fc176e75..7da22c0a 100644 --- a/commands/command_clean.go +++ b/commands/command_clean.go @@ -4,7 +4,7 @@ import ( "os" "github.com/github/git-lfs/lfs" - "github.com/spf13/cobra" + "github.com/github/git-lfs/vendor/_nuts/github.com/spf13/cobra" ) var ( diff --git a/commands/command_env.go b/commands/command_env.go index 459449e1..8cfb0300 100644 --- a/commands/command_env.go +++ b/commands/command_env.go @@ -2,7 +2,7 @@ package commands import ( "github.com/github/git-lfs/lfs" - "github.com/spf13/cobra" + "github.com/github/git-lfs/vendor/_nuts/github.com/spf13/cobra" ) var ( diff --git a/commands/command_init.go b/commands/command_init.go index 9e89ef45..bf1bba3a 100644 --- a/commands/command_init.go +++ b/commands/command_init.go @@ -2,7 +2,7 @@ package commands import ( "github.com/github/git-lfs/lfs" - "github.com/spf13/cobra" + "github.com/github/git-lfs/vendor/_nuts/github.com/spf13/cobra" ) var ( diff --git a/commands/command_logs.go b/commands/command_logs.go index 46209d41..53da90db 100644 --- a/commands/command_logs.go +++ b/commands/command_logs.go @@ -7,7 +7,7 @@ import ( "path/filepath" "github.com/github/git-lfs/lfs" - "github.com/spf13/cobra" + "github.com/github/git-lfs/vendor/_nuts/github.com/spf13/cobra" ) var ( diff --git a/commands/command_ls_files.go b/commands/command_ls_files.go index a9d03237..5b5febef 100644 --- a/commands/command_ls_files.go +++ b/commands/command_ls_files.go @@ -3,7 +3,7 @@ package commands import ( "github.com/github/git-lfs/git" "github.com/github/git-lfs/lfs" - "github.com/spf13/cobra" + "github.com/github/git-lfs/vendor/_nuts/github.com/spf13/cobra" ) var ( diff --git a/commands/command_pointer.go b/commands/command_pointer.go index 6211e44c..b4905a12 100644 --- a/commands/command_pointer.go +++ b/commands/command_pointer.go @@ -11,7 +11,7 @@ import ( "os/exec" "github.com/github/git-lfs/lfs" - "github.com/spf13/cobra" + "github.com/github/git-lfs/vendor/_nuts/github.com/spf13/cobra" ) var ( diff --git a/commands/command_push.go b/commands/command_push.go index c19c1323..b3de0f25 100644 --- a/commands/command_push.go +++ b/commands/command_push.go @@ -7,8 +7,8 @@ import ( "github.com/github/git-lfs/git" "github.com/github/git-lfs/lfs" - "github.com/rubyist/tracerx" - "github.com/spf13/cobra" + "github.com/github/git-lfs/vendor/_nuts/github.com/rubyist/tracerx" + "github.com/github/git-lfs/vendor/_nuts/github.com/spf13/cobra" ) var ( diff --git a/commands/command_smudge.go b/commands/command_smudge.go index bcd82ca1..99543b0f 100644 --- a/commands/command_smudge.go +++ b/commands/command_smudge.go @@ -7,7 +7,7 @@ import ( "path/filepath" "github.com/github/git-lfs/lfs" - "github.com/spf13/cobra" + "github.com/github/git-lfs/vendor/_nuts/github.com/spf13/cobra" ) var ( diff --git a/commands/command_status.go b/commands/command_status.go index 4f4ea066..6ba316e8 100644 --- a/commands/command_status.go +++ b/commands/command_status.go @@ -5,7 +5,7 @@ import ( "github.com/github/git-lfs/git" "github.com/github/git-lfs/lfs" - "github.com/spf13/cobra" + "github.com/github/git-lfs/vendor/_nuts/github.com/spf13/cobra" ) var ( diff --git a/commands/command_track.go b/commands/command_track.go index 2120cb2c..53d6c432 100644 --- a/commands/command_track.go +++ b/commands/command_track.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/github/git-lfs/lfs" - "github.com/spf13/cobra" + "github.com/github/git-lfs/vendor/_nuts/github.com/spf13/cobra" ) var ( diff --git a/commands/command_untrack.go b/commands/command_untrack.go index f2ebc480..ca5e2630 100644 --- a/commands/command_untrack.go +++ b/commands/command_untrack.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/github/git-lfs/lfs" - "github.com/spf13/cobra" + "github.com/github/git-lfs/vendor/_nuts/github.com/spf13/cobra" ) var ( diff --git a/commands/command_update.go b/commands/command_update.go index d554ae5c..fdfba5f6 100644 --- a/commands/command_update.go +++ b/commands/command_update.go @@ -2,7 +2,7 @@ package commands import ( "github.com/github/git-lfs/lfs" - "github.com/spf13/cobra" + "github.com/github/git-lfs/vendor/_nuts/github.com/spf13/cobra" ) var ( diff --git a/commands/command_version.go b/commands/command_version.go index 309aa386..f0b18fdc 100644 --- a/commands/command_version.go +++ b/commands/command_version.go @@ -2,7 +2,7 @@ package commands import ( "github.com/github/git-lfs/lfs" - "github.com/spf13/cobra" + "github.com/github/git-lfs/vendor/_nuts/github.com/spf13/cobra" ) var ( diff --git a/commands/commands.go b/commands/commands.go index aaefec3f..2688c67b 100644 --- a/commands/commands.go +++ b/commands/commands.go @@ -12,7 +12,7 @@ import ( "time" "github.com/github/git-lfs/lfs" - "github.com/spf13/cobra" + "github.com/github/git-lfs/vendor/_nuts/github.com/spf13/cobra" ) var ( diff --git a/commands/commands_pre_push.go b/commands/commands_pre_push.go index d751b542..39979d01 100644 --- a/commands/commands_pre_push.go +++ b/commands/commands_pre_push.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/github/git-lfs/lfs" - "github.com/spf13/cobra" + "github.com/github/git-lfs/vendor/_nuts/github.com/spf13/cobra" ) var ( diff --git a/commands/commands_test.go b/commands/commands_test.go index 213ddc85..1f100303 100644 --- a/commands/commands_test.go +++ b/commands/commands_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - "github.com/technoweenie/assert" + "github.com/github/git-lfs/vendor/_nuts/github.com/technoweenie/assert" ) var ( diff --git a/commands/init_test.go b/commands/init_test.go index 4bbbc310..30a39e6c 100644 --- a/commands/init_test.go +++ b/commands/init_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/technoweenie/assert" + "github.com/github/git-lfs/vendor/_nuts/github.com/technoweenie/assert" ) func TestInit(t *testing.T) { diff --git a/commands/pointer_test.go b/commands/pointer_test.go index 76a5e10b..133e91c8 100644 --- a/commands/pointer_test.go +++ b/commands/pointer_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/technoweenie/assert" + "github.com/github/git-lfs/vendor/_nuts/github.com/technoweenie/assert" ) func TestPointerWithBuildAndCompareStdinMismatch(t *testing.T) { diff --git a/commands/smudge_test.go b/commands/smudge_test.go index 0ecbad65..96aafb40 100644 --- a/commands/smudge_test.go +++ b/commands/smudge_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "testing" - "github.com/technoweenie/assert" + "github.com/github/git-lfs/vendor/_nuts/github.com/technoweenie/assert" ) func TestSmudge(t *testing.T) { diff --git a/git/git.go b/git/git.go index e43e8748..a70441a7 100644 --- a/git/git.go +++ b/git/git.go @@ -8,7 +8,7 @@ import ( "os/exec" "strings" - "github.com/rubyist/tracerx" + "github.com/github/git-lfs/vendor/_nuts/github.com/rubyist/tracerx" ) func LsRemote(remote, remoteRef string) (string, error) { diff --git a/lfs/client.go b/lfs/client.go index 7d3b22c1..787ff794 100644 --- a/lfs/client.go +++ b/lfs/client.go @@ -14,7 +14,7 @@ import ( "regexp" "strconv" - "github.com/rubyist/tracerx" + "github.com/github/git-lfs/vendor/_nuts/github.com/rubyist/tracerx" ) const ( diff --git a/lfs/config_test.go b/lfs/config_test.go index 2b818bb6..1c65cd53 100644 --- a/lfs/config_test.go +++ b/lfs/config_test.go @@ -3,7 +3,7 @@ package lfs import ( "testing" - "github.com/technoweenie/assert" + "github.com/github/git-lfs/vendor/_nuts/github.com/technoweenie/assert" ) func TestEndpointDefaultsToOrigin(t *testing.T) { diff --git a/lfs/http.go b/lfs/http.go index 3f8ccad9..8e94380f 100644 --- a/lfs/http.go +++ b/lfs/http.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/rubyist/tracerx" + "github.com/github/git-lfs/vendor/_nuts/github.com/rubyist/tracerx" ) func DoHTTP(c *Configuration, req *http.Request) (*http.Response, error) { diff --git a/lfs/lfs.go b/lfs/lfs.go index d5a095fc..71778f9c 100644 --- a/lfs/lfs.go +++ b/lfs/lfs.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/github/git-lfs/git" - "github.com/rubyist/tracerx" + "github.com/github/git-lfs/vendor/_nuts/github.com/rubyist/tracerx" ) const Version = "0.5.1" diff --git a/lfs/pointer_smudge.go b/lfs/pointer_smudge.go index 8693f5ea..aa49fa68 100644 --- a/lfs/pointer_smudge.go +++ b/lfs/pointer_smudge.go @@ -6,9 +6,9 @@ import ( "os" "path/filepath" - "github.com/cheggaaa/pb" - "github.com/rubyist/tracerx" - contentaddressable "github.com/technoweenie/go-contentaddressable" + "github.com/github/git-lfs/vendor/_nuts/github.com/cheggaaa/pb" + "github.com/github/git-lfs/vendor/_nuts/github.com/rubyist/tracerx" + contentaddressable "github.com/github/git-lfs/vendor/_nuts/github.com/technoweenie/go-contentaddressable" ) func PointerSmudge(writer io.Writer, ptr *Pointer, workingfile string, cb CopyCallback) error { diff --git a/lfs/pointer_test.go b/lfs/pointer_test.go index 402c83e3..e86b9cb1 100644 --- a/lfs/pointer_test.go +++ b/lfs/pointer_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/technoweenie/assert" + "github.com/github/git-lfs/vendor/_nuts/github.com/technoweenie/assert" ) func TestEncode(t *testing.T) { diff --git a/lfs/scanner.go b/lfs/scanner.go index 57c3d7d1..d001e1e6 100644 --- a/lfs/scanner.go +++ b/lfs/scanner.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/rubyist/tracerx" + "github.com/github/git-lfs/vendor/_nuts/github.com/rubyist/tracerx" ) const ( diff --git a/lfs/ssh.go b/lfs/ssh.go index c8c8d88b..ef659ad8 100644 --- a/lfs/ssh.go +++ b/lfs/ssh.go @@ -4,7 +4,7 @@ import ( "encoding/json" "os/exec" - "github.com/rubyist/tracerx" + "github.com/github/git-lfs/vendor/_nuts/github.com/rubyist/tracerx" ) type sshAuthResponse struct { diff --git a/lfs/upload_queue.go b/lfs/upload_queue.go index 0442a895..4ea58b05 100644 --- a/lfs/upload_queue.go +++ b/lfs/upload_queue.go @@ -7,7 +7,7 @@ import ( "sync" "sync/atomic" - "github.com/cheggaaa/pb" + "github.com/github/git-lfs/vendor/_nuts/github.com/cheggaaa/pb" ) var ( diff --git a/lfs/util_test.go b/lfs/util_test.go index e5078f5f..c20ead75 100644 --- a/lfs/util_test.go +++ b/lfs/util_test.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "testing" - "github.com/technoweenie/assert" + "github.com/github/git-lfs/vendor/_nuts/github.com/technoweenie/assert" ) func TestWriterWithCallback(t *testing.T) { diff --git a/vendor/_nuts/github.com/ogier/pflag/flag.go b/vendor/_nuts/github.com/ogier/pflag/flag.go index f3830586..a6fe4376 100644 --- a/vendor/_nuts/github.com/ogier/pflag/flag.go +++ b/vendor/_nuts/github.com/ogier/pflag/flag.go @@ -16,7 +16,7 @@ pflag under the name "flag" then all code should continue to function with no changes. - import flag "github.com/ogier/pflag" + import flag "github.com/github/git-lfs/vendor/_nuts/github.com/ogier/pflag" There is one exception to this: if you directly instantiate the Flag struct there is one more field "Shorthand" that you will need to set. diff --git a/vendor/_nuts/github.com/olekukonko/ts/doc.go b/vendor/_nuts/github.com/olekukonko/ts/doc.go index 50c63cae..d73c57e6 100644 --- a/vendor/_nuts/github.com/olekukonko/ts/doc.go +++ b/vendor/_nuts/github.com/olekukonko/ts/doc.go @@ -20,7 +20,7 @@ Example import ( "fmt" - "github.com/olekukonko/ts" + "github.com/github/git-lfs/vendor/_nuts/github.com/olekukonko/ts" ) func main() {