From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: Mark Jason Dominus <mjd@plover.com>, git@vger.kernel.org
Subject: Re: BUG 1.7.9: git branch fails to create new branch when --edit-description is used
Date: Sun, 29 Jan 2012 07:30:34 +0100 [thread overview]
Message-ID: <4F24E78A.7060502@alum.mit.edu> (raw)
In-Reply-To: <7vbopoxp5q.fsf@alter.siamese.dyndns.org>
On 01/28/2012 08:27 AM, Junio C Hamano wrote:
> Michael Haggerty <mhagger@alum.mit.edu> writes:
>
>>>> Where is branch blarf?
>>>
>>> You haven't created one in that sequence yet.
>>>
>>> This is more of a documentation bug.
>>>
>>> As the SYNOPSIS section makes it clear, the '--edit-description' is a
>>> separate mode from showing (the first group), creating or repointing (the
>>> second), or renaming (the third).
>>>
>>> After that you should be able to say "git branch blarf" and view its
>>> description.
>>
>> Given this design, shouldn't "git branch --edit-description" fail if the
>> branch doesn't already exist?
>
> The only use scenario in the original design was to have a way to store
> the description given a branch name, and giving a description to a branch
> that does not yet exist is outside the scope of the design. So it all
> boils down to what is the most convenient and the simplest to explain.
>
> We could error it out (i.e. you cannot name a thing that does not yet
> exist), or we could consider it is a convenience feature that you can
> prepare a description even before you create one, or we could even tweak
> it more like "-t $name" that tries to work both on existing one (without
> changing any base) or non-existing one, creating it while at it. The last
> approach historically is the most error prone (we had numerous bugs in the
> create_branch() helper after it started allowing an existing branch when
> updating the "track" information) and I would rather not go that route if
> we can avoid it.
>
> Honestly speaking, I haven't formed an opinion.
I vote for an error. Otherwise a typo in the branch name would lead to
the description's apparent disappearance into Nirvana. An error would,
for example, have made it clear to the OP what was happening.
A more useful option might be
git branch --with-description <branchname> [<start-point>]
i.e., that a branch's description can be set at the same time as the
branch is created.
>> Shouldn't it also resolve ambiguous reference names?
>
> As this mode, just like other modes of "git branch" _always_ takes a
> branch name, I do not think there is any "ambiguous reference name".
>
> You give $name to it, and it should always mean refs/heads/$name, and
> there shouldn't be any DWIMming to something like refs/heads/mh/$name
>
> Or do you have other kinds of ambiguity in mind?
OK, I wasn't aware that only local branches can have descriptions
attached to them. Given that fact, you are correct that DWIMming
doesn't make sense.
Michael
--
Michael Haggerty
mhagger@alum.mit.edu
http://softwareswirl.blogspot.com/
next prev parent reply other threads:[~2012-01-29 6:31 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-27 21:52 BUG 1.7.9: git branch fails to create new branch when --edit-description is used Mark Jason Dominus
2012-01-27 23:21 ` Junio C Hamano
2012-01-28 6:46 ` Michael Haggerty
2012-01-28 7:27 ` Junio C Hamano
2012-01-29 3:18 ` Jeff King
2012-01-29 6:30 ` Michael Haggerty [this message]
2012-01-29 6:42 ` Junio C Hamano
2012-01-29 10:11 ` Michael Haggerty
2012-01-29 21:49 ` 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=4F24E78A.7060502@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mjd@plover.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).