git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Nemina Amarasinghe <neminaa@gmail.com>
To: git@vger.kernel.org
Subject: Re: [PATCH][GSoC]simplified branch.c:install_branch_config() if() statement
Date: Tue, 11 Mar 2014 07:16:22 +0000 (UTC)	[thread overview]
Message-ID: <loom.20140311T081018-894@post.gmane.org> (raw)
In-Reply-To: CAPig+cRAqEQ8320Gq2Njoioq5UU=d+W+hzF+YZAZ7Po9XjMq0g@mail.gmail.com

I hope this is the correct format for  patch. Please comment on this if
something is wrong. 

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 0304a7a..fd93603 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)
 			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

  parent reply	other threads:[~2014-03-11  7:16 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
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     ` Nemina Amarasinghe [this message]
2014-03-11  8:11       ` [PATCH][GSoC]simplified branch.c:install_branch_config() if() statement 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=loom.20140311T081018-894@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.
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).