make --find-copies-harder imply -C
Signed-off-by: Junio C Hamano <junkio@cox.net>maint
							parent
							
								
									02c5cba200
								
							
						
					
					
						commit
						03b9d560be
					
				
							
								
								
									
										7
									
								
								diff.c
								
								
								
								
							
							
						
						
									
										7
									
								
								diff.c
								
								
								
								
							|  | @ -1515,9 +1515,10 @@ void diff_setup(struct diff_options *options) | |||
|  | ||||
| int diff_setup_done(struct diff_options *options) | ||||
| { | ||||
| 	if ((options->find_copies_harder && | ||||
| 	     options->detect_rename != DIFF_DETECT_COPY) || | ||||
| 	    (0 <= options->rename_limit && !options->detect_rename)) | ||||
| 	if (options->find_copies_harder) | ||||
| 		options->detect_rename = DIFF_DETECT_COPY; | ||||
|  | ||||
| 	if ((0 <= options->rename_limit && !options->detect_rename) | ||||
| 		return -1; | ||||
|  | ||||
| 	if (options->output_format & (DIFF_FORMAT_NAME | | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 Junio C Hamano
						Junio C Hamano