[PATCH] Use "--no-" prefix to switch off some of checkout dwimmery
The one which guesses local branch name from a remote reference.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
Junio C Hamano, Sun, Oct 18, 2009 21:53:51 +0200:
Show 12 quoted lines
> Alex Riesen <raa.lkml@gmail.com> writes:
>
> > On Sun, Oct 18, 2009 at 10:01, Junio C Hamano <gitster@pobox.com> wrote:
> >> + OPT_SET_INT(0, "nodwim", &dwim_new_local_branch,
> >> + "do not dwim local branch creation", 0),
> >
> > Isn't there a special negation support for --no-something in parse-options?
>
> There probably is, but this is a whetherbaloon patch without documentation
> and pretty much Porcelain only, so I took the lazy route.
>
> Helping hands in polishing it up is very welcome.
Maybe like this?
BTW, can parse-options take care of the " (default)" addition?
builtin-checkout.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin-checkout.c b/builtin-checkout.c
index 6ec9b83..22b023b 100644
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -632,8 +632,8 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
OPT_STRING(0, "conflict", &conflict_style, "style",
"conflict style (merge or diff3)"),
OPT_BOOLEAN('p', "patch", &patch_mode, "select hunks interactively"),
- OPT_SET_INT(0, "nodwim", &dwim_new_local_branch,
- "do not dwim local branch creation", 0),
+ OPT_SET_INT(0, "dwim", &dwim_new_local_branch,
+ "Guess local branch from remote reference (default)", 0),
OPT_END(),
};
int has_dash_dash;
--
1.6.5.1.50.g84e6e
Alex Riesen <raa.lkml@gmail.com>