From: Junio C Hamano <gitster@pobox.com>
To: "Rubén Justo" <rjusto@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v4] branch: support for shortcuts like @{-1}, completed
Date: Fri, 07 Oct 2022 21:17:46 -0700 [thread overview]
Message-ID: <xmqq8rlrc5jp.fsf@gitster.g> (raw)
In-Reply-To: <2e164aea-7dd8-5018-474a-01643553ea49@gmail.com> ("Rubén Justo"'s message of "Sat, 8 Oct 2022 03:00:21 +0200")
Rubén Justo <rjusto@gmail.com> writes:
> } else if (new_upstream) {
> - struct branch *branch = branch_get(argv[0]);
> + struct branch *branch;
> + struct strbuf buf = STRBUF_INIT;
>
> - if (argc > 1)
> + if (!argc)
> + branch = branch_get(NULL);
> + else if (argc == 1) {
> + strbuf_branchname(&buf, argv[0], INTERPRET_BRANCH_LOCAL);
> + branch = branch_get(buf.buf);
> + } else
> die(_("too many arguments to set new upstream"));
>
> if (!branch) {
> @@ -854,11 +867,17 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
> dwim_and_setup_tracking(the_repository, branch->name,
> new_upstream, BRANCH_TRACK_OVERRIDE,
> quiet);
> + strbuf_release(&buf);
> } else if (unset_upstream) {
> - struct branch *branch = branch_get(argv[0]);
> + struct branch *branch;
> struct strbuf buf = STRBUF_INIT;
>
> - if (argc > 1)
> + if (!argc)
> + branch = branch_get(NULL);
> + else if (argc == 1) {
> + strbuf_branchname(&buf, argv[0], INTERPRET_BRANCH_LOCAL);
> + branch = branch_get(buf.buf);
> + } else
> die(_("too many arguments to unset upstream"));
The above two are a bit repetitious. A helper like
static struct branch *interpret_local(int ac, const char **av)
{
struct branch *branch;
if (!ac) {
branch = branch_get(NULL);
} else if (ac == 1) {
struct strbuf buf = STRBUF_INIT;
strbuf_branchname(&buf, av[0], INTERPRET_BRANCH_LOCAL);
branch = branch_get(buf.buf);
strbuf_release(&buf);
} else {
die(_("too many arguments"));
}
return branch;
}
might be useful, and it frees the callers from worrying about
temporary allocations.
But the code written is OK as-is.
next prev parent reply other threads:[~2022-10-08 4:18 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-05 14:34 [PATCH 0/2] branch: support for at-refs like @{-1} in --edit-description, --set-upstream-to and --unset-upstream Rubén Justo via GitGitGadget
2022-09-05 14:34 ` [PATCH 1/2] branch: refactor edit_description command switch case Rubén Justo via GitGitGadget
2022-09-05 14:34 ` [PATCH 2/2] branch: support for at-refs like @{-1} Rubén Justo via GitGitGadget
2022-09-07 9:45 ` [PATCH v2 0/2] branch: support for shortcuts like @{-1}, completed Rubén Justo
2022-09-07 9:52 ` [PATCH v2 1/2] branch: refactor "edit_description" code path Rubén Justo
2022-09-07 20:25 ` Junio C Hamano
2022-09-07 21:24 ` Rubén Justo
2022-09-08 4:32 ` Rubén Justo
2022-09-07 9:53 ` [PATCH v2 2/2] branch: support for shortcuts like @{-1} completed Rubén Justo
2022-09-08 4:47 ` [PATCH v3 0/2] branch: support for shortcuts like @{-1}, completed Rubén Justo
2022-09-08 4:51 ` [PATCH v3 1/2] branch: refactor "edit_description" code path Rubén Justo
2022-09-08 20:57 ` [PATCH] branch: error codes for "edit_description" Rubén Justo
2022-09-08 21:45 ` Junio C Hamano
2022-09-08 4:53 ` [PATCH v3 2/2] branch: support for shortcuts like @{-1} completed Rubén Justo
2022-10-08 1:00 ` [PATCH v4] branch: support for shortcuts like @{-1}, completed Rubén Justo
2022-10-08 3:17 ` Eric Sunshine
2022-10-08 4:23 ` Junio C Hamano
2022-10-08 7:07 ` Rubén Justo
2022-10-08 7:23 ` Eric Sunshine
2022-10-08 9:12 ` Rubén Justo
2022-10-08 17:10 ` Eric Sunshine
2022-10-08 17:46 ` Junio C Hamano
2022-10-08 20:48 ` Rubén Justo
2022-10-08 23:28 ` Rubén Justo
2022-10-09 6:46 ` Eric Sunshine
2022-10-09 19:33 ` Junio C Hamano
2022-10-09 22:27 ` Rubén Justo
2022-10-08 4:17 ` Junio C Hamano [this message]
2022-10-08 9:04 ` Rubén Justo
2022-10-08 22:32 ` [PATCH v5] " Rubén Justo
2022-10-09 5:37 ` Junio C Hamano
2022-10-09 19:11 ` Junio C Hamano
2022-10-09 21:26 ` Rubén Justo
2022-10-10 0:38 ` Junio C Hamano
2022-10-10 6:05 ` Rubén Justo
2022-10-10 16:55 ` Junio C Hamano
2022-10-10 18:08 ` Rubén Justo
2022-10-10 23:24 ` [PATCH v6] " Rubén Justo
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=xmqq8rlrc5jp.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).