From: Dennis Kaarsemaker <dennis@kaarsemaker.net>
To: Thomas Nyberg <tomnyberg@gmail.com>,
David Turner <dturner@twopensource.com>
Cc: Stefan Beller <sbeller@google.com>,
Michael Haggerty <mhagger@alum.mit.edu>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Corruption of branch?
Date: Mon, 14 Dec 2015 21:40:40 +0100 [thread overview]
Message-ID: <1450125640.16044.4.camel@kaarsemaker.net> (raw)
In-Reply-To: <566F277F.4070101@gmail.com>
On ma, 2015-12-14 at 15:33 -0500, Thomas Nyberg wrote:
> What exactly are you looking for? Here's the results of the following
> command:
>
> $ git for-each-ref | grep frus
> 1750cba5a94b3fe6041aaf49de430a558a3b9bc8 commit
> refs/heads/frus_body_cleaning
> 3a1dbe48299f6eda1cc4b69cab35284c0f0355eb commit refs/remotes/o
> rigin/frus
> 1750cba5a94b3fe6041aaf49de430a558a3b9bc8 commit
> refs/remotes/origin/frus_body_cleaning
>
> Sorry if this isn't what you're looking for. I'm actually not very
> familiar with these different internal git commands...
This is what I was looking for. Unfortunately it doesn't show any of
the smoking guns I had hoped for.
That leaves only one option: you also have a file or directory named
'frus' in the root of your repository. In this case 'git checkout frus'
does the same as 'git checkout -- frus' instead of DWIM'ing 'git
checkout frus' to 'git checkout -b frus origin/frus'
--
Dennis Kaarsemaker
www.kaarsemaker.net
next prev parent reply other threads:[~2015-12-14 20:40 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-14 17:40 Corruption of branch? Thomas Nyberg
2015-12-14 17:51 ` Stefan Beller
2015-12-14 18:08 ` Thomas Nyberg
2015-12-14 19:20 ` David Turner
2015-12-14 19:59 ` Thomas Nyberg
2015-12-14 20:18 ` Dennis Kaarsemaker
2015-12-14 20:33 ` Thomas Nyberg
2015-12-14 20:40 ` Dennis Kaarsemaker [this message]
2015-12-14 20:42 ` Junio C Hamano
2015-12-14 20:44 ` Thomas Nyberg
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=1450125640.16044.4.camel@kaarsemaker.net \
--to=dennis@kaarsemaker.net \
--cc=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--cc=sbeller@google.com \
--cc=tomnyberg@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).