Re: Am able to delete a file with no trace in the log

From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Jun 3, 2009, 23:27 UTC
Message-ID: <alpine.LFD.2.01.0906031619150.4880@localhost.localdomain>
In-Reply-To: <20090603230606.GA5462@coredump.intra.peff.net>

On Wed, 3 Jun 2009, Jeff King wrote:

Show 15 quoted lines

>
> Try (and this is a simplified version of the original example):
> 
>   mkdir repo && cd repo && git init &&
>   echo content >base && git add base && git commit -m base &&
>   echo context >a.txt && git add a.txt && git commit -m 'master 1' &&
>   git checkout -b other HEAD^ &&
>   echo content >b.txt && git add b.txt && git commit -m 'other 1' &&
>   echo conflict >a.txt && git add a.txt && git commit -m 'other 2' &&
>   git checkout master &&
>   git merge other ;# conflicts
> 
>   rm b.txt && git add b.txt &&
>   echo resolve >a.txt && git add a.txt &&
>   git commit -m merged

This doesn't work at all for me.

Do

	git show HEAD:b.txt

and it still shows b.txt in the commit. You should have used

	git rm b.txt

rather than "git add b.txt" (or you use use "-u" or "-a" to git add).

That looks like a bug, btw, but whatever. It seems intentional (we do the whole "ADD_CACHE_IGNORE_REMOVAL" flag thing).

But you're right. Even when fixed, it does seem to need "--full-history" to stay around, and --simplify-merges is insufficient. Bug in merge simplification?

			Linus