Skip to content

Commit c825d9a

Browse files
authored
Merge pull request #30 from sourcegraph/github-import-path
use github.com/sourcegraph/go-diff import path instead of custom sourcegraph.com/... import path
2 parents dee78e5 + de643bf commit c825d9a

File tree

5 files changed

+10
-22
lines changed

5 files changed

+10
-22
lines changed

.travis.yml

+4-16
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,10 @@
11
sudo: false
22
language: go
33
go:
4-
- "1.10.x"
5-
- "1.x"
6-
- "tip"
7-
matrix:
8-
allow_failures:
9-
- go: tip
10-
fast_finish: true
11-
before_install:
12-
- mkdir -p $HOME/gopath/src/sourcegraph.com/sourcegraph
13-
- mv $TRAVIS_BUILD_DIR $HOME/gopath/src/sourcegraph.com/sourcegraph/go-diff
14-
- export TRAVIS_BUILD_DIR=$HOME/gopath/src/sourcegraph.com/sourcegraph/go-diff
15-
- cd $TRAVIS_BUILD_DIR
16-
install:
17-
- # 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).
4+
- "1.12.x"
185
script:
196
- GO111MODULE=on go get -t -v ./...
207
- diff -u <(echo -n) <(gofmt -d -s .)
21-
- GO111MODULE=on go tool vet .
22-
- GO111MODULE=on go test -v -race ./...
8+
- GO111MODULE=on go test -v -race -coverprofile=coverage.txt -covermode=atomic ./...
9+
after_success:
10+
- bash <(curl -s https://codecov.io/bash)

cmd/go-diff/go-diff.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"log"
88
"os"
99

10-
"sourcegraph.com/sourcegraph/go-diff/diff"
10+
"github.com/sourcegraph/go-diff/diff"
1111
)
1212

1313
// A diagnostic program to aid in debugging diff parsing or printing

diff/doc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
// Package diff provides a parser for unified diffs.
2-
package diff // import "sourcegraph.com/sourcegraph/go-diff/diff"
2+
package diff

diff/testdata/empty_multi.diff

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
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
1+
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
22
new file mode 100644
33
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
4-
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
4+
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
55
new file mode 100644
66
index 0000000000000000000000000000000000000000..527e2e70f57b02e709f53e3ac2b7f59e2b5a46bc
77
--- /dev/null
8-
+++ Godeps/_workspace/src/sourcegraph.com/sourcegraph/go-diff/diff/testdata/empty_new.diff
8+
+++ Godeps/_workspace/src/github.com/sourcegraph/go-diff/diff/testdata/empty_new.diff
99
@@ -0,0 +1,2 @@
1010
+@@ -1,1 +0,0 @@
1111
+-b

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module sourcegraph.com/sourcegraph/go-diff
1+
module github.com/sourcegraph/go-diff
22

33
require (
44
github.com/gogo/protobuf v1.1.1

0 commit comments

Comments
 (0)