Skip to content

use github.com/sourcegraph/go-diff import path instead of custom sourcegraph.com/... import path #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,10 @@
sudo: false
language: go
go:
- "1.10.x"
- "1.x"
- "tip"
matrix:
allow_failures:
- go: tip
fast_finish: true
before_install:
- mkdir -p $HOME/gopath/src/sourcegraph.com/sourcegraph
- mv $TRAVIS_BUILD_DIR $HOME/gopath/src/sourcegraph.com/sourcegraph/go-diff
- export TRAVIS_BUILD_DIR=$HOME/gopath/src/sourcegraph.com/sourcegraph/go-diff
- cd $TRAVIS_BUILD_DIR
install:
- # Do nothing. This is needed to prevent default install action "go get -t -v ./..." from happening here (we want it to happen inside script step).
- "1.12.x"
script:
- GO111MODULE=on go get -t -v ./...
- diff -u <(echo -n) <(gofmt -d -s .)
- GO111MODULE=on go tool vet .
- GO111MODULE=on go test -v -race ./...
- GO111MODULE=on go test -v -race -coverprofile=coverage.txt -covermode=atomic ./...
after_success:
- bash <(curl -s https://codecov.io/bash)
2 changes: 1 addition & 1 deletion cmd/go-diff/go-diff.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"log"
"os"

"sourcegraph.com/sourcegraph/go-diff/diff"
"github.com/sourcegraph/go-diff/diff"
)

// A diagnostic program to aid in debugging diff parsing or printing
Expand Down
2 changes: 1 addition & 1 deletion diff/doc.go
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// Package diff provides a parser for unified diffs.
package diff // import "sourcegraph.com/sourcegraph/go-diff/diff"
package diff
6 changes: 3 additions & 3 deletions diff/testdata/empty_multi.diff
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
diff --git Godeps/_workspace/src/sourcegraph.com/sourcegraph/go-diff/diff/testdata/empty.diff Godeps/_workspace/src/sourcegraph.com/sourcegraph/go-diff/diff/testdata/empty.diff
diff --git Godeps/_workspace/src/github.com/sourcegraph/go-diff/diff/testdata/empty.diff Godeps/_workspace/src/github.com/sourcegraph/go-diff/diff/testdata/empty.diff
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git Godeps/_workspace/src/sourcegraph.com/sourcegraph/go-diff/diff/testdata/empty_new.diff Godeps/_workspace/src/sourcegraph.com/sourcegraph/go-diff/diff/testdata/empty_new.diff
diff --git Godeps/_workspace/src/github.com/sourcegraph/go-diff/diff/testdata/empty_new.diff Godeps/_workspace/src/github.com/sourcegraph/go-diff/diff/testdata/empty_new.diff
new file mode 100644
index 0000000000000000000000000000000000000000..527e2e70f57b02e709f53e3ac2b7f59e2b5a46bc
--- /dev/null
+++ Godeps/_workspace/src/sourcegraph.com/sourcegraph/go-diff/diff/testdata/empty_new.diff
+++ Godeps/_workspace/src/github.com/sourcegraph/go-diff/diff/testdata/empty_new.diff
@@ -0,0 +1,2 @@
+@@ -1,1 +0,0 @@
+-b
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module sourcegraph.com/sourcegraph/go-diff
module github.com/sourcegraph/go-diff

require (
github.com/gogo/protobuf v1.1.1
Expand Down