Change install_branch_config() function to use skip_prefix()
for getting short name of remote branch.
Signed-off-by: Dmitry S. Dolzhenko <dmitrys.dolzhenko@xxxxxxxxx>
---
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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html