diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2013-04-22 16:55:16 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-22 15:25:54 -0700 |
| commit | e1760f8c2c355dffeade3c271c4ae875e2659dae (patch) | |
| tree | a4b20f925a65881c528b0c02b4d464d56abc60bf | |
| parent | 68d4f4f3e952f63d256dd11b1336a3782d8c1226 (diff) | |
| download | git-e1760f8c2c355dffeade3c271c4ae875e2659dae.tar.gz | |
remote-hg: write tags in the appropriate branch
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | contrib/remote-helpers/git-remote-hg | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index f5e4ba7787..f685990c8c 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -725,7 +725,9 @@ def parse_tag(parser): parsed_tags[name] = (tagger, data) def write_tag(repo, tag, node, msg, author): - tip = repo['tip'] + branch = repo[node].branch() + tip = branch_tip(repo, branch) + tip = repo[tip] def getfilectx(repo, memctx, f): try: @@ -744,7 +746,7 @@ def write_tag(repo, tag, node, msg, author): ctx = context.memctx(repo, (p1, p2), msg, ['.hgtags'], getfilectx, - user, (date, tz), {}) + user, (date, tz), {'branch' : branch}) tmp = encoding.encoding encoding.encoding = 'utf-8' |