* [PATCH v2] branch: change install_branch_config() to use skip_prefix()
@ 2014-02-27 15:35 Dmitry S. Dolzhenko
2014-02-27 19:42 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Dmitry S. Dolzhenko @ 2014-02-27 15:35 UTC (permalink / raw)
To: git
Change install_branch_config() 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 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/branch.c b/branch.c
index 723a36b..9382e02 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 != NULL;
struct strbuf key = STRBUF_INIT;
int rebasing = should_setup_rebase(origin);
--
1.8.3.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2] branch: change install_branch_config() to use skip_prefix()
2014-02-27 15:35 [PATCH v2] branch: change install_branch_config() to use skip_prefix() Dmitry S. Dolzhenko
@ 2014-02-27 19:42 ` Junio C Hamano
2014-02-27 22:17 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2014-02-27 19:42 UTC (permalink / raw)
To: Dmitry S. Dolzhenko; +Cc: git
"Dmitry S. Dolzhenko" <dmitrys.dolzhenko@yandex.ru> writes:
> Change install_branch_config() 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 | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/branch.c b/branch.c
> index 723a36b..9382e02 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 != NULL;
That sounds more reasonable, compared to the previous round.
I'd probably say this
int remote_is_branch = !shortname;
instead, if I were doing this patch myself, though.
> struct strbuf key = STRBUF_INIT;
> int rebasing = should_setup_rebase(origin);
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2] branch: change install_branch_config() to use skip_prefix()
2014-02-27 19:42 ` Junio C Hamano
@ 2014-02-27 22:17 ` Junio C Hamano
0 siblings, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2014-02-27 22:17 UTC (permalink / raw)
To: Dmitry S. Dolzhenko; +Cc: git
Junio C Hamano <gitster@pobox.com> writes:
> "Dmitry S. Dolzhenko" <dmitrys.dolzhenko@yandex.ru> writes:
>
>> Change install_branch_config() 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 | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/branch.c b/branch.c
>> index 723a36b..9382e02 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 != NULL;
>
> That sounds more reasonable, compared to the previous round.
> I'd probably say this
>
> int remote_is_branch = !shortname;
>
> instead, if I were doing this patch myself, though.
Heh, that is !!, not !.
>
>> struct strbuf key = STRBUF_INIT;
>> int rebasing = should_setup_rebase(origin);
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-02-27 22:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-27 15:35 [PATCH v2] branch: change install_branch_config() to use skip_prefix() Dmitry S. Dolzhenko
2014-02-27 19:42 ` Junio C Hamano
2014-02-27 22:17 ` Junio C Hamano
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.