From: NaN <enzodici...@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 <enzodici...@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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
