threads / patch / 36031

v5branch.c: change install_branch_config() to use skip_prefix()

Subject: [PATCH v5] branch.c: change install_branch_config() to use skip_prefix()

## tl;dr

One message between Mar 3, 2014 and Mar 3, 2014. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Guanglin Xu· Mar 3, 2014, 09:15 UTC · lore
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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Show changes to branch.c +2 −2
diff --git a/branch.c b/branch.c
index 723a36b..fae7715 100644
--- a/branch.c
+++ b/branch.c
@@ -49,8 +49,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/");
+	int remote_is_branch = !!shortname;
 	struct strbuf key = STRBUF_INIT;
 	int rebasing = should_setup_rebase(origin);
 
-- 
1.9.0

← back to recent threads