From: "Dmitry S. Dolzhenko" <dmitrys.dolzhenko@yandex•ru>
To: git@vger•kernel.org
Subject: [PATCH] branch: change install_branch_config() to use skip_prefix()
Date: Thu, 27 Feb 2014 15:13:49 +0400 [thread overview]
Message-ID: <530F1DED.50308@yandex.ru> (raw)
Change install_branch_config() function to use skip_prefix()
for getting short name of remote branch.
Signed-off-by: Dmitry S. Dolzhenko <dmitrys.dolzhenko@yandex•ru>
---
branch.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/branch.c b/branch.c
index 723a36b..310749b 100644
--- a/branch.c
+++ b/branch.c
@@ -4,6 +4,8 @@
#include "remote.h"
#include "commit.h"
+static const char refs_heads_prefix[] = "refs/heads/";
+
struct tracking {
struct refspec spec;
char *src;
@@ -49,8 +51,8 @@ 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_prefix);
+ int remote_is_branch = starts_with(remote, refs_heads_prefix);
struct strbuf key = STRBUF_INIT;
int rebasing = should_setup_rebase(origin);
--
1.8.5.3
next reply other threads:[~2014-02-27 11:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-27 11:13 Dmitry S. Dolzhenko [this message]
2014-02-27 11:42 ` [PATCH] branch: change install_branch_config() to use skip_prefix() Michael Haggerty
2014-02-27 12:05 ` David Kastrup
2014-02-27 13:05 ` Dmitry S. Dolzhenko
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=530F1DED.50308@yandex.ru \
--to=dmitrys.dolzhenko@yandex$(echo .)ru \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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