From: Junio C Hamano <junkio@cox.net>
Date: Tue, 22 May 2007 01:42:35 +0000 (-0700)
Subject: Merge branch 'maint-1.5.1' into maint
X-Git-Tag: v1.5.2.1~22
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f95c6780c244e90abf87222126ad3b4bb18a504e;p=git.git

Merge branch 'maint-1.5.1' into maint

* maint-1.5.1:
  git-status: respect core.excludesFile
  SubmittingPatches: mention older C compiler compatibility
  git-daemon: don't ignore pid-file write failure
---

f95c6780c244e90abf87222126ad3b4bb18a504e
diff --cc wt-status.c
index a0559905a,f053c15ff..4bfe8f15d
--- a/wt-status.c
+++ b/wt-status.c
@@@ -259,8 -260,10 +260,10 @@@ static void wt_status_print_untracked(s
  	x = git_path("info/exclude");
  	if (file_exists(x))
  		add_excludes_from_file(&dir, x);
+ 	if (excludes_file && file_exists(excludes_file))
+ 		add_excludes_from_file(&dir, excludes_file);
  
 -	read_directory(&dir, ".", "", 0);
 +	read_directory(&dir, ".", "", 0, NULL);
  	for(i = 0; i < dir.nr; i++) {
  		/* check for matching entry, which is unmerged; lifted from
  		 * builtin-ls-files:show_other_files */