Revert "Merge remote branch 't0m/json' into json"

[catagits/Gitalist.git] / lib / Gitalist / Git / Object.pm

diff --git a/lib/Gitalist/Git/Object.pm b/lib/Gitalist/Git/Object.pm
index 2daf3ec..31b07d6 100644 (file)
--- a/lib/Gitalist/Git/Object.pm
+++ b/lib/Gitalist/Git/Object.pm
@@ -5,18 +5,6 @@ class Gitalist::Git::Object {
     use MooseX::Types::Moose qw/Str Int Bool Maybe ArrayRef/;
     use MooseX::Types::Common::String qw/NonEmptySimpleStr/;
 
-    use Fcntl ':mode';
-    use constant {
-        S_IFINVALID => 0030000,
-        S_IFGITLINK => 0160000,
-    };
-
-    BEGIN {
-        no warnings;
-        *S_ISLNK = sub ($) {}
-            if $^O eq 'MSWin32';
-    }
-
     # repository and sha1 are required initargs
     has repository => ( isa => 'Gitalist::Git::Repository',
                      required => 1,
@@ -47,8 +35,7 @@ class Gitalist::Git::Object {
                       required => 1,
                       is => 'ro',
                       lazy_build => 1,
-                      handles => [ 'content',
-                               ],
+                      handles => [ 'content' ],
                   );
 
     # objects can't determine their mode or filename
@@ -80,11 +67,16 @@ class Gitalist::Git::Object {
     }
 
     method _build_modestr {
-       # XXX The POSIX constants make win32 sad :(
         return _mode_str($self->mode);
     }
 
-    # via gitweb.pm
+    # via gitweb.pm circa line 1305
+    use Fcntl ':mode';
+    use constant {
+        S_IFINVALID => 0030000,
+        S_IFGITLINK => 0160000,
+    };
+
     # submodule/subrepository, a commit object reference
     sub S_ISGITLINK($) {
         return (($_[0] & S_IFMT) == S_IFGITLINK)