Wrongly reports local revisions are ahead of remote revisions.

Question

Wrongly reports local revisions are ahead of remote revisions.

mvdan opened this issue 8 years ago · 24 comments

I just got:

skipping "github.com/astaxie/bat" because:
        local revision "cba1c6bba4a613a5c14348479cd5e97820bdfdc5" is ahead of remote revision "30a7d43fe800eb26ad83af2aed5fac738b7a2574"
skipping "github.com/kardianos/govendor" because:
        local revision "c86c10d612bf08e847456ce91d495eb69ad87087" is ahead of remote revision "2aae20585716bf5ad74d5eb3bf5a660243a1ac0e"
skipping "github.com/pelletier/go-toml" because:
        local revision "fe7536c3dee2596cdd23ee9976a17c22bdaae286" is ahead of remote revision "4a000a21a414d139727f616a8bb97f847b1b310b"
skipping "github.com/spf13/cobra" because:
        local revision "99b5d838ca16c25cc4944e323684f8415e8b10ba" is ahead of remote revision "4d647c8944eb42504a714e57e97f244ed6344722"
skipping "golang.org/x/sys" because:
        local revision "fb4cac33e3196ff7f507ab9b2d2a44b0142f5b5a" is ahead of remote revision "c23410a886927bab8ca5e80b08af6a56faeb330d"
skipping "golang.org/x/net" because:
        local revision "057a25b06247e0c51ba15d8ae475feb2fcb72164" is ahead of remote revision "5f8847ae0d0e90b6a9dc8148e7ad616874625171"
skipping "gopkg.in/src-d/go-git.v4" because:
        local revision "7e249dfcf28765939bde8f38784b3274b522f880" is ahead of remote revision "ad02bf020460c210660db4fffda7f926b6aae95a"

Looked at bat, sure enough, cba... is older than 30a... as per https://github.com/astaxie/bat/commits/master.

What's wrong here? I went into the clone and was able to git pull into the new version. Haven't touched the rest yet.

Answer 1 · 2017-06-26T16:24:43.000Z

Also, if at all useful:

$ go version
go version devel +8ec7a39fec Sat Jun 24 00:54:01 2017 +0000 linux/amd64
$ git --version
git version 2.13.2

Answer 2 · 2017-06-26T17:01:17.000Z

Thanks for reporting. I highly suspect this is a bug in a recent change I did to detect when branches have diverged in f0f8894.

To confirm, which version of Go Package Store do you have installed?

Answer 3 · 2017-06-26T17:02:50.000Z

The latest, f0f8894 in particular.

Answer 4 · 2017-06-26T17:04:26.000Z

I also highly suspect the issue is that I'm not running git remote update (or equivalent) before I call repo.VCS.RemoteContains.

Can you try to manually run git remote update in one of the repos where you're getting this message incorrectly, and see if that fixes it?

Answer 5 · 2017-06-26T17:07:46.000Z

I just tried it with golang.org/x/sys, still get the same (different SHAs because it was just pushed to, but same error).

Answer 6 · 2017-06-26T17:10:30.000Z

Thanks. I'll try to reproduce it and work on a fix.

Answer 7 · 2017-06-26T22:03:09.000Z

Not really able to reproduce this as easily as I thought.

Can you cd $GOPATH/src/golang.org/x/sys and tell me the output of running this command there:

git branch --remotes --contains fb4cac33e3196ff7f507ab9b2d2a44b0142f5b5a origin/HEAD

Answer 8 · 2017-06-26T22:05:24.000Z

Assuming my $GOPATH is a single dir ;)

$ git branch --remotes --contains fb4cac33e3196ff7f507ab9b2d2a44b0142f5b5a origin/HEAD
  origin/HEAD -> origin/master

Answer 9 · 2017-06-26T22:22:39.000Z

Thanks a lot, that's very helpful and I can see where the issue is right away (hint, it's here).

It looks like a behavior present in your newer git version. I'll look for the best solution, and push a fix.

Answer 10 · 2017-06-26T22:24:38.000Z

A better solution here would probably be to use a porcelain command, i.e. one of those whose output is to be consumed by other programs and whose format won't change between git versions. I don't know what the equivalent here would be, though.

Answer 11 · 2017-06-26T22:34:59.000Z

I know, I always try to use those (low-level/plumbing) types of commands when possible, but I didn't find one so far, so I had to make do. If/when I find a viable replacement, I'll gladly switch to it.

Answer 12 · 2017-06-27T00:48:08.000Z

I think I found a way to use git for-each-ref command, which is low-level plumbing command. 🎉

Can you give shurcooL/vcsstate@8573312 a shot and see if it fixes the issue for you? I believe it should work on all versions of git 2.8+.

Answer 13 · 2017-06-29T05:26:26.000Z

Hi,
I try shurcooL/vcsstate@8573312, but it does not work, same result as before,
debian jessie,
git version 2.1.4,
I switched to branch contains-for-each-ref, deleted vcsstate.a and Go-Package-Store,
then rebuild Go-Package-Store, and results are same:

skipping "github.com/shurcooL/vcsstate" because:
	local branch "contains-for-each-ref" doesn't match remote branch "master"
skipping "golang.org/x/crypto" because:
	local revision "84f24dfdf3c414ed893ca1b318d0045ef5a1f607" is ahead of remote revision "5ef0053f77724838734b6945dd364d3847e5de1d"
skipping "golang.org/x/oauth2" because:
	local revision "f047394b6d14284165300fd82dad67edb3a4d7f6" is ahead of remote revision "5432cc9688e6250a0dd8f5a5f4c781d92b398be6"
skipping "golang.org/x/net" because:
	local revision "d4223d6710aad90f892de3ed4f1e7539ccc444a0" is ahead of remote revision "c81e7f25cb61200d8bf0ae971a0bac8cb638d5bc"

Answer 14 · 2017-06-29T05:32:17.000Z

Interesting. @djadala, what's the output if you run these commands in your x/crypto repo?

git rev-parse refs/remotes/origin/HEAD
git for-each-ref --format=contains --count=1 --contains 84f24dfdf3c414ed893ca1b318d0045ef5a1f607 refs/remotes/origin/HEAD

git remote update

# Again after remote update.
git rev-parse refs/remotes/origin/HEAD
git for-each-ref --format=contains --count=1 --contains 84f24dfdf3c414ed893ca1b318d0045ef5a1f607 refs/remotes/origin/HEAD

Answer 15 · 2017-06-29T07:49:10.000Z

Hi, may be debian(oldstable) git is too old ?

git for-each-ref --format=contains --count=1   --contains 84f24dfdf3c414ed893ca1b318d0045ef5a1f607 refs/remotes/origin/HEAD
error: unknown option `contains'
usage: git for-each-ref [options] [<pattern>]

    -s, --shell           quote placeholders suitably for shells
    -p, --perl            quote placeholders suitably for perl
    --python              quote placeholders suitably for python
    --tcl                 quote placeholders suitably for tcl

    --count <n>           show only <n> matched refs
    --format <format>     format to use for the output
    --sort <key>          field name to sort on

Answer 16 · 2017-06-29T07:52:52.000Z

git rev-parse refs/remotes/origin/HEAD
84f24dfdf3c414ed893ca1b318d0045ef5a1f607

Answer 17 · 2017-06-29T13:37:31.000Z

Hi, may be debian(oldstable) git is too old ?

Oh, my bad, I misread your git version. That means git17 implementation will be used instead of git28. It should still be okay, but can you run this other command instead please:

git branch -r --contains 84f24dfdf3c414ed893ca1b318d0045ef5a1f607 origin/HEAD

What does that print?

Answer 18 · 2017-06-29T14:01:05.000Z

@shurcooL apologies for the late reply. Yes, that commit seems to fix it for me :)

Answer 19 · 2017-06-29T14:21:26.000Z

crypto$ git branch -r --contains 84f24dfdf3c414ed893ca1b318d0045ef5a1f607 origin/HEAD
  origin/HEAD -> origin/master

git log
commit 84f24dfdf3c414ed893ca1b318d0045ef5a1f607
Author: Yasuhiro Matsumoto <mattn.jp@gmail.com>
Date:   Fri Jun 23 19:03:27 2017 +0900

    ssh: signal incorrect private key passwords with x509.IncorrectPasswordError
    
    Fixes golang/go#20781
    
    Change-Id: Iae42fff3c9b0b9984509e44a92f9bc99a1a12470
    Reviewed-on: https://go-review.googlesource.com/46439
    Reviewed-by: Han-Wen Nienhuys <hanwen@google.com>
    Run-TryBot: Han-Wen Nienhuys <hanwen@google.com>
    TryBot-Result: Gobot Gobot <gobot@golang.org>

commit adbae1b6b6fb4b02448a0fc0dbbc9ba2b95b294d
Author: Dave Cheney <dave@cheney.net>
Date:   Mon Jun 19 16:03:41 2017 +1000

    all: gofmt ./...
    
    Change-Id: I8ffee4dc712091e424b83a9f5a3cc2a6724abefc
    Reviewed-on: https://go-review.googlesource.com/46050
    Reviewed-by: Matt Layher <mdlayher@gmail.com>

Answer 20 · 2017-06-29T14:26:51.000Z

just for safety:

ls -lh `which Go-Package-Store`
-rwxr-xr-x 1 jambo jambo 13M Jun 29 08:19 /home/jambo/golang/bin/Go-Package-Store

ls -lh ~/golang/pkg/linux_amd64/github.com/shurcooL/vcsstate.a
-rw-r--r-- 1 jambo jambo 155K Jun 29 08:19 ~(edited)/golang/pkg/linux_amd64/github.com/shurcooL/vcsstate.a

I have 3 places in GOPATH

Answer 21 · 2017-06-29T14:54:18.000Z

Thanks @djadala, that should be sufficient information for me to fix it for you. I'll let you know if it turns out I need more.

Answer 22 · 2017-06-30T17:44:04.000Z

@djadala, I was able to setup an equivalent environment and reproduce your issue:

ubuntu@ubuntu:~/Dmitri/crypto$ git version
git version 2.1.4
ubuntu@ubuntu:~/Dmitri/crypto$ git branch -r --contains 84f24dfdf3c414ed893ca1b318d0045ef5a1f607 origin/HEAD
  origin/HEAD -> origin/master
ubuntu@ubuntu:~/Dmitri/crypto$

I've looked around and tried different things, and there was only one viable fix that I could find.

I've pushed a new commit shurcooL/vcsstate@54e5467 to the same branch contains-for-each-ref. It should fix your issue. Do you want to give it a try before I merge it to master?

Answer 23 · 2017-06-30T19:19:29.000Z

if you want for me to confirm - ok, i try tomorrow, but if you are sure how to fix this, go just now.
if issue is that debian git is to old, im are ok to upgrade - FYI debian have git 2.11 in backports-oldstable.

Answer 24 · 2017-07-01T00:28:18.000Z

You git version is old but it should be fine. vcsstate supports git 1.7 and newer.

I'm pretty confident in the fix, so I'll push it now. If you still have any issues after updating to the latest version, please don't hesitate to open a new issue!