@@ -155,6 +155,8 @@ sub branches_count {

 sub cmd {

   my ($self, $rep_info, @command) = @_;

+  $rep_info //= {};

+  

   my $git_dir = $rep_info->{git_dir};

   my $work_tree = $rep_info->{work_tree};

@@ -538,16 +540,20 @@ sub commits_number {

 }

 sub exists_branch {

-  my ($self, $rep_info) = @_;

+  my ($self, $rep_info, $branch_name) = @_;

-  # Exists branch

-  my @cmd = $self->cmd($rep_info, 'branch');

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

-    or croak 'git branch failed';

-  local $/;

-  my $branch = <$fh>;

+  my $branch_names = $self->branch_names($rep_info);

+  

+  

+  my $exists_branch;

+  if (defined $branch_name) {

+    $exists_branch = grep { $_ eq $branch_name } @$branch_names;

+  }

+  else {

+    $exists_branch = @$branch_names ? 1 : 0;

+  }

-  return $branch ne '' ? 1 : 0;

+  return $exists_branch;

 }

 sub delete_branch {

@@ -22,7 +22,12 @@ sub merge_and_push {

   # Merge

   my $target_user_id = $rep_info2->{user};

-  my @git_merge_cmd = $self->app->git->cmd($work_rep_info, 'merge', "$target_user_id/$target_branch");

+  my @git_merge_cmd = $self->app->git->cmd(

+    $work_rep_info,

+    'merge',

+    "--message=merge $target_user_id/$target_branch",

+    "$target_user_id/$target_branch"

+  );

   Gitprep::Util::run_command(@git_merge_cmd)

     or Carp::croak "Can't execute git merge: @git_merge_cmd";

@@ -67,12 +72,60 @@ sub prepare_merge {

   my @git_fetch_target_cmd = $self->app->git->cmd($work_rep_info, 'fetch', $target_user_id, $target_branch);

   Gitprep::Util::run_command(@git_fetch_target_cmd)

     or Carp::croak "Can't execute git fetch: @git_fetch_target_cmd";

+

+  # Ensure no diff

+  my @git_reset_hard_cmd = $self->app->git->cmd(

+    $work_rep_info,

+    'reset',

+    '--hard'

+  );

+  Gitprep::Util::run_command(@git_reset_hard_cmd)

+    or Carp::croak "Can't execute git reset --hard: @git_reset_hard_cmd";

+

+  # Checkout first branch

+  my $tmp_branch = $self->_tmp_branch;

+  my $branch_names = $self->app->git->branch_names($work_rep_info);

+  my $first_branch;

+  for my $branch_name (@$branch_names) {

+    if ($branch_name ne $tmp_branch) {

+      $first_branch = $branch_name;

+      last;

+    }

+  }

+  my @git_checkout_first_branch = $self->app->git->cmd(

+    $work_rep_info,

+    'checkout',

+    $first_branch

+  );

+  Gitprep::Util::run_command(@git_checkout_first_branch)

+    or Carp::croak "Can't execute git checkout: @git_checkout_first_branch";

+  

+  # Delete temparary branch if it eixsts

+  if (grep { $_ eq $tmp_branch } @$branch_names) {

+    my @git_branch_remove_cmd = $self->app->git->cmd(

+      $work_rep_info,

+      'branch',

+      '-D',

+      $tmp_branch

+    );

+    Gitprep::Util::run_command(@git_branch_remove_cmd)

+      or Carp::croak "Can't execute git branch: @git_branch_remove_cmd";

+  }

+

+  # Create temparary branch

+  my @git_branch_cmd = $self->app->git->cmd(

+    $work_rep_info,

+    'branch',

+    $tmp_branch

+  );

+  Gitprep::Util::run_command(@git_branch_cmd)

+    or Carp::croak "Can't execute git branch: @git_branch_cmd";

   # Checkout tmp branch and git reset --hard from my remote branch

   my @git_checkout_tmp_branch = $self->app->git->cmd(

     $work_rep_info,

     'checkout',

-    $self->_tmp_branch

+    $tmp_branch

   );

   Gitprep::Util::run_command(@git_checkout_tmp_branch)

     or Carp::croak "Can't execute git checkout: @git_checkout_tmp_branch";

@@ -88,6 +141,34 @@ sub prepare_merge {

     or Carp::croak "Can't execute git reset --hard: @git_reset_hard_cmd";

 }

+sub merge {

+  my ($self, $work_rep_info, $rep_info1, $base_branch, $rep_info2, $target_branch) = @_;

+  

+  # Merge

+  my $target_user_id = $rep_info2->{user};

+  my @git_merge_cmd = $self->app->git->cmd(

+    $work_rep_info,

+    'merge',

+    "--message=merge $target_user_id/$target_branch",

+    "$target_user_id/$target_branch"

+  );

+  

+  my $success = Gitprep::Util::run_command(@git_merge_cmd);

+  

+  return $success;

+}

+

+sub push {

+  my ($self, $work_rep_info, $rep_info1, $base_branch, $rep_info2, $target_branch) = @_;

+  

+  # Push

+  my @git_push_cmd = $self->app->git->cmd($work_rep_info, 'push', 'origin', $base_branch);

+  Gitprep::Util::run_command(@git_push_cmd)

+    or Carp::croak "Can't execute git push: @git_push_cmd";

+}

+

+

+=pod

 sub check_merge_automatical {

   my ($self, $work_rep_info, $rep_info1, $base_branch, $rep_info2, $target_branch) = @_;

@@ -104,6 +185,8 @@ sub check_merge_automatical {

     or Carp::croak "Can't execute git format-patch: @git_format_patch_cmd";

   my $patch_str = do { local $/; <$git_format_patch_fh> };

+  warn "@git_format_patch_cmd";

+  

   # Write patch to file

   my $tmp_dir = File::Temp->newdir(DIR => $self->app->home->rel_file('/tmp'));

   my $patch_file = "$tmp_dir/test.patch";

@@ -113,18 +196,30 @@ sub check_merge_automatical {

   close $patch_fh;

   # Check if this patch can be applied

+  use Cwd;

+  my $original_cwd = getcwd;

+  chdir $work_rep_info->{work_tree}

+    or croak "Can't change working directory: $work_rep_info->{work_tree}";

+  warn "aaaaaaaaaaaaaaaaa $work_rep_info->{work_tree}";

   my @git_apply_cmd = $self->app->git->cmd(

     $work_rep_info,

     'apply',

     $patch_file,

     '--check'

   );

+  chdir $original_cwd

+    or croak "Can't change working directory: $original_cwd";

+  

+  warn "@git_apply_cmd";

+  # sleep 300;

   my $automatical = Gitprep::Util::run_command(@git_apply_cmd);

+  warn "bbbbbbbbbbbbbbbbbbbb $automatical";

   return $automatical;

 }

+=cut

 sub lock_rep {

   my ($self, $rep_info) = @_;

@@ -160,15 +255,6 @@ sub create_work_rep {

     Gitprep::Util::run_command(@git_clone_cmd)

       or croak "Can't git clone: @git_clone_cmd";

-    # Create temparary branch

-    my @git_branch_cmd = $self->app->git->cmd(

-      $work_rep_info,

-      'branch',

-      $self->_tmp_branch

-    );

-    Gitprep::Util::run_command(@git_branch_cmd)

-      or Carp::croak "Can't execute git branch: @git_branch_cmd";

-

     # Set user name

     my @git_config_user_name = $self->app->git->cmd(

       $work_rep_info,

@@ -49,6 +49,20 @@

   text-decoration:none;

 }

+.branches-close {

+  color:white;

+  background:#bd2c00;

+  padding:5px 8px;

+  border-radius:3px;

+  margin-right:4px;

+  border-radius:3px;

+  text-align:center;

+}

+.branches-close:hover {

+  color:white;

+  text-decoration:none;

+}

+

 .pull-comment {

   border:1px solid #eee;

   margin-top:15px;

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

                                 open

                               </a>

                             % } else {

-                              closed

+                              <a class="branches-close" href="<%= url_for("/$user/$project/pull/$pull_request->{row_id}") %>">

+                                closed

+                              </a>

                             % }

                           % } else {

                             <% 

@@ -129,12 +129,6 @@

   my $branches = $git->branches($rep_info);

   @$branches = sort { $a->{commit}{age} <=> $b->{commit}{age} } @$branches;

-  # Variables

-  stash id => $end_commit->{id};

-  stash from_id => $start_commit->{id};

-  stash rev => $end_commit->{id};

-  stash from_rev => $start_commit->{id};

-  

   # Can open pull request

   my $can_open_pull_request;

   if (keys %$commits_date && $expand) {

@@ -142,7 +136,7 @@

   }

   # Can merge

-  my $merge_automatical;

+  my $merge_success;

   if ($can_open_pull_request) {

     # Create working repository if it don't exist

@@ -162,18 +156,23 @@

     );

     # Check merge automatically

-    $merge_automatical = $self->app->manager->check_merge_automatical(

+    $merge_success = $self->app->manager->merge(

       $work_rep_info,

       $rep_info,

       $from_rev,

       $rep_info,

       $rev

     );

-    

-    # Unlock explicitly

-    close $lock_fh;

   }

-  

+

+  # commit_body args

+  my %commit_body_args = (

+    id => $end_commit->{id},

+    from_id => $start_commit->{id},

+    rev => $end_commit->{id},

+    from_rev => $start_commit->{id}

+  );

+

   layout 'common', title => "Comparing $from_rev...$rev \x{30fb} $user_id/$project_id";

 %>

@@ -249,7 +248,7 @@

         </button>

         % if ($can_open_pull_request) {

-          % if ($merge_automatical) {

+          % if ($merge_success) {

             <span style="margin-left:10px">

               <span style="color:green;font-weight:bold"><%= "\x{2714}" %>Able to merge.</span> These branches can be automatically merged.

             </span>

@@ -321,7 +320,7 @@

     </div>

   </div>

-  % if ($merge_automatical) {

+  % if ($merge_success) {

     <div class="compare-open-pull-request">

       <form action="<%= url_for %>" method="post">

         <%= hidden_field op => 'create-pull-request' %>

@@ -397,7 +396,7 @@

       % }

     </div>

-    %= include '/include/commit_body';

+    %= include '/include/commit_body', %commit_body_args;

   % } else {

     <div class="compare-nothing">

       <div>

@@ -75,8 +75,8 @@

         $branch2

       );

-      # Check merge automatical

-      my $merge_automatical = $self->app->manager->check_merge_automatical(

+      # Merge

+      my $merge_success = $self->app->manager->merge(

         $work_rep_info,

         $rep_info,

         $branch1,

@@ -84,8 +84,9 @@

         $branch2

       );

-      if ($merge_automatical) {

-        app->manager->merge_and_push(

+      if ($merge_success) {

+        # Push

+        app->manager->push(

           $work_rep_info,

           $rep_info,

           $branch1,

@@ -132,7 +133,7 @@

   )->one;

   # Check merge automatically

-  my $merge_automatical;

+  my $merge_success;

   if ($api->can_write_access($session_user_id, $user_id, $project_id) && $pull_request->{open}) {

     my $lock_fh = $self->app->manager->lock_rep($work_rep_info);

@@ -147,7 +148,7 @@

     );

     # Check merge automatical

-    $merge_automatical = $self->app->manager->check_merge_automatical(

+    $merge_success = $self->app->manager->merge(

       $work_rep_info,

       $rep_info,

       $branch1,

@@ -280,7 +281,7 @@

       %= include '/include/commit_body', %commit_body_args;

       % if ($api->can_write_access($session_user_id, $user_id, $project_id)) {

-        % if ($merge_automatical && $pull_request->{open}) {

+        % if ($merge_success && $pull_request->{open}) {

           <form action="<%= url_for %>" method="post">

             <%= hidden_field op => 'merge' %>

             <div class="pull-request-form">