From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Feb 2015 21:41:51 +0000 (-0800)
Subject: Merge branch 'dk/format-patch-ignore-diff-submodule'
X-Git-Tag: v2.4.0-rc0~137
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/35d28f32e6492eb447bd271f40a5f0d53de4c46b?hp=-c

Merge branch 'dk/format-patch-ignore-diff-submodule'

Setting diff.submodule to 'log' made "git format-patch" produce
broken patches.

* dk/format-patch-ignore-diff-submodule:
format-patch: ignore diff.submodule setting
t4255: test am submodule with diff.submodule
---

35d28f32e6492eb447bd271f40a5f0d53de4c46b
diff --combined builtin/log.c
index 923ffe72ce,cb14db4898..a131992c52
--- a/builtin/log.c
+++ b/builtin/log.c
@@@ -38,8 -38,8 +38,8 @@@ static const char *fmt_patch_subject_pr
  static const char *fmt_pretty;
  
  static const char * const builtin_log_usage[] = {
 -	N_("git log [<options>] [<revision range>] [[--] <path>...]\n")
 -	N_("   or: git show [options] <object>..."),
 +	N_("git log [<options>] [<revision range>] [[--] <path>...]"),
 +	N_("git show [options] <object>..."),
  	NULL
  };
  
@@@ -489,7 -489,7 +489,7 @@@ static int show_tag_object(const unsign
  }
  
  static int show_tree_object(const unsigned char *sha1,
 -		const char *base, int baselen,
 +		struct strbuf *base,
  		const char *pathname, unsigned mode, int stage, void *context)
  {
  	printf("%s%s\n", pathname, S_ISDIR(mode) ? "/" : "");
@@@ -705,7 -705,7 +705,7 @@@ static int git_format_config(const cha
  		return 0;
  	}
  	if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff") ||
- 	    !strcmp(var, "color.ui")) {
+ 	    !strcmp(var, "color.ui") || !strcmp(var, "diff.submodule")) {
  		return 0;
  	}
  	if (!strcmp(var, "format.numbered")) {