From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Mar 2009 20:48:07 +0000 (-0700)
Subject: Merge branch 'tr/format-patch-thread'
X-Git-Tag: v1.6.3-rc0~174
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5a5bd23486c5d8721f4654eadec75213d3dc074f;p=git.git

Merge branch 'tr/format-patch-thread'

* tr/format-patch-thread:
  format-patch: support deep threading
  format-patch: thread as reply to cover letter even with in-reply-to
  format-patch: track several references
  format-patch: threading test reactivation

Conflicts:
	builtin-log.c
---

5a5bd23486c5d8721f4654eadec75213d3dc074f
diff --cc builtin-log.c
index 854902881,6bf04e8af..8684fcdb6
--- a/builtin-log.c
+++ b/builtin-log.c
@@@ -490,14 -493,18 +495,25 @@@ static int git_format_config(const cha
  		auto_number = auto_number && numbered;
  		return 0;
  	}
 +	if (!strcmp(var, "format.attach")) {
 +		if (value && *value)
 +			default_attach = xstrdup(value);
 +		else
 +			default_attach = xstrdup(git_version_string);
 +		return 0;
 +	}
- 
+ 	if (!strcmp(var, "format.thread")) {
+ 		if (value && !strcasecmp(value, "deep")) {
+ 			thread = THREAD_DEEP;
+ 			return 0;
+ 		}
+ 		if (value && !strcasecmp(value, "shallow")) {
+ 			thread = THREAD_SHALLOW;
+ 			return 0;
+ 		}
+ 		thread = git_config_bool(var, value) && THREAD_SHALLOW;
+ 		return 0;
+ 	}
  
  	return git_log_config(var, value, cb);
  }