From: Jeff King <peff@peff.net>
To: Thomas Adam <thomas.adam22@gmail.com>
Cc: git list <git@vger.kernel.org>
Subject: Re: When does git check for branch-X being uptodate with origin/branch-X?
Date: Mon, 21 Mar 2016 16:28:10 -0400 [thread overview]
Message-ID: <20160321202810.GD32071@sigill.intra.peff.net> (raw)
In-Reply-To: <CA+39Oz4izkhtxbUH8cQoD5-DLKAtv9KnC9OkG_ZhFw6Ysg0+gw@mail.gmail.com>
On Mon, Mar 21, 2016 at 08:21:46PM +0000, Thomas Adam wrote:
> Something I've seen a few times of late (although I doubt that's any
> indication that the code has changed in Git) is the reporting of
> branch-X being uptodate with origin/branch-X when it isn't.
>
> When does git check to see if branch-X has a remote tracking branch
> and that it has changes on it? Only, the output below is misleading:
>
> % git checkout master
> Switched to branch 'master'
> Your branch is up-to-date with 'fvwmorg/master'.
>
> [fvwm-cvs-to-git/docs]{10345}[0][master] % git pull
> remote: Counting objects: 26, done.
> remote: Compressing objects: 100% (12/12), done.
> remote: Total 26 (delta 18), reused 22 (delta 14), pack-reused 0
> Unpacking objects: 100% (26/26), done.
> From github.com:fvwmorg/fvwm
> c029868..36cc898 master -> fvwmorg/master
> 4f0c7ec..36cc898 ta/git-docs -> fvwmorg/ta/git-docs
> Updating c029868..36cc898
> Fast-forward
> [...]
>
> Clearly, it's obvious that "Your branch is up-to-date with
> 'fvwmorg/master'." is misleading. Note that in this case, there's no
> passwords or other hindrances to Git being able to work out that a
> branch is behind another.
The message from checking is looking only at your local
refs/remotes/fvwmorg/master branch, which is essentially a cache of what
is in the actual remote repository.
We never contact other repositories unless explicitly asked to by
fetch, pull, push, etc. If you want to have the most up-to-date value
without merging, you can just "git fetch" to update the tracking
branches.
-Peff
next prev parent reply other threads:[~2016-03-21 20:28 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-21 20:21 When does git check for branch-X being uptodate with origin/branch-X? Thomas Adam
2016-03-21 20:28 ` Jeff King [this message]
2016-03-21 20:43 ` Thomas Adam
2016-03-21 20:47 ` Junio C Hamano
2016-03-21 20:50 ` Jeff King
2016-03-21 21:12 ` Thomas Adam
2016-03-21 21:18 ` Jeff King
2016-03-21 21:22 ` Thomas Adam
2016-03-21 21:50 ` Stefan Beller
2016-03-21 21:57 ` Junio C Hamano
2016-03-21 22:11 ` Stefan Beller
2016-03-21 22:42 ` Junio C Hamano
2016-03-21 23:18 ` Stefan Beller
2016-03-22 17:51 ` Philip Oakley
2016-03-21 20:48 ` Stefan Beller
2016-03-21 20:52 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160321202810.GD32071@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=thomas.adam22@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).