@@ -40,7 +40,7 @@ sub branch_status {

   # Branch status

   my $status = {ahead => 0, behind => 0};

-  my @cmd = $self->cmd_remote(

+  my @cmd = $self->cmd(

     $user,

     $project,

     'rev-list',

@@ -65,7 +65,7 @@ sub no_merged_branch_h {

   {

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

-    my @cmd = $self->cmd_remote($user, $project, 'branch', '--no-merged');

+    my @cmd = $self->cmd($user, $project, 'branch', '--no-merged');

     open my $fh, '-|', @cmd or return;

     my @lines = <$fh>;

     for my $branch_name (@lines) {

@@ -84,7 +84,7 @@ sub branches {

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

   # Branches

-  my @cmd = $self->cmd_remote($user, $project, 'branch');

+  my @cmd = $self->cmd($user, $project, 'branch');

   open my $fh, '-|', @cmd or return;

   my $branches = [];

   my $start;

@@ -114,7 +114,7 @@ sub branches_count {

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

   # Branches count

-  my @cmd = $self->cmd_remote($user, $project, 'branch');

+  my @cmd = $self->cmd($user, $project, 'branch');

   open my $fh, '-|', @cmd or return;

   my @branches = <$fh>;

   my $branches_count = @branches;

@@ -122,27 +122,42 @@ sub branches_count {

   return $branches_count;

 }

-sub cmd_remote {

+sub cmd {

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

   # Git command

   my $home = $self->rep_home;

   my $rep = "$home/$user/$project.git";

-  return $self->cmd_remote_dir($rep, @cmd);

+  return $self->cmd_dir($rep, @cmd);

 }

-sub cmd_remote_dir {

-  my ($self, $rep, @cmd) = @_;

+sub cmd_dir {

+  my ($self, $dir, @cmd) = @_;

-  return ($self->bin, "--git-dir=$rep", @cmd);

+  return ($self->bin, "--git-dir=$dir", @cmd);

+}

+

+sub cmd_working {

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

+  

+  # Git command

+  my $working_dir = $self->home->rel_file("/data/work/$user/$project");

+  

+  return $self->cmd_working_dir($working_dir, @cmd);

+}

+

+sub cmd_working_dir {

+  my ($self, $dir, @cmd) = @_;

+  

+  return ($self->bin, "--git-dir=$dir", "--work-tree=$dir",  @cmd);

 }

 sub authors {

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

   # Authors

-  my @cmd = $self->cmd_remote(

+  my @cmd = $self->cmd(

     $user,

     $project,

     'log',

@@ -172,7 +187,7 @@ sub blame {

     or croak 'Cannot find file';

   # Git blame

-  my @cmd = $self->cmd_remote(

+  my @cmd = $self->cmd(

     $user,

     $project,

     'blame',

@@ -271,7 +286,7 @@ sub blob {

   # Blob

   my $hash = $self->path_to_hash($user, $project, $rev, $file, 'blob')

     or croak 'Cannot find file';

-  my @cmd = $self->cmd_remote(

+  my @cmd = $self->cmd(

     $user,

     $project,

     'cat-file',

@@ -303,7 +318,7 @@ sub blob_diffs {

   return unless defined $rev1 && defined $rev2;

   # Diff tree

-  my @cmd = $self->cmd_remote(

+  my @cmd = $self->cmd(

     $user,

     $project,

     'diff-tree',

@@ -341,7 +356,7 @@ sub blob_diffs {

     my $file = $diffinfo->{to_file};

     # Blob diff

-    my @cmd = $self->cmd_remote(

+    my @cmd = $self->cmd(

       $user,

       $project,

       'diff-tree',

@@ -404,7 +419,7 @@ sub blob_mime_type {

   # Blob

   my $hash = $self->path_to_hash($user, $project, $rev, $file, 'blob')

     or croak 'Cannot find file';

-  my @cmd = $self->cmd_remote(

+  my @cmd = $self->cmd(

     $user,

     $project,

     'cat-file',

@@ -449,7 +464,7 @@ sub blob_mode {

   # Blob mode

   $file =~ s#/+$##;

-  my @cmd = $self->cmd_remote(

+  my @cmd = $self->cmd(

     $user,

     $project,

     'ls-tree',

@@ -471,7 +486,7 @@ sub blob_raw {

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

   # Blob raw

-  my @cmd = $self->cmd_remote($user, $project, 'cat-file', 'blob', "$rev:$path");

+  my @cmd = $self->cmd($user, $project, 'cat-file', 'blob', "$rev:$path");

   open my $fh, "-|", @cmd

     or croak 500, "Open git-cat-file failed";

   local $/;

@@ -486,7 +501,7 @@ sub blob_size {

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

   # Blob size(KB)

-  my @cmd = $self->cmd_remote(

+  my @cmd = $self->cmd(

     $user,

     $project,

     'cat-file',

@@ -520,7 +535,7 @@ sub commits_number {

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

   # Command "git diff-tree"

-  my @cmd = $self->cmd_remote($user, $project, 'shortlog', '-s', $ref);

+  my @cmd = $self->cmd($user, $project, 'shortlog', '-s', $ref);

   open my $fh, "-|", @cmd

     or croak 500, "Open git-shortlog failed";

   my @commits_infos = <$fh>;

@@ -542,7 +557,7 @@ sub exists_branch {

   # Exists branch

   my $home = $self->rep_home;

-  my @cmd = $self->cmd_remote($user, $project, 'branch');

+  my @cmd = $self->cmd($user, $project, 'branch');

   open my $fh, "-|", @cmd

     or croak 'git branch failed';

   local $/;

@@ -564,7 +579,7 @@ sub delete_branch {

   }

   if ($exists) {

-    my @cmd = $self->cmd_remote($user, $project, 'branch', '-D', $branch);

+    my @cmd = $self->cmd($user, $project, 'branch', '-D', $branch);

     Gitprep::Util::run_command(@cmd)

       or croak "Branch deleting failed. Can't delete branch $branch";

   }

@@ -606,7 +621,7 @@ sub diff_tree {

   $parent = '--root' unless defined $parent;

   # Get diff tree

-  my @cmd = $self->cmd_remote(

+  my @cmd = $self->cmd(

     $user,

     $project,

     "diff-tree",

@@ -697,7 +712,7 @@ sub forward_commits {

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

   # Forwarding commits

-  my @cmd = $self->cmd_remote(

+  my @cmd = $self->cmd(

     $user,

     $project,

     'rev-list',

@@ -723,7 +738,7 @@ sub path_to_hash {

   # Get blob id or tree id (command "git ls-tree")

   $path =~ s#/+$##;

-  my @cmd = $self->cmd_remote(

+  my @cmd = $self->cmd(

     $user,

     $project,

     'ls-tree',

@@ -748,7 +763,7 @@ sub last_activity {

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

   # Command "git for-each-ref"

-  my @cmd = $self->cmd_remote(

+  my @cmd = $self->cmd(

     $user,

     $project,

     'for-each-ref',

@@ -775,7 +790,7 @@ sub last_activity {

 sub no_merged_branches_count {

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

-  my @cmd = $self->cmd_remote($user, $project, 'branch', '--no-merged');

+  my @cmd = $self->cmd($user, $project, 'branch', '--no-merged');

   open my $fh, '-|', @cmd or return;

   my @branches = <$fh>;

   my $branches_count = @branches;

@@ -790,7 +805,7 @@ sub path_by_id {

   return unless $hash;

   # Command "git ls-tree"

-  my @cmd = $self->cmd_remote($user, $project, 'ls-tree', '-r', '-t', '-z', $base);

+  my @cmd = $self->cmd($user, $project, 'ls-tree', '-r', '-t', '-z', $base);

   open my $fh, '-|', @cmd or return;

   # Get path

@@ -814,7 +829,7 @@ sub parse_rev_path {

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

   # References

-  my @cmd = $self->cmd_remote(

+  my @cmd = $self->cmd(

     $user,

     $project,

     'show-ref',

@@ -864,7 +879,7 @@ sub object_type {

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

   # Get object type

-  my @cmd = $self->cmd_remote(

+  my @cmd = $self->cmd(

     $user,

     $project,

     'cat-file',

@@ -929,7 +944,7 @@ sub references {

   $type ||= '';

   # Branches or tags

-  my @cmd = $self->cmd_remote(

+  my @cmd = $self->cmd(

     $user,

     $project,

     'show-ref',

@@ -997,7 +1012,7 @@ sub tags_count {

   my $limit = 1000;

   # Get tags

-  my @cmd = $self->cmd_remote(

+  my @cmd = $self->cmd(

     $user,

     $project,

     'for-each-ref',

@@ -1020,7 +1035,7 @@ sub tags {

   $offset ||= 0;

   # Get tags

-  my @cmd = $self->cmd_remote(

+  my @cmd = $self->cmd(

     $user,

     $project,

     'for-each-ref',

@@ -1109,7 +1124,7 @@ sub last_change_commit {

   my $commit_log = {};

   $file = '' unless defined $file;

-  my @cmd = $self->cmd_remote(

+  my @cmd = $self->cmd(

     $user,

     $project,

     '--no-pager',

@@ -1221,7 +1236,7 @@ sub get_commit {

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

   # Git rev-list

-  my @cmd = $self->cmd_remote(

+  my @cmd = $self->cmd(

     $user,

     $project,

     'rev-list',

@@ -1356,7 +1371,7 @@ sub get_commits {

   # Get Commits

   $maxcount ||= 1;

   $skip ||= 0;

-  my @cmd = $self->cmd_remote(

+  my @cmd = $self->cmd(

     $user,

     $project,

     'rev-list',

@@ -1493,7 +1508,7 @@ sub import_branch {

   # Git pull

   my $remote_rep = $self->rep($remote_user, $remote_project);

-  my @cmd = $self->cmd_remote(

+  my @cmd = $self->cmd(

     $user,

     $project,

     'fetch',

@@ -1533,7 +1548,7 @@ sub separated_commit {

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

   # Command "git diff-tree"

-  my @cmd = $self->cmd_remote(

+  my @cmd = $self->cmd(

     $user,

     $project,

     'show-branch',

@@ -1618,7 +1633,7 @@ sub trees {

   }

   my @entries = ();

   my $show_sizes = 0;

-  my @cmd = $self->cmd_remote(

+  my @cmd = $self->cmd(

     $user,

     $project,

     'ls-tree',

@@ -664,7 +664,7 @@ sub _create_rep {

   eval {

     # Git init

     {

-      my @git_init_cmd = $git->cmd_remote_dir($rep, 'init', '--bare');

+      my @git_init_cmd = $git->cmd_dir($rep, 'init', '--bare');

       Gitprep::Util::run_command(@git_init_cmd)

         or croak  "Can't execute git init --bare:@git_init_cmd";

     }

@@ -677,7 +677,7 @@ sub _create_rep {

     }

     # HTTP support

-    my @git_update_server_info_cmd = $git->cmd_remote_dir(

+    my @git_update_server_info_cmd = $git->cmd_dir(

       $rep,

       '--bare',

       'update-server-info'

@@ -710,7 +710,7 @@ sub _create_rep {

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

       # Git init

-      my @git_init_cmd = $git->cmd_remote_dir($temp_work, 'init', '-q');

+      my @git_init_cmd = $git->cmd_dir($temp_work, 'init', '-q');

       Gitprep::Util::run_command(@git_init_cmd)

         or croak "Can't execute git init: @git_init_cmd";

@@ -722,9 +722,8 @@ sub _create_rep {

       print $readme_fh "\n" . encode('UTF-8', $description) . "\n";

       close $readme_fh;

-      my @git_add_cmd = $git->cmd_remote_dir(

+      my @git_add_cmd = $git->cmd_working_dir(

         $temp_work,

-        "--work-tree=$temp_work",

         'add',

         'README.md'

       );

@@ -732,9 +731,8 @@ sub _create_rep {

         or croak "Can't execute git add: @git_add_cmd";

       # Set user name

-      my @git_config_user_name = $git->cmd_remote_dir(

+      my @git_config_user_name = $git->cmd_working_dir(

         $temp_work,

-        "--work-tree=$temp_work",

         'config',

         'user.name',

         $user

@@ -744,9 +742,8 @@ sub _create_rep {

       # Set user mail

       my $user_mail = $self->app->dbi->model('user')->select('mail', where => {id => $user})->value;

-      my @git_config_user_mail = $git->cmd_remote_dir(

+      my @git_config_user_mail = $git->cmd_working_dir(

         $temp_work,

-        "--work-tree=$temp_work",

         'config',

         'user.email',

         "$user_mail"

@@ -755,9 +752,8 @@ sub _create_rep {

         or croak "Can't execute git config: @git_config_user_mail";

       # Commit

-      my @git_commit_cmd = $git->cmd_remote_dir(

+      my @git_commit_cmd = $git->cmd_working_dir(

         $temp_work,

-        "--work-tree=$temp_work",

         'commit',

         '-q',

         '-m',

@@ -768,9 +764,8 @@ sub _create_rep {

       # Push

       {

-        my @git_push_cmd = $git->cmd_remote_dir(

+        my @git_push_cmd = $git->cmd_working_dir(

           $temp_work,

-          "--work-tree=$temp_work",

           'push',

           '-q',

           $rep,

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

     );

   };

   my $cmd = $quote->(

-    $git->cmd_remote(

+    $git->cmd(

       $user,

       $project,

       'archive',

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

     substr($service_cmd, 0, 4, '');

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

-    my @cmd = $git->cmd_remote($user, $project, $service_cmd, '--stateless-rpc', '--advertise-refs', $rep);

+    my @cmd = $git->cmd($user, $project, $service_cmd, '--stateless-rpc', '--advertise-refs', $rep);

     my ($cout, $cerr) = (Symbol::gensym, Symbol::gensym);

     my $pid = IPC::Open3::open3(my $cin, $cout, $cerr, @cmd );

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

   # Dumb HTTP

   else {

     # Update server info

-    my @cmd = $git->cmd_remote($user, $project, 'update-server-info');

+    my @cmd = $git->cmd($user, $project, 'update-server-info');

     open my $fh, '-|', @cmd

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

     close $fh

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

   my $git = app->git;

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

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

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

   # Command

   my ($cout, $cerr) = (Symbol::gensym, Symbol::gensym);