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

[Dmitry S. Dolzhenko]

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

Signed-off-by: Dmitry S. Dolzhenko dmitrys.dolzhe...@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

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

[Junio C Hamano]

Dmitry S. Dolzhenko dmitrys.dolzhe...@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.dolzhe...@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);
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

[Junio C Hamano]

Junio C Hamano gits...@pobox.com writes:

 Dmitry S. Dolzhenko dmitrys.dolzhe...@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.dolzhe...@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);
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html