From: Brian Gesiak <modocache@gmail.com>
To: git@vger.kernel.org
Cc: modocache <modocache@gmail.com>
Subject: [PATCH 2/2] branch: use skip_prefix
Date: Fri, 28 Feb 2014 12:04:19 +0900 [thread overview]
Message-ID: <1393556659-32717-2-git-send-email-modocache@gmail.com> (raw)
In-Reply-To: <1393556659-32717-1-git-send-email-modocache@gmail.com>
From: modocache <modocache@gmail.com>
The install_branch_config function reimplemented the skip_prefix
function inline. Use skip_prefix function instead for brevity.
Signed-off-by: Brian Gesiak <modocache@gmail.com>
Reported-by: Michael Haggerty <mhagger@alum.mit.edu>
---
branch.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/branch.c b/branch.c
index 723a36b..e163f3c 100644
--- a/branch.c
+++ b/branch.c
@@ -1,3 +1,4 @@
+#include "git-compat-util.h"
#include "cache.h"
#include "branch.h"
#include "refs.h"
@@ -49,12 +50,11 @@ 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;
- int remote_is_branch = starts_with(remote, "refs/heads/");
+ const char *shortname = skip_prefix(remote, "refs/heads/");
struct strbuf key = STRBUF_INIT;
int rebasing = should_setup_rebase(origin);
- if (remote_is_branch
+ if (shortname
&& !strcmp(local, shortname)
&& !origin) {
warning(_("Not setting branch %s as its own upstream."),
@@ -77,29 +77,29 @@ 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)
+ if (shortname && 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)
+ else if (shortname && !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)
+ else if (!shortname && 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 (!shortname && !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);
+ die("BUG: impossible combination of %p and %p",
+ shortname, origin);
}
}
--
1.8.3.4 (Apple Git-47)
next prev parent reply other threads:[~2014-02-28 3:04 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-28 3:04 [PATCH 1/2] t3200-branch: test setting branch as own upstream Brian Gesiak
2014-02-28 3:04 ` Brian Gesiak [this message]
2014-02-28 5:46 ` [PATCH 2/2] branch: use skip_prefix Jeff King
2014-03-03 19:54 ` Junio C Hamano
2014-02-28 5:37 ` [PATCH 1/2] t3200-branch: test setting branch as own upstream Jeff King
2014-02-28 6:17 ` Brian Gesiak
2014-02-28 6:27 ` Jeff King
2014-02-28 22:15 ` brian m. carlson
2014-02-28 6:55 ` Johannes Sixt
2014-02-28 7:14 ` Jeff King
2014-02-28 7:26 ` Jeff King
2014-02-28 7:28 ` Brian Gesiak
2014-02-28 8:37 ` Jeff King
2014-02-28 10:44 ` Brian Gesiak
2014-02-28 10:59 ` Jeff King
2014-02-28 11:16 ` Brian Gesiak
2014-02-28 13:03 ` Jeff King
2014-02-28 14:57 ` Matthieu Moy
2014-03-01 12:19 ` [PATCH v2] branch: die when " Brian Gesiak
2014-03-01 12:23 ` [PATCH 3/3] " Brian Gesiak
2014-03-01 12:26 ` Brian Gesiak
2014-02-28 7:40 ` [PATCH 1/2] t3200-branch: test " Johannes Sixt
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=1393556659-32717-2-git-send-email-modocache@gmail.com \
--to=modocache@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).