From: Junio C Hamano <gitster@pobox.com>
To: kusmabite@gmail.com
Cc: Johannes Sixt <j.sixt@viscovery.net>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: git checkout creates strange '(null)'-branch
Date: Tue, 08 May 2012 09:25:17 -0700 [thread overview]
Message-ID: <7vd36ey70y.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CABPQNSZjdpz8zqYOwBQ_SPeh0JqyxQ1bjrghG1vzxt0GiLR22w@mail.gmail.com> (Erik Faye-Lund's message of "Tue, 8 May 2012 13:50:35 +0200")
Erik Faye-Lund <kusmabite@gmail.com> writes:
> But if I apply the following patch, the test passes. I'm not saying
> it's the right thing to do, though.
>
> (Warning: white-space damaged because of copying diffs between terminals)
>
> diff --git a/builtin/checkout.c b/builtin/checkout.c
> index 23fc56d..d70e819 100644
> --- a/builtin/checkout.c
> +++ b/builtin/checkout.c
> @@ -1096,8 +1096,11 @@ int cmd_checkout(int argc, const char **argv,
> const char *prefix)
> int flag;
>
> if (!read_ref_full("HEAD", rev, 0, &flag) &&
> - (flag & REF_ISSYMREF) && is_null_sha1(rev))
> + (flag & REF_ISSYMREF) && is_null_sha1(rev)) {
> + if (!opts.new_branch)
> + return 0;
> return switch_unborn_to_new_branch(&opts);
> + }
> }
> return switch_branches(&opts, &new);
> }
This patch, if we ignore submodules for a while, actually makes sense to
me. If you have a commit, you are on that commit and you haven't done
anything since you have checked out that commit, "git checkout" (no other
parameters) would be a no-op. If you "git init" a repository, and you
haven't done anything since then, the above makes "git checkout" (no other
parameters) a no-op.
Am I missing some corner cases that we _should_ error out, perhaps for the
sake of safety?
next prev parent reply other threads:[~2012-05-08 16:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-08 11:24 git checkout creates strange '(null)'-branch Erik Faye-Lund
2012-05-08 11:34 ` Johannes Sixt
2012-05-08 11:50 ` Erik Faye-Lund
2012-05-08 12:10 ` Andreas Schwab
2012-05-08 16:25 ` Junio C Hamano [this message]
2012-05-10 14:22 ` Erik Faye-Lund
2012-05-10 16:49 ` Junio C Hamano
2012-05-08 15:09 ` Junio C Hamano
2012-05-08 15:05 ` Junio C Hamano
2012-05-08 15:19 ` Junio C Hamano
2012-05-08 16:04 ` Erik Faye-Lund
2012-05-08 16:22 ` 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=7vd36ey70y.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
--cc=kusmabite@gmail.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).