Re: [PATCH v3] branch.c: change install_branch_config() to use skip_prefix()
- From
He Sun <sunheehnus@gmail.com>
- Date
- Mar 3, 2014, 05:30 UTC
- Message-ID
- <CAJr59C09sued4KJf+Gfp10yyD8NtXOKAjV0SZGbVw=Pn4hNZ7A@mail.gmail.com>
- In-Reply-To
- <1393813495-9079-1-git-send-email-mzguanglin@gmail.com>
2014-03-03 10:24 GMT+08:00 Guanglin Xu <mzguanglin@gmail.com>:
Show 22 quoted lines
> to avoid a magic code of 11.
>
> 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 | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/branch.c b/branch.c
> index 723a36b..3e2551e 100644
> --- a/branch.c
> +++ b/branch.c
> @@ -49,7 +49,7 @@ 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;
> + const char *shortname = skip_prefix(remote ,"refs/heads/");Maybe it is more proper to avoid the test of remote_is_branch, by testing shortname instead. And add the comment "skip_prefix only return NULL when refs/heads/ is not the prefix of remote"
Show 10 quoted lines
> int remote_is_branch = starts_with(remote, "refs/heads/"); > struct strbuf key = STRBUF_INIT; > int rebasing = should_setup_rebase(origin); > -- > 1.9.0 > > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
Cheers, He Sun