On Sun, Oct 16, 2011 at 10:17:10AM -0700, Junio C Hamano wrote:
> >> * jk/daemon-msgs (2011-10-14) 1 commit
> >> - daemon: give friendlier error messages to clients
> >>
> >> Will merge to 'next'.
> >
> > I'm happy to tweak the "access denied" message if other people want. I
> > kind of hoped it wouldn't matter, and that most sites would use
> > --informative-errors.
>
> I've already updated it with the "not exported" bit from Sitaram.
What you queued in d5570f4 looks sane, but the merge into next is
curious. It's an evil merge that turns on informative errors by default:
$ git show 415cf53
commit 415cf53e710b2ff44d485e253bb35a1ca5dff636
Merge: fbc2ee6 d5570f4
Author: Junio C Hamano <gitster@xxxxxxxxx>
Date: Sat Oct 15 21:25:41 2011 -0700
Merge branch 'jk/daemon-msgs' into next
* jk/daemon-msgs:
daemon: give friendlier error messages to clients
Conflicts:
daemon.c
diff --cc daemon.c
index 91c4d9b,72fb53a..95b7df5
--- a/daemon.c
+++ b/daemon.c
@@@ -20,6 -20,7 +20,7 @@@
static int log_syslog;
static int verbose;
static int reuseaddr;
-static int informative_errors;
++static int informative_errors = 1;
static const char daemon_usage[] =
"git daemon [--verbose] [--syslog] [--export-all]\n"
The conflicts come from merging with Duy's version, which was already in
next. But the introduced line comes from my second patch, which was
rightly dropped, and should not be there. Was this intentional, or did
you do something clever with "git am" and my original series during
resolution and accidentally pull in that change?
-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html