From: Nemina Amarasinghe <neminaa@gmail.com>
To: git@vger.kernel.org
Subject: Re: [PATCH] simplified the chain if() statements of install_branch_config() function in branch.c
Date: Mon, 10 Mar 2014 07:58:45 +0000 (UTC) [thread overview]
Message-ID: <loom.20140310T085652-521@post.gmane.org> (raw)
In-Reply-To: loom.20140310T083649-236@post.gmane.org
Nemina Amarasinghe <neminaa <at> gmail.com> writes:
Sorry for the first patch. Something went wrong. This is the correct one
>From aebfa60feb643280c89b54e5ab87f9d960cde452 Mon Sep 17 00:00:00 2001
From: Nemina Amarasinghe <neminaa@gmail.com>
Date: Mon, 10 Mar 2014 13:02:55 +0530
Subject: [PATCH] simplified the chain if() statements of
install_brach_config() function in branch.c
---
branch.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/branch.c b/branch.c
index d3b9d49..0304a7a 100644
--- a/branch.c
+++ b/branch.c
@@ -87,12 +87,7 @@ void install_branch_config(int flag, const char *local,
const char *origin, cons
_("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)
+ else if (!remote_is_branch && (origin || !origin))
printf_ln(rebasing ?
_("Branch %s set up to track remote ref %s by rebasing.") :
_("Branch %s set up to track remote ref %s."),
--
1.9.0.152.g6ab4ae2
next prev parent reply other threads:[~2014-03-10 7:59 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-10 7:39 [PATCH] simplified the chain if() statements of install_branch_config() function in branch.c Nemina Amarasinghe
2014-03-10 7:58 ` Nemina Amarasinghe [this message]
2014-03-10 8:23 ` Matthieu Moy
2014-03-10 8:36 ` David Kastrup
2014-03-10 8:51 ` Nemina Amarasinghe
2014-03-10 9:05 ` Matthieu Moy
2014-03-10 9:08 ` David Kastrup
2014-03-10 9:15 ` Nemina Amarasinghe
2014-03-10 9:27 ` David Kastrup
2014-03-10 20:46 ` Eric Sunshine
2014-03-11 6:30 ` Nemina Amarasinghe
2014-03-11 8:06 ` Eric Sunshine
2014-03-11 7:16 ` [PATCH][GSoC]simplified branch.c:install_branch_config() if() statement Nemina Amarasinghe
2014-03-11 8:11 ` 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=loom.20140310T085652-521@post.gmane.org \
--to=neminaa@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.
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).