From: Tao Qingyun <taoqy@ls-a.me>
To: git@vger.kernel.org
Cc: sbeller@google.com, gitster@pobox.com, Tao Qingyun <taoqy@ls-a.me>
Subject: [PATCH] branch: trivial style fix
Date: Fri, 5 Oct 2018 17:52:14 +0800 [thread overview]
Message-ID: <20181005095213.12509-1-taoqy@ls-a.me> (raw)
---
builtin/branch.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index c396c41533..52aad0f602 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -222,10 +222,11 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
if (!head_rev)
die(_("Couldn't look up commit object for HEAD"));
}
- for (i = 0; i < argc; i++, strbuf_reset(&bname)) {
+ for (i = 0; i < argc; i++) {
char *target = NULL;
int flags = 0;
+ strbuf_reset(&bname);
strbuf_branchname(&bname, argv[i], allowed_interpret);
free(name);
name = mkpathdup(fmt, bname.buf);
@@ -716,8 +717,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
print_columns(&output, colopts, NULL);
string_list_clear(&output, 0);
return 0;
- }
- else if (edit_description) {
+ } else if (edit_description) {
const char *branch_name;
struct strbuf branch_ref = STRBUF_INIT;
--
2.19.0
next reply other threads:[~2018-10-05 9:54 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-05 9:52 Tao Qingyun [this message]
2018-10-05 16:21 ` [PATCH] branch: trivial style fix Jeff King
2018-10-05 16:47 ` Junio C Hamano
[not found] ` <87bm87x5z2.fsf@ls-a.me>
2018-10-15 19:35 ` Jeff King
2018-10-16 14:14 ` Tao Qingyun
2018-10-16 14:27 ` Ævar Arnfjörð Bjarmason
2018-10-16 15:32 ` Jeff King
2018-10-16 14:19 ` [PATCH v2] " Tao Qingyun
2018-10-16 15:33 ` Jeff King
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=20181005095213.12509-1-taoqy@ls-a.me \
--to=taoqy@ls-a.me \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sbeller@google.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).