Re: [PATCH v3 12/20] remote-hg: push to the appropriate branch

2013-04-10 Thread Felipe Contreras
On Mon, Apr 8, 2013 at 12:13 PM, Felipe Contreras
 wrote:

> --- a/contrib/remote-helpers/git-remote-hg
> +++ b/contrib/remote-helpers/git-remote-hg
> @@ -625,6 +625,10 @@ def parse_commit(parser):
>  if merge_mark:
>  get_merge_files(repo, p1, p2, files)
>
> +# Check if the ref is supposed to be a named branch
> +if ref.startswith('refs/heads/branches/'):
> +extra['branch'] = ref.replace('refs/heads/branches/', '')

This should be more consistent with the rest of the code:

branch = ref[len('refs/heads/branches/'):]

Should I reroll?

--
Felipe Contreras
--
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 v3 12/20] remote-hg: push to the appropriate branch

2013-04-08 Thread Felipe Contreras
From: Dusty Phillips 

Signed-off-by: Felipe Contreras 
---
 contrib/remote-helpers/git-remote-hg | 4 
 1 file changed, 4 insertions(+)

diff --git a/contrib/remote-helpers/git-remote-hg 
b/contrib/remote-helpers/git-remote-hg
index bccdf4e..8f6809a 100755
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg
@@ -625,6 +625,10 @@ def parse_commit(parser):
 if merge_mark:
 get_merge_files(repo, p1, p2, files)
 
+# Check if the ref is supposed to be a named branch
+if ref.startswith('refs/heads/branches/'):
+extra['branch'] = ref.replace('refs/heads/branches/', '')
+
 if mode == 'hg':
 i = data.find('\n--HG--\n')
 if i >= 0:
-- 
1.8.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