From: Guanglin Xu <mzguanglin@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH v4] branch.c: change install_branch_config() to use skip_prefix()
Date: Mon, 3 Mar 2014 14:36:21 +0800 [thread overview]
Message-ID: <1393828581-65523-1-git-send-email-mzguanglin@gmail.com> (raw)
to avoid a magic code of 11.
Helped-by: Sun He <sunheeh...@gmail.com>
Helped-by: Eric Sunshine <sunsh...@sunshineco.com>
Helped-by: Jacopo Notarstefano <jaco...@gmail.com>
Signed-off-by: Guanglin Xu <mzguanglin@gmail.com>
---
This is an implementation of the idea#2 of GSoC 2014 microproject.
branch.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/branch.c b/branch.c
index 723a36b..4eec0ac 100644
--- a/branch.c
+++ b/branch.c
@@ -49,8 +49,12 @@ 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/");
+ int remote_is_branch;
+ if (NULL == shortname)
+ remote_is_branch = 0;
+ else
+ remote_is_branch = 1;
struct strbuf key = STRBUF_INIT;
int rebasing = should_setup_rebase(origin);
--
1.9.0
next reply other threads:[~2014-03-03 6:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-03 6:36 Guanglin Xu [this message]
2014-03-03 8:12 ` [PATCH v4] branch.c: change install_branch_config() to use skip_prefix() Eric Sunshine
2014-03-03 8:57 ` Guanglin Xu
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=1393828581-65523-1-git-send-email-mzguanglin@gmail.com \
--to=mzguanglin@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).