* [PATCH] branch: change install_branch_config() to use skip_prefix()
@ 2014-02-27 11:13 Dmitry S. Dolzhenko
2014-02-27 11:42 ` Michael Haggerty
0 siblings, 1 reply; 4+ messages in thread
From: Dmitry S. Dolzhenko @ 2014-02-27 11:13 UTC (permalink / raw)
To: git
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] branch: change install_branch_config() to use skip_prefix()
2014-02-27 11:13 [PATCH] branch: change install_branch_config() to use skip_prefix() Dmitry S. Dolzhenko
@ 2014-02-27 11:42 ` Michael Haggerty
2014-02-27 12:05 ` David Kastrup
2014-02-27 13:05 ` Dmitry S. Dolzhenko
0 siblings, 2 replies; 4+ messages in thread
From: Michael Haggerty @ 2014-02-27 11:42 UTC (permalink / raw)
To: Dmitry S. Dolzhenko; +Cc: git
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/
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] branch: change install_branch_config() to use skip_prefix()
2014-02-27 11:42 ` Michael Haggerty
@ 2014-02-27 12:05 ` David Kastrup
2014-02-27 13:05 ` Dmitry S. Dolzhenko
1 sibling, 0 replies; 4+ messages in thread
From: David Kastrup @ 2014-02-27 12:05 UTC (permalink / raw)
To: Michael Haggerty; +Cc: Dmitry S. Dolzhenko, git
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] branch: change install_branch_config() to use skip_prefix()
2014-02-27 11:42 ` Michael Haggerty
2014-02-27 12:05 ` David Kastrup
@ 2014-02-27 13:05 ` Dmitry S. Dolzhenko
1 sibling, 0 replies; 4+ messages in thread
From: Dmitry S. Dolzhenko @ 2014-02-27 13:05 UTC (permalink / raw)
To: Michael Haggerty; +Cc: git
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;
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-02-27 13:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-27 11:13 [PATCH] branch: change install_branch_config() to use skip_prefix() Dmitry S. Dolzhenko
2014-02-27 11:42 ` Michael Haggerty
2014-02-27 12:05 ` David Kastrup
2014-02-27 13:05 ` Dmitry S. Dolzhenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).