Re: [PATCH 2/2] branch: use skip_prefix
Jeff King p...@peff.net writes: On Fri, Feb 28, 2014 at 12:04:19PM +0900, Brian Gesiak wrote: From: modocache modoca...@gmail.com Both your emailed patches have this, which is due to your author name not matching your sending identity. You probably want to set user.name, or if you already have (which it looks like you might have from your Signed-off-by), use git commit --amend --reset-author to update the author information. The install_branch_config function reimplemented the skip_prefix function inline. Use skip_prefix function instead for brevity. Signed-off-by: Brian Gesiak modoca...@gmail.com Reported-by: Michael Haggerty mhag...@alum.mit.edu It's a minor thing, but usually these footer lines try to follow a chronological order. So the report would come before the signoff (and a further signoff from the maintainer would go after yours). diff --git a/branch.c b/branch.c index 723a36b..e163f3c 100644 --- a/branch.c +++ b/branch.c [...] The patch itself looks OK to me. -Peff Thanks. Queued and pushed out on 'pu' with fixups already. -- 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
[PATCH 2/2] branch: use skip_prefix
From: modocache modoca...@gmail.com
The install_branch_config function reimplemented the skip_prefix
function inline. Use skip_prefix function instead for brevity.
Signed-off-by: Brian Gesiak modoca...@gmail.com
Reported-by: Michael Haggerty mhag...@alum.mit.edu
---
branch.c | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/branch.c b/branch.c
index 723a36b..e163f3c 100644
--- a/branch.c
+++ b/branch.c
@@ -1,3 +1,4 @@
+#include git-compat-util.h
#include cache.h
#include branch.h
#include refs.h
@@ -49,12 +50,11 @@ 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/);
struct strbuf key = STRBUF_INIT;
int rebasing = should_setup_rebase(origin);
- if (remote_is_branch
+ if (shortname
!strcmp(local, shortname)
!origin) {
warning(_(Not setting branch %s as its own upstream.),
@@ -77,29 +77,29 @@ void install_branch_config(int flag, const char *local,
const char *origin, cons
strbuf_release(key);
if (flag BRANCH_CONFIG_VERBOSE) {
- if (remote_is_branch origin)
+ if (shortname origin)
printf_ln(rebasing ?
_(Branch %s set up to track remote branch %s
from %s by rebasing.) :
_(Branch %s set up to track remote branch %s
from %s.),
local, shortname, origin);
- else if (remote_is_branch !origin)
+ else if (shortname !origin)
printf_ln(rebasing ?
_(Branch %s set up to track local branch %s
by rebasing.) :
_(Branch %s set up to track local branch
%s.),
local, shortname);
- else if (!remote_is_branch origin)
+ else if (!shortname origin)
printf_ln(rebasing ?
_(Branch %s set up to track remote ref %s by
rebasing.) :
_(Branch %s set up to track remote ref %s.),
local, remote);
- else if (!remote_is_branch !origin)
+ else if (!shortname !origin)
printf_ln(rebasing ?
_(Branch %s set up to track local ref %s by
rebasing.) :
_(Branch %s set up to track local ref %s.),
local, remote);
else
- die(BUG: impossible combination of %d and %p,
- remote_is_branch, origin);
+ die(BUG: impossible combination of %p and %p,
+ shortname, origin);
}
}
--
1.8.3.4 (Apple Git-47)
--
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 2/2] branch: use skip_prefix
On Fri, Feb 28, 2014 at 12:04:19PM +0900, Brian Gesiak wrote: From: modocache modoca...@gmail.com Both your emailed patches have this, which is due to your author name not matching your sending identity. You probably want to set user.name, or if you already have (which it looks like you might have from your Signed-off-by), use git commit --amend --reset-author to update the author information. The install_branch_config function reimplemented the skip_prefix function inline. Use skip_prefix function instead for brevity. Signed-off-by: Brian Gesiak modoca...@gmail.com Reported-by: Michael Haggerty mhag...@alum.mit.edu It's a minor thing, but usually these footer lines try to follow a chronological order. So the report would come before the signoff (and a further signoff from the maintainer would go after yours). diff --git a/branch.c b/branch.c index 723a36b..e163f3c 100644 --- a/branch.c +++ b/branch.c [...] The patch itself looks OK to me. -Peff -- 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
