From: Duy Nguyen <pclouds@gmail.com>
Date: Fri, 11 Jan 2013 12:52:52 GMT
Subject: Re: git checkout doesn't work?
Message-ID: <CACsJy8B8Cf95uqh4vgzHayhtajSUdtD3QXk6-wMGeAVkW94JpA@mail.gmail.com>
In-Reply-To: <CAJ52sWkf+ZkLUdLw1ornVt5E2af3w1YSqhkOajTWxvTPKvkAJg@mail.gmail.com>

On Fri, Jan 11, 2013 at 1:46 PM, Ishayahu Lastov <meoc-it@mail.ru> wrote:
> This is my session on Win7 x64:
> Microsoft Windows [Version 6.1.7601]
> (c) Корпорация Майкрософт (Microsoft Corp.), 2009. Все права защищены.
>
> C:\Dropbox\Dropbox\Wesnoth\Apocryphs>cd Apokryphs.Orks
>
> C:\Dropbox\Dropbox\Wesnoth\Apocryphs\Apokryphs.Orks>git status
> # On branch master
> # Your branch is behind 'origin/master' by 3 commits, and can be fast-forwarded.
>
> #
> # Changes not staged for commit:
> #   (use "git add <file>..." to update what will be committed)
> #   (use "git checkout -- <file>..." to discard changes in working directory)
> #
> #       modified:   scenarios/01_NothernVillage.cfg
> #
> no changes added to commit (use "git add" and/or "git commit -a")
>
> C:\Dropbox\Dropbox\Wesnoth\Apocryphs\Apokryphs.Orks>cd scenarios
>
> C:\Dropbox\Dropbox\Wesnoth\Apocryphs\Apokryphs.Orks\scenarios>git status
> # On branch master
> # Your branch is behind 'origin/master' by 3 commits, and can be fast-forwarded.
>
> #
> # Changes not staged for commit:
> #   (use "git add <file>..." to update what will be committed)
> #   (use "git checkout -- <file>..." to discard changes in working directory)
> #
> #       modified:   01_NothernVillage.cfg
> #
> no changes added to commit (use "git add" and/or "git commit -a")
>
> C:\Dropbox\Dropbox\Wesnoth\Apocryphs\Apokryphs.Orks\scenarios>git checkout -- 01
> _NothernVillage.cfg
>
> C:\Dropbox\Dropbox\Wesnoth\Apocryphs\Apokryphs.Orks\scenarios>git status
> # On branch master
> # Your branch is behind 'origin/master' by 3 commits, and can be fast-forwarded.
>
> #
> # Changes not staged for commit:
> #   (use "git add <file>..." to update what will be committed)
> #   (use "git checkout -- <file>..." to discard changes in working directory)
> #
> #       modified:   01_NothernVillage.cfg
> #
> no changes added to commit (use "git add" and/or "git commit -a")
>
> C:\Dropbox\Dropbox\Wesnoth\Apocryphs\Apokryphs.Orks\scenarios>
>
> As I understand after last "git checkout" in "git status" I should see
> that I gave no changes. It looks like an bug, isn't it?

Yeah, perhaps it's file attributes. What does this say?

git diff --summary --stat
-- 
Duy

-- 
*** Please reply-to-all at all times ***
*** (do not pretend to know who is subscribed and who is not) ***
*** Please avoid top-posting. ***
The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.

You received this message because you are subscribed to the Google
Groups "msysGit" group.
To post to this group, send email to msysgit@googlegroups.com
To unsubscribe from this group, send email to
msysgit+unsubscribe@googlegroups.com
For more options, and view previous threads, visit this group at
http://groups.google.com/group/msysgit?hl=en_US?hl=en