From: TamerTas <tamertas@outlook.com>
To: git@vger.kernel.org
Cc: TamerTas <tamertas@outlook.com>
Subject: [PATCH][GSOC2014] changed logical chain in branch.c to lookup tables
Date: Mon, 10 Mar 2014 21:04:22 +0200 [thread overview]
Message-ID: <BLU0-SMTP15131ED34F192C9871ACC0CD5740@phx.gbl> (raw)
In-Reply-To: <1394478262-17911-1-git-send-email-tamertas@outlook.com>
Signed-off-by: TamerTas <tamertas@outlook.com>
---
branch.c | 31 ++++++++-----------------------
1 file changed, 8 insertions(+), 23 deletions(-)
diff --git a/branch.c b/branch.c
index 723a36b..397edd3 100644
--- a/branch.c
+++ b/branch.c
@@ -50,6 +50,9 @@ static int should_setup_rebase(const char *origin)
void install_branch_config(int flag, const char *local, const char *origin, const char *remote)
{
const char *shortname = remote + 11;
+ const char *location[] = {"local", "remote"};
+ const char *type[] = {"branch", "ref"};
+
int remote_is_branch = starts_with(remote, "refs/heads/");
struct strbuf key = STRBUF_INIT;
int rebasing = should_setup_rebase(origin);
@@ -77,29 +80,11 @@ 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);
+
+ printf_ln(rebasing ?
+ _("Branch %s set up to track %s %s %s by rebasing.") :
+ _("Branch %s set up to track %s %s %s."),
+ local, location[!origin], type[remote_is_branch], remote);
}
}
--
1.7.9.5
next parent reply other threads:[~2014-03-10 19:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1394478262-17911-1-git-send-email-tamertas@outlook.com>
2014-03-10 19:04 ` TamerTas [this message]
2014-03-10 21:05 ` [PATCH][GSOC2014] changed logical chain in branch.c to lookup tables Stefan Beller
2014-03-10 21:25 ` Eric Sunshine
2014-03-10 21:47 ` Tamer TAS
2014-03-10 22:39 ` Eric Sunshine
2014-03-11 11:33 ` Tamer TAS
2014-03-11 20:32 ` Eric Sunshine
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=BLU0-SMTP15131ED34F192C9871ACC0CD5740@phx.gbl \
--to=tamertas@outlook.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.
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).