--- a/mercurial/context.py	Thu Oct 23 16:19:56 2014 -0700
+++ b/mercurial/context.py	Thu Oct 23 17:00:38 2014 -0700
@@ -1424,14 +1424,14 @@
         against its parent (repo['.']).
         """
         s = self._dirstatestatus(match, listignored, listclean, listunknown)
+        # Filter out symlinks that, in the case of FAT32 and NTFS filesytems,
+        # might have accidentally ended up with the entire contents of the file
+        # they are susposed to be linking to.
+        s[0] = self._filtersuspectsymlink(s[0])
         if other != self._repo['.']:
             s = super(workingctx, self)._buildstatus(other, s, match,
                                                      listignored, listclean,
                                                      listunknown)
-        # Filter out symlinks that, in the case of FAT32 and NTFS filesytems,
-        # might have accidentally ended up with the entire contents of the file
-        # they are susposed to be linking to.
-        s[0] = self._filtersuspectsymlink(s[0])
         self._status = scmutil.status(*s)
         return s