From: Chris Patti Date: Wed, 07 Dec 2011 16:54:26 GMT Subject: Re: Odd issue - The Diffs That WILL NOT DIE. Message-ID: In-Reply-To: <20111206215102.GA3654@centaur.lab.cmartin.tk> On Tue, Dec 6, 2011 at 4:51 PM, Carlos Martín Nieto wrote: > On Tue, Dec 06, 2011 at 04:43:50PM -0500, Chris Patti wrote: >> I have a Homebrew installed version if Git 1.7.8 running on OSX Lion. >> >> I'm seeing a very odd issue where these diffs I didn't create keep >> recurring in a particular repository. > > Which diffs? You haven't given us any? What files does this happen > with? Do they have any peculiarities? > > If these are files with non-ASCII filenames, then you're hitting a > misfeature of the HFS+ filesystem (it lies when git asks it about > files). > >> >> I've tried: >> >> * Nuking the repo and re-cloning, cloning into a totally different >> containing directory >> * git reset --hard, git checkout -- of the offending file supposedly >> containing the diffs >> >> Is there some sort of uber persistent local cache that's bound to the >> remote repository? > > The remote repository shouldn't have anything to do with this. > >   cmn OK. Let me give you a very specific series of commands, sorry about the poor question / report (Not convinced it's a bug, probably pilot error?) If my understanding of the way Git works is correct, there should be NO pending diffs in a freshly cloned repository, yes? Note that I tried git diff and git diff -w below with identical results: --- 11:35][admin@Hiram-Abiff-2:~/src]$ rm -rf framework/ [11:37][admin@Hiram-Abiff-2:~/src]$ [11:44][admin@Hiram-Abiff-2:~/src]$ git clone ssh://git.bluestatedigital.com/home/git/framework.git Cloning into 'framework'... remote: Counting objects: 378540, done. remote: Compressing objects: 100% (100469/100469), done. remote: Total 378540 (delta 261046), reused 374685 (delta 258447) Receiving objects: 100% (378540/378540), 148.33 MiB | 2.08 MiB/s, done. Resolving deltas: 100% (261046/261046), done. [11:51][admin@Hiram-Abiff-2:~/src]$ cd framework/ [11:51][admin@Hiram-Abiff-2:~/src/framework(master)]$ git diff diff --git a/app/modules/Core/controllers/CloudSponge.php b/app/modules/Core/con index 615a7b3..911d456 100644 --- a/app/modules/Core/controllers/CloudSponge.php +++ b/app/modules/Core/controllers/CloudSponge.php @@ -1,229 +1,71 @@ -