From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 16 Dec 2009 19:09:31 +0000 (-0800)
Subject: Merge branch 'maint' to sync with 1.6.5.7
X-Git-Tag: v1.6.6-rc3~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a1bb8f45f1590f812badceea0b7c120074ec3e85;p=git.git

Merge branch 'maint' to sync with 1.6.5.7

* maint:
  Git 1.6.5.7
  worktree: don't segfault with an absolute pathspec without a work tree
  ignore unknown color configuration
  help.autocorrect: do not run a command if the command given is junk
  Illustrate "filter" attribute with an example
---

a1bb8f45f1590f812badceea0b7c120074ec3e85
diff --cc diff.c
index d95268692,72f25b528..08bbd3e90
--- a/diff.c
+++ b/diff.c
@@@ -61,9 -59,7 +61,9 @@@ static int parse_diff_color_slot(const 
  		return DIFF_COMMIT;
  	if (!strcasecmp(var+ofs, "whitespace"))
  		return DIFF_WHITESPACE;
 +	if (!strcasecmp(var+ofs, "func"))
 +		return DIFF_FUNCINFO;
- 	die("bad config variable '%s'", var);
+ 	return -1;
  }
  
  static int git_config_rename(const char *var, const char *value)