Skip to content

Conversation

@guillep2k
Copy link
Member

Backport for #8429

I'm not sure what happens when I try to backport this. I've just changed the one line in go.mod and I'm getting all these changes:

$ git reset --hard
HEAD is now at 6ab1d5a8a Changelog for v1.9.4 (#8422)

$ git checkout -b fix-7860-v19

$ vi go.mod (edit libravatar ==> `v0.0.0-20191008002943-06d1c002b251`)

$ make vendor
GO111MODULE=on go mod tidy && GO111MODULE=on go mod vendor

$ git status
On branch release/v1.9
Your branch is up to date with 'origin/release/v1.9'.

Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   go.mod
        modified:   go.sum
        deleted:    vendor/github.com/blevesearch/segment/maketesttables.go
        deleted:    vendor/github.com/google/go-github/v24/github/gen-accessors.go
        deleted:    vendor/github.com/klauspost/compress/flate/gen.go
        deleted:    vendor/github.com/klauspost/cpuid/private-gen.go
        deleted:    vendor/github.com/lib/pq/oid/gen.go
        deleted:    vendor/golang.org/x/net/html/atom/gen.go
        deleted:    vendor/golang.org/x/sys/unix/mkasm_darwin.go
        deleted:    vendor/golang.org/x/sys/unix/mkpost.go
        deleted:    vendor/golang.org/x/sys/unix/mksyscall.go
        deleted:    vendor/golang.org/x/sys/unix/mksyscall_aix_ppc.go
        deleted:    vendor/golang.org/x/sys/unix/mksyscall_aix_ppc64.go
        deleted:    vendor/golang.org/x/sys/unix/mksyscall_solaris.go
        deleted:    vendor/golang.org/x/sys/unix/mksysctl_openbsd.go
        deleted:    vendor/golang.org/x/sys/unix/mksysnum.go
        deleted:    vendor/golang.org/x/sys/unix/types_aix.go
        deleted:    vendor/golang.org/x/sys/unix/types_darwin.go
        deleted:    vendor/golang.org/x/sys/unix/types_dragonfly.go
        deleted:    vendor/golang.org/x/sys/unix/types_freebsd.go
        deleted:    vendor/golang.org/x/sys/unix/types_netbsd.go
        deleted:    vendor/golang.org/x/sys/unix/types_openbsd.go
        deleted:    vendor/golang.org/x/sys/unix/types_solaris.go
        deleted:    vendor/golang.org/x/text/encoding/charmap/maketables.go
        deleted:    vendor/golang.org/x/text/encoding/htmlindex/gen.go
        deleted:    vendor/golang.org/x/text/encoding/internal/identifier/gen.go
        deleted:    vendor/golang.org/x/text/encoding/japanese/maketables.go
        deleted:    vendor/golang.org/x/text/encoding/korean/maketables.go
        deleted:    vendor/golang.org/x/text/encoding/simplifiedchinese/maketables.go
        deleted:    vendor/golang.org/x/text/encoding/traditionalchinese/maketables.go
        deleted:    vendor/golang.org/x/text/internal/language/compact/gen.go
        deleted:    vendor/golang.org/x/text/internal/language/compact/gen_index.go
        deleted:    vendor/golang.org/x/text/internal/language/compact/gen_parents.go
        deleted:    vendor/golang.org/x/text/internal/language/gen.go
        deleted:    vendor/golang.org/x/text/internal/language/gen_common.go
        deleted:    vendor/golang.org/x/text/language/gen.go
        deleted:    vendor/golang.org/x/text/unicode/bidi/gen.go
        deleted:    vendor/golang.org/x/text/unicode/bidi/gen_ranges.go
        deleted:    vendor/golang.org/x/text/unicode/bidi/gen_trieval.go
        deleted:    vendor/golang.org/x/text/unicode/norm/maketables.go
        deleted:    vendor/golang.org/x/text/unicode/norm/triegen.go
        deleted:    vendor/golang.org/x/text/width/gen.go
        deleted:    vendor/golang.org/x/text/width/gen_common.go
        deleted:    vendor/golang.org/x/text/width/gen_trieval.go
        deleted:    vendor/golang.org/x/tools/go/gcexportdata/main.go
        deleted:    vendor/golang.org/x/tools/internal/imports/mkindex.go
        deleted:    vendor/golang.org/x/tools/internal/imports/mkstdlib.go
        modified:   vendor/modules.txt
        modified:   vendor/strk.kbt.io/projects/go/libravatar/README.md
        modified:   vendor/strk.kbt.io/projects/go/libravatar/libravatar.go

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        vendor/strk.kbt.io/projects/go/libravatar/Makefile

no changes added to commit (use "git add" and/or "git commit -a")

$ git diff origin/release/v1.9 upstream/release/v1.9
(no results)
$

$ git remote -v
origin  [email protected]:guillep2k/gitea.git (fetch)
origin  [email protected]:guillep2k/gitea.git (push)
upstream        [email protected]:go-gitea/gitea.git (fetch)
upstream        [email protected]:go-gitea/gitea.git (push)

Note: my origin is my Gitea fork and my upstream is go-gitea/gitea.

Perhaps there was a missing make vendor from a previous commit? If you guys think this is OK, then let's go ahead.

@guillep2k guillep2k deleted the fix-7860-v19 branch November 20, 2019 13:12
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants