git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git checkout branch puzzle

From
CChris.Cheney <chris.cheney.nospam@tesco.net>
Date
May 2, 2010, 20:09 UTC
Message-ID
<Xns9D6CD773D97E5ChrisCheneytesconet@80.91.229.10>
In-Reply-To
<Xns9D6C65C2DB06EChrisCheneytesconet@80.91.229.10>

"Chris.Cheney" <chris.cheney.nospam@tesco.net> wrote in news:Xns9D6C65C2DB06EChrisCheneytesconet@80.91.229.10:

Show 32 quoted lines
> Jeff King <peff@peff.net> wrote in
> news:20100502045901.GD14776@coredump.intra.peff.net: 
> 
>> On Sat, May 01, 2010 at 05:55:47PM +0000, Chris.Cheney wrote:
>> 
>>> I have been using msysgit (curently 1.7.0.2.msysgit.0) for about 18
>>> months and thought that I had managed to understand most things.
>>> However, the following sequence has me baffled:
>>> 
>>> a) on branch 'master', git status shows that the working directory
>>> is clean 
>>> 
>>> b) git checkout HEAD^ gives the usual moan about moving to a head
>>> which isn't a local branch
>>> 
>>> c) git checkout master followed by git status gives "changed but not
>>> updated" and a list of "modified" files
>> 
>> Part (c) shouldn't show anything in "git status". I wonder if it is a
>> line-ending conversion issue, since you are using msysgit, and since
>> that is the usual culprit for files mysteriously looking changed.
>> Might you have recently changed the settings of core.autocrlf?
>> 
>> -Peff
>> 
> 
> Thanks for the reply and confirming what I believed about (c). 
> 
> It is possible that what you suggest might be involved - it's a
> 2-developer situation, each using msysgit with their own local
> repository and a remote master (bare) repository. I'll compare the
> other's config file against mine.

Neither of our config files contain autocrlf settings, but it's something that I'll look further into. Neither of us had made recent config changes.

Previous: Chris.CheneyNext: Jeff King
Message 4 of 7 in “git checkout branch puzzle”
  1. Chris.CheneyMay 1, 2010
  2. Jeff KingMay 2, 2010
  3. Chris.CheneyMay 2, 2010
  4. Chris.CheneyMay 2, 2010
  5. Jeff KingMay 3, 2010
  6. Chris.CheneyMay 3, 2010
  7. Chris.CheneyMay 6, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.