From: Junio C Hamano <gitster@pobox.com>
To: "Rubén Justo" <rjusto@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] branch: description for non-existent branch errors
Date: Wed, 28 Sep 2022 10:41:08 -0700 [thread overview]
Message-ID: <xmqqbkqzv1l7.fsf@gitster.g> (raw)
In-Reply-To: xmqqedvw1mmu.fsf@gitster.g
Junio C Hamano <gitster@pobox.com> writes:
> Rubén Justo <rjusto@gmail.com> writes:
>
>> I pointed out in the first mail of this thread, there is already a patch in
>> 'seen' that touches builtin/branch.c [1]. I would like to keep the patches
>> separated, but I don't know how to proceed: make the change from 'seen', keep
>> it from 'master'... Maybe you can give me some guidance in this.
>
> I do not see much problem in keeping them separated. My trial merge
> of the result of applying this patch on top of 'master', with the
> other topic that has the "branch description for nth prior checkout"
> patch does show a minor textual conflict, but the resolution does
> not look too bad.
>
> Check near the topic branch of 'seen' after I push out today's
> integration result in a few hours and see if they look reasonable.
>
> Thanks.
Ah, I forgot to mention. As to the error messages that begin with a
capital letter, to be consistent with violating messages that are
already there in builtin/branch.c, let's keep them as they are in
your patch. We can and should clean them up later, perhaps soon
after the patch under discussion matures, but I agree with you that
it can be left outside the scope of this patch.
But stepping back a bit, in the longer term, we might want to change
the behaviour of "git branch --edit-description", at least when no
branch is specified on the command line and we are on an unborn
branch. It is merely the matter of setting a variable in the
configuration file, so there may not be a strong reason to forbid
$ git init trash
$ cd trash
$ git branch --edit-description
$ git commit --allow-empty -m initial
while allowing the same sequence with the last two commands reversed.
After all, renaming a branch with "branch -m" does not to require an
existing ref that points at a commit, i.e.
$ git init -b master trash
$ cd trash
$ git config branch.master.description "describes master"
$ git branch -m master main
does work fine and you end up with branch.main.description at the
end.
next prev parent reply other threads:[~2022-09-28 17:41 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-22 22:37 [PATCH] branch: description for non-existent branch errors Rubén Justo
2022-09-24 22:52 ` Rubén Justo
2022-09-26 18:12 ` Junio C Hamano
2022-09-26 23:35 ` Rubén Justo
2022-09-27 22:24 ` Junio C Hamano
2022-09-28 17:41 ` Junio C Hamano [this message]
2022-09-28 17:50 ` Junio C Hamano
2022-09-28 23:59 ` Rubén Justo
2022-09-29 1:56 ` Junio C Hamano
2022-09-30 22:47 ` [PATCH v2] " Rubén Justo
2022-10-01 12:43 ` Bagas Sanjaya
2022-10-02 21:28 ` Rubén Justo
2022-10-08 0:39 ` [PATCH v3] " Rubén Justo
2022-10-08 3:27 ` Eric Sunshine
2022-10-08 8:54 ` Rubén Justo
2022-10-09 5:05 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqbkqzv1l7.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=rjusto@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).