From: Johannes Schindelin Date: Wed, 28 Feb 2007 17:53:13 GMT Subject: Re: [PATCH] Do not change the file type if the filesystem does not support symlinks. Message-ID: In-Reply-To: <200702281840.07893.johannes.sixt@telecom.at> Hi, On Wed, 28 Feb 2007, Johannes Sixt wrote: > On Tuesday 27 February 2007 23:54, Johannes Schindelin wrote: > > On Tue, 27 Feb 2007, Johannes Sixt wrote: > > > > > @@ -125,7 +126,8 @@ static int ce_match_stat_basic(struct cache_entry > > > *ce, struct stat *st) changed |= MODE_CHANGED; > > > break; > > > case S_IFLNK: > > > - changed |= !S_ISLNK(st->st_mode) ? TYPE_CHANGED : 0; > > > + if (trust_symlink_fmt && !S_ISLNK(st->st_mode)) > > > + changed |= TYPE_CHANGED; > > > > This does not handle the case symlink->directory, right? > > Something like: > > if (!S_ISLNK(st->st_mode) && > (trust_symlink_fmt || !S_ISREG(st->st_mode))) > changed |= TYPE_CHANGE; Yes. > BTW, considering the size of the entire patch series, I'm thinking of > submitting it in a single patch. Makes sense. Ciao, Dscho