@@ -713,14 +713,16 @@ sub file_type_long {

 }

 sub forward_commits {

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

-  

+  my ($self, $work_rep_info, $base_rep_info, $base_branch, $target_rep_info, $target_branch) = @_;

+

+  my $target_object_id = $self->app->git->ref_to_object_id($target_rep_info, $target_branch);

+

   # Forwarding commits

   my @cmd = $self->cmd(

-    $rep_info,

+    $work_rep_info,

     'rev-list',

     '--left-right',

-    "$rev1...$rev2"

+    "$base_branch...$target_object_id"

   );

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

     or croak "Can't get info: @cmd";

@@ -728,7 +730,7 @@ sub forward_commits {

   while (my $line = <$fh>) {

     if ($line =~ /^>(.+)\s/) {

       my $rev = $1;

-      my $commit = $self->get_commit($rep_info, $rev);

+      my $commit = $self->get_commit($work_rep_info, $rev);

       push @$commits, $commit;

     }

   }

@@ -28,6 +28,7 @@ sub prepare_merge {

   # Fetch target repository

   my @git_fetch_target_cmd = $self->app->git->cmd($work_rep_info, 'fetch', $target_rep_info->{git_dir});

+  

   Gitprep::Util::run_command(@git_fetch_target_cmd)

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

@@ -194,7 +194,14 @@

   }

   # Commits

-  my $commits = $git->forward_commits($base_rep_info, $base_branch, $target_branch);

+  my $commits = $git->forward_commits(

+    $work_rep_info,

+    $base_rep_info,

+    $base_branch,

+    $target_rep_info,

+    $target_branch

+  );

+

   my $commits_count = @$commits;

   my $commits_date = {};

   my $authors = {};

@@ -207,12 +214,12 @@

   my $authors_count = keys %$authors;

   # Start commit

-  my $start_commit = $git->separated_commit($base_rep_info, $base_branch, $target_branch);

+  my $start_commit_id = app->git->ref_to_object_id($base_rep_info, $base_branch);

   # End commit

-  my $end_commit = $git->get_commit($target_rep_info, $target_branch);

+  my $end_commit_id = app->git->ref_to_object_id($target_rep_info, $target_branch);

-  if (!$start_commit || !$end_commit) {

+  if (!$start_commit_id || !$end_commit_id) {

     $self->reply->not_found;

     return;

   }

@@ -237,10 +244,9 @@

   # 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}

+    rep_info => $work_rep_info,

+    rev => $end_commit_id,

+    from_rev => $start_commit_id

   );

   layout 'common', title => "Comparing $base_branch...$target_branch \x{30fb} $base_user_id/$base_project_id";

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

 <%

   # Parameters

+  my $rep_info = stash('rep_info') // app->rep_info($user, $project);

   my $rev = stash('rev');

   my $from_rev = stash('from_rev');

@@ -20,7 +21,7 @@

   # Diff tree

   my $diff_trees = $git->diff_tree(

-    app->rep_info($user, $project),

+    $rep_info,

     $rev,

     $from_rev,

     {ignore_space_change => $ignore_space_change}

@@ -35,7 +36,7 @@

   # Get blob diffs

   my $blob_diffs = $git->blob_diffs(

-    app->rep_info($user, $project),

+    $rep_info,

     $from_rev,

     $rev,

     $diff_trees,

@@ -219,7 +219,13 @@

   }

   # Commits

-  my $commits = $git->forward_commits($base_rep_info, $base_branch, $target_branch);

+  my $commits = $git->forward_commits(

+    $work_rep_info,

+    $base_rep_info,

+    $base_branch,

+    $target_rep_info,

+    $target_branch

+  );

   my $commits_count = @$commits;

   my $commits_date = {};

   my $authors = {};

@@ -232,10 +238,10 @@

   my $authors_count = keys %$authors;

   # Start commit

-  my $start_commit = $git->separated_commit($base_rep_info, $base_branch, $target_branch);

+  my $start_commit_id = app->git->ref_to_object_id($base_rep_info, $base_branch);

   # End commit

-  my $end_commit = $git->get_commit($target_rep_info, $target_branch);

+  my $end_commit_id = app->git->ref_to_object_id($target_rep_info, $target_branch);

   # Issue messages

   my $issue_messages = app->dbi->model('issue_message')->select(

@@ -297,10 +303,9 @@

   # Commit body arguments

   my %commit_body_args = (

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

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

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

-    from_rev => $start_commit->{id}

+    rep_info => $work_rep_info,

+    rev => $end_commit_id,

+    from_rev => $start_commit_id

   );

   layout 'common', title => "Pull Requests Tags \x{30fb} $base_user_id/$base_project_id";

@@ -414,22 +414,6 @@ note 'Markdown normal file';

   $t->content_like(qr#<h1 .*?>Head</h1>#);

 }

-note 'Compare page';

-{

-  # Page access (branch name)

-  $t->get_ok("/$user/$project/compare/b1...master");

-  $t->content_like(qr#renamed dir/a\.txt to dir/b\.txt and added text#);

-

-  # Page access (branch name long)

-  $t->get_ok("/$user/$project/compare/refs/heads/b1...refs/heads/master");

-  $t->content_like(qr#renamed dir/a\.txt to dir/b\.txt and added text#);

-

-  # Page access

-  $t->get_ok("/$user/$project/compare/master...no_merged");

-  $t->content_like(qr/branch change/);

-  $t->content_like(qr#http://foo5branch change#);

-}

-

 note 'Search page';

 {

   # Page access (branch name)