[PATCH] branch: change install_branch_config() to use skip_prefix()

[PATCH] branch: change install_branch_config() to use skip_prefix()

[Dmitry S. Dolzhenko]

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

Re: [PATCH] branch: change install_branch_config() to use skip_prefix()

[Michael Haggerty]

Dmitry,

Thanks for your patch.  Please see my comments below.

On 02/27/2014 12:13 PM, Dmitry S. Dolzhenko wrote:
> Change install_branch_config() function to use skip_prefix()
> for getting short name of remote branch.

English tweak suggestion:

Change THE install_branch_config() function to use skip_prefix()
for getting THE short name of THE 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);
>  
> 

If you look at what skip_prefix() and starts_with() do, I think you will
find that you are doing too much work here.

Michael

-- 
Michael Haggerty
mhagger@alum.mit.edu
http://softwareswirl.blogspot.com/

Re: [PATCH] branch: change install_branch_config() to use skip_prefix()

[David Kastrup]

Michael Haggerty <mhagger@alum.mit.edu> writes:

> Dmitry,
>
> Thanks for your patch.  Please see my comments below.
>
> On 02/27/2014 12:13 PM, Dmitry S. Dolzhenko wrote:
>> Change install_branch_config() function to use skip_prefix()
>> for getting short name of remote branch.
>
> English tweak suggestion:
>
> Change THE install_branch_config() function to use skip_prefix()
> for getting THE short name of THE remote branch.

Change install_branch_config() to use skip_prefix()
for getting the short name of the remote branch.

-- 
David Kastrup

Re: [PATCH] branch: change install_branch_config() to use skip_prefix()

[Dmitry S. Dolzhenko]

Michael,

Thank you for your remarks.

> If you look at what skip_prefix() and starts_with() do, I think you will
> find that you are doing too much work here.

How about this one?

	const char *shortname = skip_prefix(remote, "refs/heads/");
	int remote_is_branch = shortname != NULL;