From: Nishhal Gaba <nishgaba9@gmail.com>
To: git@vger.kernel.org
Cc: Nishchal <nishgaba9@gmail.com>
Subject: [PATCH] install_branch_config(): switch from 'else-if' series to 'nested if-else'
Date: Wed, 12 Mar 2014 14:04:35 +0530 [thread overview]
Message-ID: <1394613275-3327-1-git-send-email-nishgaba9@gmail.com> (raw)
From: Nishchal <nishgaba9@gmail.com>
I am Nishchal Gaba, a GSOC 2014 aspirant, submitting patch in response to microproject(8)
Similar Execution Time, but increased readability
Alternate Solution Discarded: Table driven code using commonanilty of the statements to be printed due to _()
Signed-off-by: Nishchal Gaba <nishgaba9@gmail.com>
---
---
branch.c | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/branch.c b/branch.c
index 723a36b..04e9e24 100644
--- a/branch.c
+++ b/branch.c
@@ -77,26 +77,32 @@ 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 ?
+ if (origin){
+ if(remote_is_branch)
+ 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 ?
+ else
+ 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 ?
+ }
+
+ else if (!origin){
+ if(remote_is_branch)
+ 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
+ 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);
--
1.8.1.2
next reply other threads:[~2014-03-12 8:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-12 8:34 Nishhal Gaba [this message]
2014-03-12 9:23 ` [PATCH] install_branch_config(): switch from 'else-if' series to 'nested if-else' Matthieu Moy
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=1394613275-3327-1-git-send-email-nishgaba9@gmail.com \
--to=nishgaba9@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).