[PATCH] git checkout: don't warn about unborn branch if -f is already passed
- From
Matt McCutchen <matt@mattmccutchen.net>
- Date
- Nov 24, 2008, 06:55 UTC
- Message-ID
- <1227509722.32583.0.camel@mattlaptop2.local>
I think it's unnecessary to warn that the checkout has been forced due to an unborn current branch if -f has been explicitly passed. For one project, I am using git-new-workdir to create workdirs from a bare repository whose HEAD is set to an unborn branch, and this warning started to irritate me.
Signed-off-by: Matt McCutchen <matt@mattmccutchen.net> --- builtin-checkout.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/builtin-checkout.c b/builtin-checkout.c index 464fd25..7f3bd7b 100644 --- a/builtin-checkout.c +++ b/builtin-checkout.c @@ -553,7 +553,7 @@ static int switch_branches(struct checkout_opts *opts, struct branch_info *new) if (!opts->quiet && !old.path && old.commit && new->commit != old.commit) describe_detached_head("Previous HEAD position was", old.commit); - if (!old.commit) { + if (!old.commit && !opts->force) { if (!opts->quiet) { fprintf(stderr, "warning: You appear to be on a branch yet to be born.\n"); fprintf(stderr, "warning: Forcing checkout of %s.\n", new->name);
-- 1.6.0.2.593.g91df