From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Oct 2011, #05; Fri, 14)
Date: Sun, 16 Oct 2011 23:37:06 -0400 [thread overview]
Message-ID: <20111017033706.GA26326@sigill.intra.peff.net> (raw)
In-Reply-To: <7vvcrorh49.fsf@alter.siamese.dyndns.org>
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@pobox.com>
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
next prev parent reply other threads:[~2011-10-17 3:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-14 23:23 What's cooking in git.git (Oct 2011, #05; Fri, 14) Junio C Hamano
2011-10-16 16:53 ` Jeff King
2011-10-16 17:17 ` Junio C Hamano
2011-10-16 17:27 ` Jeff King
2011-10-17 3:37 ` Jeff King [this message]
2011-10-17 4:20 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111017033706.GA26326@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).