... | ... |
@@ -130,15 +130,15 @@ sub prepare_merge { |
130 | 130 |
Gitprep::Util::run_command(@git_checkout_tmp_branch) |
131 | 131 |
or Carp::croak "Can't execute git checkout: @git_checkout_tmp_branch"; |
132 | 132 |
|
133 |
- # git reset --hard |
|
134 |
- my @git_reset_hard_cmd = $self->app->git->cmd( |
|
133 |
+ # git reset --hard |
|
134 |
+ my @git_reset_hard_base_cmd = $self->app->git->cmd( |
|
135 | 135 |
$work_rep_info, |
136 | 136 |
'reset', |
137 | 137 |
'--hard', |
138 | 138 |
"origin/$base_branch" |
139 | 139 |
); |
140 |
- Gitprep::Util::run_command(@git_reset_hard_cmd) |
|
141 |
- or Carp::croak "Can't execute git reset --hard: @git_reset_hard_cmd"; |
|
140 |
+ Gitprep::Util::run_command(@git_reset_hard_base_cmd) |
|
141 |
+ or Carp::croak "Can't execute git reset --hard: @git_reset_hard_base_cmd"; |
|
142 | 142 |
} |
143 | 143 |
|
144 | 144 |
sub merge { |
... | ... |
@@ -159,15 +159,21 @@ sub merge { |
159 | 159 |
} |
160 | 160 |
|
161 | 161 |
sub push { |
162 |
- my ($self, $work_rep_info, $rep_info1, $base_branch, $rep_info2, $target_branch) = @_; |
|
162 |
+ my ($self, $work_rep_info, $base_branch) = @_; |
|
163 | 163 |
|
164 | 164 |
# Push |
165 |
- my @git_push_cmd = $self->app->git->cmd($work_rep_info, 'push', 'origin', $base_branch); |
|
165 |
+ my $tmp_branch = $self->_tmp_branch; |
|
166 |
+ my @git_push_cmd = $self->app->git->cmd( |
|
167 |
+ $work_rep_info, |
|
168 |
+ 'push', |
|
169 |
+ 'origin', |
|
170 |
+ "$tmp_branch:$base_branch" |
|
171 |
+ ); |
|
172 |
+ warn "@git_push_cmd"; |
|
166 | 173 |
Gitprep::Util::run_command(@git_push_cmd) |
167 | 174 |
or Carp::croak "Can't execute git push: @git_push_cmd"; |
168 | 175 |
} |
169 | 176 |
|
170 |
- |
|
171 | 177 |
=pod |
172 | 178 |
sub check_merge_automatical { |
173 | 179 |
my ($self, $work_rep_info, $rep_info1, $base_branch, $rep_info2, $target_branch) = @_; |
... | ... |
@@ -84,15 +84,10 @@ |
84 | 84 |
$branch2 |
85 | 85 |
); |
86 | 86 |
|
87 |
+ |
|
87 | 88 |
if ($merge_success) { |
88 | 89 |
# Push |
89 |
- app->manager->push( |
|
90 |
- $work_rep_info, |
|
91 |
- $rep_info, |
|
92 |
- $branch1, |
|
93 |
- $rep_info, |
|
94 |
- $branch2 |
|
95 |
- ); |
|
90 |
+ app->manager->push($work_rep_info, $branch1); |
|
96 | 91 |
|
97 | 92 |
app->dbi->model('pull_request')->update( |
98 | 93 |
{open => 0}, |