@@ -23,16 +23,7 @@ our $VERSION = '1.0301';

 has 'dbi';

 has 'manager';

 has 'validator';

-

-sub git {

-  my $self = shift;

-  

-  my $git = Gitprep::Git->new;

-  $git->bin($self->config->{internal}{git_bin});

-  $git->rep_home($self->config->{internal}{git_rep_home});

-  

-  return $git;

-}

+has 'git';

 sub startup {

   my $self = shift;

@@ -63,7 +54,7 @@ sub startup {

     $self->log->error($error);

     croak $error;

   }

-  $conf->{internal}{git_bin} = $git_bin;

+  $git->bin($git_bin);

   # Repository home

   my $rep_home = $ENV{GITPREP_REP_HOME} || $self->home->rel_file('data/rep');

@@ -71,7 +62,8 @@ sub startup {

     mkdir $rep_home

       or croak "Can't create directory $rep_home: $!";

   }

-  $conf->{internal}{git_rep_home} = $rep_home;

+  $git->rep_home($rep_home);

+  $self->git($git);

   # Repository Manager

   my $manager = Gitprep::Manager->new(app => $self);

@@ -245,10 +237,10 @@ sub startup {

               # API

               my $api = $self->gitprep_api;

-              

-              # Private

               my $user = $self->param('user');

               my $project = $self->param('project');

+              

+              # Private

               my $private = $self->app->manager->is_private_project($user, $project);

               if ($private) {

                 if ($api->can_access_private_project($user, $project)) {

@@ -42,6 +42,26 @@ sub check_user_and_password {

   return $is_valid;

 }

+sub git {

+  my $self = shift;

+

+  my $git = $self->app->git->clone;

+  

+  my $user = $self->cntl->param('user');

+  my $project = $self->cntl->param('project');

+  

+  if (defined $user && defined $project){

+    # Project encoding

+    my $encoding = $self->app->dbi->model('project')->select(

+      'encoding',

+      id => [$user, $project]

+    )->value;

+    $git->encoding($encoding) if length $encoding;

+  }

+

+  return $git;

+}

+

 sub is_collaborator {

   my ($self, $user, $project, $session_user) = @_;

@@ -53,6 +53,18 @@ sub branch_status {

   return $status;

 }

+sub clone {

+  my $self = shift;

+  

+  my $clone = __PACKAGE__->new;

+  $clone->bin($self->bin);

+  $clone->encoding($self->encoding);

+  $clone->rep_home($self->rep_home);

+  $clone->text_exts([@{$self->text_exts}]);

+  

+  return $clone;

+}

+

 sub no_merged_branch_h {

   my ($self, $user, $project) = @_;

@@ -2,7 +2,7 @@

   my $api = gitprep_api;

   # Git

-  my $git = app->git;

+  my $git = $api->git;

   # Branches

   my $branches = $git->branches($user, $project) || [];

@@ -1,6 +1,6 @@

 <%

   # API

-  my $api = $self->gitprep_api;

+  my $api = gitprep_api;

   # Parameter

   my $user = param('user');

@@ -23,7 +23,7 @@

   }

   # Git

-  my $git = app->git;

+  my $git = $api->git;

   # Object type

   my $type = $git->object_type($user, $project, "$rev^{}");

@@ -33,7 +33,7 @@

     my $vresult = $validator->validate($params, $rule);

     # Git

-    my $git = app->git;

+    my $git = $api->git;

     if ($vresult->is_ok) {

       # Not logined

       unless ($api->logined) {

@@ -3,7 +3,7 @@

   my $api = gitprep_api;

   # Git

-  my $git = $self->app->git;

+  my $git = $api->git;

   # Parameters

   my $user = param('user');

@@ -5,7 +5,7 @@

   my $api = gitprep_api;

   # Git

-  my $git = $self->app->git;

+  my $git = $api->git;

   # Parameters

   my $user = param('user');

@@ -9,7 +9,7 @@

   my $op = param('op') || '';

   # Git

-  my $git = $self->app->git;

+  my $git = $api->git;

   # Delete

   my $errors;

@@ -9,7 +9,7 @@

   $rev = $diff unless defined $rev;

   # Git

-  my $git = app->git;

+  my $git = $api->git;

   # Commit

   my $commit = $git->get_commit($user, $project, $rev);

@@ -3,7 +3,7 @@

   my $api = gitprep_api;

   # Git

-  my $git = $self->app->git;

+  my $git = $api->git;

   # Parameters

   my $user = param('user');

@@ -10,7 +10,7 @@

   my $page = param('page') || 0;

   # Git

-  my $git = $self->app->git;

+  my $git = $api->git;

   # Commits

   my $commits = $git->forward_commits($user, $project, $from_rev, $rev);

@@ -15,7 +15,7 @@

   }

   # Branches

-  my $git = app->git;

+  my $git = $api->git;

   my $remote_branches = $git->branches($remote_user, $remote_project);

   my $remote_branch_names = [map { $_->{name} } @$remote_branches];

@@ -1,8 +1,10 @@

 <%

+  my $api = gitprep_api;

+  

   my $rev = stash('rev');

   my $from_rev = stash('from_rev');

-  my $git = app->git;

+  my $git = $api->git;

   my $diff_tree = stash('diff_tree');

   my $blob_diff = stash('blob_diff');

@@ -1,11 +1,13 @@

 <%

+  my $api = gitprep_api;

+  

   my $display = stash('display') || '';

   my $rev = stash('rev');

   $rev = '' unless defined $rev;

   my $branches = stash('branches');

-  my $branches_count = app->git->branches_count($user, $project);

+  my $branches_count = $api->git->branches_count($user, $project);

   my $default_branch_name = app->manager->default_branch($user, $project);

-  my $tags_count = app->git->tags_count($user, $project);

+  my $tags_count = $api->git->tags_count($user, $project);

 %>

 %= javascript begin

@@ -1,10 +1,12 @@

 <%

+  my $api = gitprep_api;

+  

   # Parameters

   my $rev = stash('rev');

   my $from_rev = stash('from_rev');

   # Git

-  my $git = app->git;

+  my $git = $api->git;

   # Diff tree

   my $diff_trees = $git->diff_tree(

@@ -2,10 +2,12 @@

   use Mojo::ByteStream ();

   use Text::Markdown::Discount ();

+  my $api = gitprep_api;

+  

   # README

   my $type;

   my $lines;

-  eval { $lines = app->git->blob($user, $project, $rev, 'README') };

+  eval { $lines = $api->git->blob($user, $project, $rev, 'README') };

   my $readme_e;

   if ($lines) {

     $type = 'plain';

@@ -14,7 +16,7 @@

     $readme_e =~ s#(^|\s|[^\x00-\x7F])(http(?:s)?://.+?)($|\s|[^\x00-\x7F])#$1<a href="$2">$2</a>$3#msg;

   }

   else {

-    eval { $lines = app->git->blob($user, $project, $rev, 'README.md') };

+    eval { $lines = $api->git->blob($user, $project, $rev, 'README.md') };

     if ($lines) {

       $type = 'markdown';

       my $readme = join "\n", @$lines;

@@ -3,7 +3,7 @@

   my $api = gitprep_api;

   # Branches

-  my $branches = [map { $_->{name} } @{app->git->branches($user, $project)}];

+  my $branches = [map { $_->{name} } @{$api->git->branches($user, $project)}];

   # Members

   my $members = app->manager->members($user, $project);

@@ -11,7 +11,7 @@

   # Members branches

   for my $member (@$members) {

     my $branches = [

-      map { $_->{name} } @{app->git->branches($member->{id}, $member->{project})}

+      map { $_->{name} } @{$api->git->branches($member->{id}, $member->{project})}

     ];

     $member->{branches} = $branches;

   }

@@ -1,12 +1,14 @@

 <%

+  my $api = gitprep_api;

+  

   my $user = param('user');

   my $project = param('project');

   my $branch = param('rev1');

   my $rev2_abs = param('rev2_abs');

   my ($remote_user, $remote_project, $remote_branch) = split /\//, $rev2_abs, 3;

-  my $commits = app->git->get_commits($user, $project, $branch, 100);

-  my $remote_commits = app->git->get_commits(

+  my $commits = $api->git->get_commits($user, $project, $branch, 100);

+  my $remote_commits = $api->git->get_commits(

     $remote_user,

     $remote_project,

     $remote_branch,

@@ -7,7 +7,7 @@

   my $api = gitprep_api;

   # Git

-  my $git = app->git;

+  my $git = $api->git;

   # Parameters

   my $user = param('user');

@@ -49,7 +49,7 @@

   my $url = url_for->to_abs;

   $url->base(undef);

   my $ssh_port = config->{basic}{ssh_port};

-  my $rep_home = app->git->rep_home;

+  my $rep_home = $api->git->rep_home;

   my $execute_user = getpwuid($>);

   my $ssh_rep_url = "ssh://$execute_user\@" . $url->host

     . ($ssh_port ? ":$ssh_port" : '') . "$rep_home/$user/$project.git";

@@ -1,6 +1,9 @@

 <%

+  # API

+  my $api = gitprep_api;

+

   # Git

-  my $git = app->git;

+  my $git = $api->git;

   # Parameters

   my $user = param('user');

@@ -16,7 +16,7 @@

   }

   # Rename project

-  my $git = app->git;

+  my $git = $api->git;

   my $errors;

   my $post = lc $self->req->method eq 'post';

   if ($op eq 'rename-project' && $post) {

@@ -15,7 +15,7 @@

   }

   # Rename project

-  my $git = app->git;

+  my $git = $api->git;

   my $errors;

   if (lc $self->req->method eq 'post') {

     if ($op eq 'add') {

@@ -3,10 +3,12 @@

   use Symbol ();

   use IO::Select ();

+  my $api = gitprep_api;

+  

   my $service = param('service') || '';

   my $user = param('user');

   my $project = param('project');

-  my $git = app->git;

+  my $git = $api->git;

   # Smart HTTP

   if ($service eq 'git-upload-pack' || $service eq 'git-receive-pack') {

@@ -65,7 +67,7 @@

       or die "Can't close pipe for @cmd:$!";

     my $content_type = 'text/plain; charset=UTF-8';

-    my $rep_home = app->git->rep_home;

+    my $rep_home = $api->git->rep_home;

     my $file = "$rep_home/$user/$project.git/info/refs";

     if (-f $file) {

       my $asset = Mojo::Asset::File->new(path => $file);

@@ -3,11 +3,13 @@

   use Symbol ();

   use IO::Select ();

+  my $api = gitprep_api;

+  

   my $service = param('service');

   my $user = param('user');

   my $project = param('project');

-  my $git = app->git;

+  my $git = $api->git;

   my $rep_dir = $git->rep($user, $project);

   my @cmd = $git->cmd($user, $project, $service, '--stateless-rpc', $rep_dir);

@@ -1,4 +1,6 @@

 <%

+  my $api = gitprep_api;

+  

   my $path = param('Path');

   my $user = param('user');

   my $project = param('project');

@@ -31,7 +33,7 @@

     $content_type = 'application/x-git-packed-objects-toc';

   }

-  my $rep_home = app->git->rep_home;

+  my $rep_home = $api->git->rep_home;

   my $file = "$rep_home/$user/$project.git/$path";

   if (-f $file) {

     my $asset = Mojo::Asset::File->new(path => $file);

@@ -5,7 +5,7 @@

   my $api = gitprep_api;

   # Git

-  my $git = $self->app->git;

+  my $git = $api->git;

   # Parameters

   my $user = param('user');

@@ -8,7 +8,7 @@

   my $page = param('page') || 1;

   # Git

-  my $git = $self->app->git;

+  my $git = $api->git;

   # Ref names

   my $limit = app->config->{basic}{tags_limit};

@@ -3,7 +3,7 @@

   my $api = gitprep_api;

   # Git

-  my $git = app->git;

+  my $git = $api->git;

   # Parameters

   my $user = param('user');

@@ -1,4 +1,6 @@

 <%

+  my $api = gitprep_api;

+  

   # Redirect for project delete

   if (my $deleted_project = param('deleted_project')) {

     flash('deleted_project', $deleted_project);

@@ -16,7 +18,7 @@

   my $projects = app->manager->projects($user);

   my $reps = [];

   for my $project (@$projects) {

-    my $rep = app->git->repository($user, $project->{name}) || {none => 1};

+    my $rep = $api->git->repository($user, $project->{name}) || {none => 1};

     $rep->{name} = $project->{name};

     push @$reps, $rep;

   }