diff options
| author | Matt McCutchen <matt@mattmccutchen.net> | 2008-11-24 01:55:22 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-27 18:35:28 -0800 |
| commit | 1510dbe380a24fdf303a3c0594752cfdc968cb12 (patch) | |
| tree | d0bda0c0087f1e437917fdd6b0d5cb9e54bad226 /builtin-checkout.c | |
| parent | c07838371b116251b6c4bc62a2ba64109baf74f1 (diff) | |
| download | git-1510dbe380a24fdf303a3c0594752cfdc968cb12.tar.gz | |
git checkout: don't warn about unborn branch if -f is already passed
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-checkout.c')
| -rw-r--r-- | builtin-checkout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c index 25845cdd5e..c107fd643a 100644 --- a/builtin-checkout.c +++ b/builtin-checkout.c @@ -421,7 +421,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); |