From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 May 2008 19:37:28 +0000 (-0700)
Subject: Merge branch 'jk/renamelimit' (early part)
X-Git-Tag: v1.5.6-rc0~60
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/adf59ec127f447aa83c84f9dbe2ae4e6417f3760?ds=inline;hp=-c

Merge branch 'jk/renamelimit' (early part)

* 'jk/renamelimit' (early part):
diff: make "too many files" rename warning optional
bump rename limit defaults
add merge.renamelimit config option
---

adf59ec127f447aa83c84f9dbe2ae4e6417f3760
diff --combined diff.c
index e35384b444,f7355191dd..439d4746ca
--- a/diff.c
+++ b/diff.c
@@@ -19,7 -19,7 +19,7 @@@
  #endif
  
  static int diff_detect_rename_default;
- static int diff_rename_limit_default = 100;
+ static int diff_rename_limit_default = 200;
  int diff_use_color_default = -1;
  static const char *external_diff_cmd_cfg;
  int diff_auto_refresh_index = 1;
@@@ -2220,6 -2220,7 +2220,6 @@@ void diff_setup(struct diff_options *op
  	options->rename_limit = -1;
  	options->dirstat_percent = 3;
  	options->context = 3;
 -	options->msg_sep = "";
  
  	options->change = diff_change;
  	options->add_remove = diff_addremove;
diff --combined diff.h
index 1bd94a4807,8931116068..3a02d38d12
--- a/diff.h
+++ b/diff.h
@@@ -83,11 -83,13 +83,12 @@@ struct diff_options 
  	int pickaxe_opts;
  	int rename_score;
  	int rename_limit;
+ 	int warn_on_too_large_rename;
  	int dirstat_percent;
  	int setup;
  	int abbrev;
  	const char *prefix;
  	int prefix_length;
 -	const char *msg_sep;
  	const char *stat_sep;
  	long xdl_opts;