Commits

Junio C Hamano  committed 03b9d56

make --find-copies-harder imply -C

Signed-off-by: Junio C Hamano <junkio@cox.net>

  • Participants
  • Parent commits 02c5cba

Comments (0)

Files changed (1)

 
 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 |