Re: [PATCH 18/24] merge: do not setup worktree twice

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Nov 11, 2009, 01:58 UTC
Message-ID: <20091111015832.GB9027@progeny.tock>
In-Reply-To: <7vws1y6sxg.fsf@alter.siamese.dyndns.org>

Junio C Hamano wrote:

Show 12 quoted lines

> Jonathan Nieder <jrnieder@gmail.com> writes:
>
>> Builtins do not need to run setup_worktree() for themselves, since
>> the builtin machinery runs it for them.
>>
>> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
>> ---
>> This matter since '-h' cannot suppress _this_ setup_work_tree()
>> through the builtin machinery.
>
> I think this should directly go to 'maint'.  I ejected it from the
> series.

Thanks. I think something like this should go on top on maint, then reverted in master.

Sorry for the trouble, Jonathan

-- %< --
Subject: check-ref-format does not know --print yet

Don’t advertise the --print option of the future in the current usage string.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 builtin-check-ref-format.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/builtin-check-ref-format.c b/builtin-check-ref-format.c
index 96382e3..a5ba4ea 100644
--- a/builtin-check-ref-format.c
+++ b/builtin-check-ref-format.c
@@ -8,7 +8,7 @@
 #include "strbuf.h"
 
 static const char builtin_check_ref_format_usage[] =
-"git check-ref-format [--print] <refname>\n"
+"git check-ref-format <refname>\n"
 "   or: git check-ref-format --branch <branchname-shorthand>";
 
 int cmd_check_ref_format(int argc, const char **argv, const char *prefix)

-- 
1.6.5.2