add --no-ff option to merge command ・ 675c5ca ・ Gitprep

- add --no-ff option to merge command;
- Browse files
- Yuki Kimoto commited on 2016-04-30
- 1 parent 5a3585c
  
  commit 675c5cadca4d10b97d735b350b8641774b463021

Showing 3 changed files with 13 additions and 9 deletions

+13 -3

lib/Gitprep/Manager.pm

@@ -101,18 +101,28 @@ sub prepare_merge {
 }
 
 sub merge {
-  my ($self, $work_rep_info, $base_rep_info, $base_branch, $target_rep_info, $target_branch) = @_;
+  my ($self, $work_rep_info, $target_rep_info, $target_branch, $pull_request_number) = @_;
   
   my $object_id = $self->app->git->ref_to_object_id($target_rep_info, $target_branch);
   
-  # Merge
+  my $message;
   my $target_user_id = $target_rep_info->{user};
+  if (defined $pull_request_number) {
+    $message = "Merge pull request #$pull_request_number from $target_user_id/$target_branch";
+  }
+  else {
+    $message = "Merge from $target_user_id/$target_branch";
+  }
+  
+  # Merge
   my @git_merge_cmd = $self->app->git->cmd(
     $work_rep_info,
     'merge',
-    "--message=[merge]$target_user_id/$target_branch",
+    '--no-ff',
+    "--message=$message",
     $object_id
   );
+  # 
   
   my $success = Gitprep::Util::run_command(@git_merge_cmd);
   

-2

templates/compare.html.ep

View

@@ -161,8 +161,6 @@
     # Check merge automatically
     $merge_success = $self->app->manager->merge(
       $work_rep_info,
-      $base_rep_info,
-      $base_branch,
       $target_rep_info,
       $target_branch
     );

-4

templates/pull.html.ep

View

@@ -112,8 +112,6 @@
       # Merge
       my $merge_success = $self->app->manager->merge(
         $work_rep_info,
-        $base_rep_info,
-        $base_branch,
         $target_rep_info,
         $target_branch
       );
@@ -182,8 +180,6 @@
     # Check merge automatical
     $merge_success = $self->app->manager->merge(
       $work_rep_info,
-      $base_rep_info,
-      $base_branch,
       $target_rep_info,
       $target_branch
     );

...	...	@@ -101,18 +101,28 @@ sub prepare_merge {
101	101	}
102	102
103	103	sub merge {
104		- my ($self, $work_rep_info, $base_rep_info, $base_branch, $target_rep_info, $target_branch) = @_;
	104	+ my ($self, $work_rep_info, $target_rep_info, $target_branch, $pull_request_number) = @_;
105	105
106	106	my $object_id = $self->app->git->ref_to_object_id($target_rep_info, $target_branch);
107	107
108		- # Merge
	108	+ my $message;
109	109	my $target_user_id = $target_rep_info->{user};
	110	+ if (defined $pull_request_number) {
	111	+ $message = "Merge pull request #$pull_request_number from $target_user_id/$target_branch";
	112	+ }
	113	+ else {
	114	+ $message = "Merge from $target_user_id/$target_branch";
	115	+ }
	116	+
	117	+ # Merge
110	118	my @git_merge_cmd = $self->app->git->cmd(
111	119	$work_rep_info,
112	120	'merge',
113		- "--message=[merge]$target_user_id/$target_branch",
	121	+ '--no-ff',
	122	+ "--message=$message",
114	123	$object_id
115	124	);
	125	+ #
116	126
117	127	my $success = Gitprep::Util::run_command(@git_merge_cmd);
118	128

...	...	@@ -161,8 +161,6 @@
161	161	# Check merge automatically
162	162	$merge_success = $self->app->manager->merge(
163	163	$work_rep_info,
164		- $base_rep_info,
165		- $base_branch,
166	164	$target_rep_info,
167	165	$target_branch
168	166	);

...	...	@@ -112,8 +112,6 @@
112	112	# Merge
113	113	my $merge_success = $self->app->manager->merge(
114	114	$work_rep_info,
115		- $base_rep_info,
116		- $base_branch,
117	115	$target_rep_info,
118	116	$target_branch
119	117	);
...	...	@@ -182,8 +180,6 @@
182	180	# Check merge automatical
183	181	$merge_success = $self->app->manager->merge(
184	182	$work_rep_info,
185		- $base_rep_info,
186		- $base_branch,
187	183	$target_rep_info,
188	184	$target_branch
189	185	);