All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Stefan Beller <sbeller@google.com>
Cc: Thomas Adam <thomas.adam22@gmail.com>, Jeff King <peff@peff.net>,
	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 15:42:44 -0700	[thread overview]
Message-ID: <xmqqlh5bjvvf.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <CAGZ79kaUY86nUiG9urgDhVGZ5yc1=63nvJGufw7K8TAc3ytmdA@mail.gmail.com> (Stefan Beller's message of "Mon, 21 Mar 2016 15:11:16 -0700")

Stefan Beller <sbeller@google.com> writes:

> 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...

  reply	other threads:[~2016-03-21 22:42 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
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 [this message]
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=xmqqlh5bjvvf.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    --cc=sbeller@google.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.