Re: Bogus error: Untracked working tree file '....' would be overwritten by merge. Aborting
From: Nguyen Thai Ngoc Duy <hidden>
Date: 2016-06-15 22:50:03
On Tue, Nov 16, 2010 at 6:24 PM, Nguyen Thai Ngoc Duy [off-list ref] wrote:
+static int identical_content(struct cache_entry *ce, struct stat *st)
+{
+ unsigned char sha1[20];
+ return !index_path(sha1, ce->name, st, 0) && !hashcmp(sha1, ce->sha1);Even better, do a file size check here. If it's not equal, there's no point in calling the expensive index_path(). -- Duy