Skip to content
This repository was archived by the owner on Dec 25, 2024. It is now read-only.
Open
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
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
tags:
- v*
branches:
- master
- main
pull_request:
name: Test and Lint
jobs:
Expand All @@ -21,14 +21,14 @@ jobs:
- name: Checkout code
uses: actions/checkout@v2
- name: Test
run: go test ./...
run: go test -v -coverprofile=coverage.txt -covermode=atomic ./...
lint:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: golangci-lint
uses: golangci/golangci-lint-action@v1
uses: golangci/golangci-lint-action@v2
with:
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
version: v1.28
version: v1.28
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# go-patchutils [![GoDoc](https://godoc.org/github.com/google/go-patchutils?status.svg)](https://godoc.org/github.com/google/go-patchutils) [![Go Report Card](https://goreportcard.com/badge/github.com/google/go-patchutils)](https://goreportcard.com/report/github.com/google/go-patchutils)
# go-patchutils [![GoDoc](https://godoc.org/github.com/google/go-patchutils?status.svg)](https://godoc.org/github.com/google/go-patchutils) [![Go Report Card](https://goreportcard.com/badge/github.com/google/go-patchutils)](https://goreportcard.com/report/github.com/google/go-patchutils) [![Coverage](https://gocover.io/_badge/github.com/google/go-patchutils)](https://gocover.io/github.com/google/go-patchutils)
Package patchutils provides tools to compute the diff between source and diff files.

Works with diff files in [unified format](http://gnu.org/software/diffutils/manual/html_node/Unified-Format.html).
Expand Down Expand Up @@ -282,12 +282,12 @@ go build

**Interdiff mode**
```shell
./cli interdiff -olddiff=<path_to_old_diff> -newdiff=<path_to_new_diff>
./cli interdiff -olddiff=<FILENAME> -newdiff=<FILENAME>
```

**Mixed mode**
```shell
./cli mixed -oldsource=<path_to_old_source> -olddiff=<path_to_old_diff>
-newsource=<path_to_new_source> -newdiff=<path_to_new_diff>
./cli mixed -oldsource=<PATHNAME> -olddiff=<FILENAME>
-newsource=<PATHNAME> -newdiff=<FILENAME>
```

1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ go 1.14

require (
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/google/go-cmp v0.5.2
github.com/google/subcommands v1.2.0
github.com/kylelemons/godebug v1.1.0
github.com/sourcegraph/go-diff v0.6.0
Expand Down
Loading