Re: When does git check for branch-X being uptodate with origin/branch-X?

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 21, 2016, 22:42 UTC
Message-ID: <xmqqlh5bjvvf.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <CAGZ79kaUY86nUiG9urgDhVGZ5yc1=63nvJGufw7K8TAc3ytmdA@mail.gmail.com>

Stefan Beller <sbeller@google.com> writes:

Show 10 quoted lines

> On> 494398473714dcbedb38b1ac79b531c7384b3bc4 Stefan Beller
> <sbeller@google.com> 1455150849 -0800 rebase -i (start): checkout
> origin/master: fast-forward
>
> I do understand the "fetch --append origin fast-forward", (I assume
> they are coming from regular fetches). But the "rebase -i (start):
> checkout origin/master: fast-forward" seems to have recorded there in
> error as I never rebased origin/master itself, but only other stuff on
> top of origin/master.
> Why would we have such an entry in there?

You tell us--what did you do back then?  ;-)

It indeed looks strange. You shouldn't be able to check out a remote-tracking branch, so any log for local operation would be in HEAD's reflog, but not in remotes' reflog.

I was curious to see what kind of entries I have and I do not seem to have anything strange.

$ find .git/logs/refs/remotes/ -type f -print0 |
  xargs -0 sed -Ee '
    s/^[0-9a-f]{40} [0-9a-f]{40} [^>]*> [0-9]* [-+][0-9]{4}       //
  ' |
  sort -u
fetch --append l10n: fast-forward
fetch git-gui: fast-forward
fetch -v git-svn: fast-forward
fetch -v paulus: fast-forward
pull git-svn: fast-forward
pull git-svn: forced-update
pull -s subtree paulus: fast-forward
pull -v git-svn ks/svn-pathnameencoding-4: storing head
update by push

Puzzled...