author | Junio C Hamano <junkio@cox.net> | |
Tue, 22 May 2007 01:42:35 +0000 (18:42 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Tue, 22 May 2007 01:42:35 +0000 (18:42 -0700) |
* maint-1.5.1:
git-status: respect core.excludesFile
SubmittingPatches: mention older C compiler compatibility
git-daemon: don't ignore pid-file write failure
git-status: respect core.excludesFile
SubmittingPatches: mention older C compiler compatibility
git-daemon: don't ignore pid-file write failure
1 | 2 | |||
---|---|---|---|---|
Documentation/SubmittingPatches | patch | | diff1 | | diff2 | | blob | history |
Documentation/config.txt | patch | | diff1 | | diff2 | | blob | history |
wt-status.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/SubmittingPatches
Simple merge
diff --cc Documentation/config.txt
Simple merge
diff --cc wt-status.c
index a0559905a0b7072f4a4b44ea321c1316cfc84414,f053c15ffe266d9925379a71781bdacd56fcea26..4bfe8f15d8a0e275f1ed2d2458cda4d592f7c630
--- 1/wt-status.c
--- 2/wt-status.c
+++ b/wt-status.c
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 */