From: Nemina Amarasinghe <neminaa@gmail.com>
To: git@vger.kernel.org
Cc: Nemina Amarasinghe <neminaa@gmail.com>
Subject: [PATCH] simplifying branch.c:install_branch_config() if()
Date: Fri, 14 Mar 2014 07:15:58 +0530 [thread overview]
Message-ID: <1394761558-4888-1-git-send-email-neminaa@gmail.com> (raw)
Signed-off-by: Nemina Amarasinghe <neminaa@gmail.com>
---
branch.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/branch.c b/branch.c
index 723a36b..fd93603 100644
--- a/branch.c
+++ b/branch.c
@@ -87,16 +87,11 @@ 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)
+ else if (!remote_is_branch)
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);
--
1.9.0.152.g6ab4ae2
next reply other threads:[~2014-03-14 1:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-14 1:45 Nemina Amarasinghe [this message]
2014-03-14 2:10 ` [PATCH] simplifying branch.c:install_branch_config() if() Jonathan Nieder
2014-03-14 4:22 ` Nemina Amarasinghe
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=1394761558-4888-1-git-send-email-neminaa@gmail.com \
--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.
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).