From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 4 Sep 2010 15:17:09 +0000 (-0700)
Subject: Merge branch 'jl/submodule-ignore-diff'
X-Git-Tag: v1.7.3-rc0~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=02377cf4bc6050cdbf600ce65114a5438b049763;p=git.git

Merge branch 'jl/submodule-ignore-diff'

* jl/submodule-ignore-diff:
  checkout: Use submodule.*.ignore settings from .git/config and .gitmodules
  checkout: Add test for diff.ignoreSubmodules
  checkout: respect diff.ignoreSubmodules setting

Conflicts:
	builtin/checkout.c
---

02377cf4bc6050cdbf600ce65114a5438b049763
diff --cc builtin/checkout.c
index aae80c34c,829442932..560eae171
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@@ -287,6 -281,8 +289,7 @@@ static void show_local_changes(struct o
  	struct rev_info rev;
  	/* I think we want full paths, even if we're in a subdirectory. */
  	init_revisions(&rev, NULL);
 -	rev.abbrev = 0;
+ 	rev.diffopt.flags = opts->flags;
  	rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS;
  	if (diff_setup_done(&rev.diffopt) < 0)
  		die("diff_setup_done failed");