Re: git reset --hard not removing some files

From: Linus Torvalds <torvalds@osdl.org>
Date: Jun 1, 2006, 16:21 UTC
Message-ID: <Pine.LNX.4.64.0606010918060.5498@g5.osdl.org>
In-Reply-To: <20060601160052.GK14325@admingilde.org>

On Thu, 1 Jun 2006, Martin Waitz wrote:

> 
> I have the following problem:

It's not a problem, it's a feature.

Show 18 quoted lines

> nbg1l001:~/src/git > git branch
> * master
>   next
>   origin
> nbg1l001:~/src/git > git checkout -b test
> nbg1l001:~/src/git > git status
> # On branch refs/heads/test
> nothing to commit
> zsh: exit 1     git status
> nbg1l001:~/src/git > git reset --hard v1.3.3
> nbg1l001:~/src/git > git status
> # On branch refs/heads/test
> #
> # Untracked files:
> #   (use "git add" to add to commit)
> #
> #       git-quiltimport
> #       git-upload-tar

Those files were _never_ tracked.

What happened is that when you switched to an earlier version, you _also_ switched the ".gitignore" file to the earlier version, and that older .gitignore file doesn't have those two (newer) binaries listed as being ignored.

And "git reset" won't be deleting files it doesn't track (it had _better_ not touch them), even more so when it has been told to ignore them, so it makes total sense to _not_ delete them when doing that reset.

			Linus