Re: git incorrectly infers rename i.e. (delete file1 + creation of new file2) != (file => file2)
- From
B Smith-Mannschott <bsmith.occs@gmail.com>
- Date
- Apr 22, 2011, 05:22 UTC
- Message-ID
- <BANLkTimcL2D_FbKnDREQPNLGG2i8wsoLCg@mail.gmail.com>
- In-Reply-To
- <BANLkTimqk5xP6X7NcGqZ6w05GfYe02iAhA@mail.gmail.com>
On Fri, Apr 22, 2011 at 02:31, Mike <xandrani@gmail.com> wrote:
Show 5 quoted lines
> Hi > > I deleted a file called 'class.NumberOfResultsCache.php' and created a > completely different file called > 'cgi-bin/___php/class.NumberOfResults.php'.
"completely different" in what they mean to you, or in their actual content? Please be more specific.
Show 11 quoted lines
> I deleted the file using > rm followed by 'git rm'. > > When I do a 'git status' I now get told: > > renamed: cgi-bin/___php/class.NumberOfResultsCache.php -> > cgi-bin/___php/class.NumberOfResults.php > > However I want to commit 'class.NumberOfResultsCache.php' as having > been deleted, and I want to commit 'class.NumberOfResults.php' as a > brand new file.
Git doesn't care about individual files or renames, it tracks whole trees. What it shows as a rename is just its best guess based on the contents of the two files.
> How do I get git to do this? Apologies for a 'noob' question. Only > been using the superb git for a couple of weeks!
You could commit the deletion and the add separately, but before doing that, why is it important to you that git not show this change as a potential rename?
// Ben
Show 6 quoted lines
> Thanks :) > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >