From: Vincenzo di Cicco <enzodicicco@gmail.com>
To: git@vger.kernel.org
Cc: NaN <enzodicicco@gmail.com>
Subject: [PATCH][GSoC] branch.c:install_branch_config Simplified long chain of if statements
Date: Mon, 10 Mar 2014 23:04:01 +0100 [thread overview]
Message-ID: <1394489041-2377-1-git-send-email-enzodicicco@gmail.com> (raw)
From: NaN <enzodicicco@gmail.com>
Hi there, I've made this patch in according to the rules to participate at GSoC.
I've seen other patches about this issue very well constructed, so this is only another way to solve this microproject and to test how I can send a patch and discuss about it.
Thanks,
NaN
Signed-off-by: Vincenzo di Cicco <enzodicicco@gmail.com>
---
Table-driven approach to avoid the long chain of if statements.
branch.c | 37 ++++++++++++++-----------------------
1 file changed, 14 insertions(+), 23 deletions(-)
diff --git a/branch.c b/branch.c
index 723a36b..cb8a544 100644
--- a/branch.c
+++ b/branch.c
@@ -53,6 +53,10 @@ void install_branch_config(int flag, const char *local, const char *origin, cons
int remote_is_branch = starts_with(remote, "refs/heads/");
struct strbuf key = STRBUF_INIT;
int rebasing = should_setup_rebase(origin);
+ struct strbuf msg = STRBUF_INIT;
+ char *locations[2][2] = {{"locate ref \%s", "local branch \%s"},
+ {"remote ref \%s", "remote branch \%s from \%s"}};
+ char *location;
if (remote_is_branch
&& !strcmp(local, shortname)
@@ -77,30 +81,17 @@ void install_branch_config(int flag, const char *local, const char *origin, cons
strbuf_release(&key);
if (flag & BRANCH_CONFIG_VERBOSE) {
- if (remote_is_branch && origin)
- printf_ln(rebasing ?
- _("Branch %s set up to track remote branch %s from %s by rebasing.") :
- _("Branch %s set up to track remote branch %s from %s."),
- local, shortname, origin);
- else if (remote_is_branch && !origin)
- printf_ln(rebasing ?
- _("Branch %s set up to track local branch %s by rebasing.") :
- _("Branch %s set up to track local branch %s."),
- local, shortname);
- else if (!remote_is_branch && origin)
- printf_ln(rebasing ?
- _("Branch %s set up to track remote ref %s by rebasing.") :
- _("Branch %s set up to track remote ref %s."),
- local, remote);
- else if (!remote_is_branch && !origin)
- printf_ln(rebasing ?
- _("Branch %s set up to track local ref %s by rebasing.") :
- _("Branch %s set up to track local ref %s."),
- local, remote);
- else
- die("BUG: impossible combination of %d and %p",
- remote_is_branch, origin);
+ location = locations[origin != NULL][remote_is_branch];
+
+ strbuf_addstr(&msg, "Branch \%s set up to track ");
+ strbuf_addstr(&msg, location);
+ if(rebasing)
+ strbuf_addstr(&msg, " by rebasing");
+ strbuf_addch(&msg, '.');
+
+ printf_ln(_(msg.buf), local, remote_is_branch ? remote: shortname, origin);
}
+ strbuf_release(&msg);
}
/*
--
1.9.0
next reply other threads:[~2014-03-10 22:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-10 22:04 Vincenzo di Cicco [this message]
2014-03-10 23:17 ` [PATCH][GSoC] branch.c:install_branch_config Simplified long chain of if statements Eric Sunshine
2014-03-10 23:55 ` Vincenzo di Cicco
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=1394489041-2377-1-git-send-email-enzodicicco@gmail.com \
--to=enzodicicco@gmail.com \
--cc=git@vger.kernel.org \
/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).