summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-21 14:06:55 -0700
committerJunio C Hamano <gitster@pobox.com>2013-03-21 14:06:55 -0700
commit328455fc588d8b5a9357f9b1c053cfffc8577e15 (patch)
tree6ec5156e994fa69d302fcaae48366c8b1b2c71bc /diff.c
parent28ed8d7be9363a19ea74626d5c84dffbfa959787 (diff)
parentc9fc4415e2c7d7673cdad34d41114ede3435a395 (diff)
Merge branch 'maint'
* maint: diff.c: diff.renamelimit => diff.renameLimit in message wt-status: fix possible use of uninitialized variable fast-import: clarify "inline" logic in file_change_m run-command: always set failed_errno in start_command transport: drop "int cmp = cmp" hack drop some obsolete "x = x" compiler warning hacks fast-import: use pointer-to-pointer to keep list tail
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index 156fec4470..052974eb97 100644
--- a/diff.c
+++ b/diff.c
@@ -4662,7 +4662,7 @@ int diff_result_code(struct diff_options *opt, int status)
{
int result = 0;
- diff_warn_rename_limit("diff.renamelimit",
+ diff_warn_rename_limit("diff.renameLimit",
opt->needed_rename_limit,
opt->degraded_cc_to_c);
if (!DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&