diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-02 14:18:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-02 14:18:23 -0700 |
| commit | 125d8ecefe817db2d51dd5a85c287989ef8a0c0b (patch) | |
| tree | 8071680e9aa1bb6e4a6d4f3b0ca1b05f87a22f46 /contrib/remote-helpers/git-remote-hg | |
| parent | 8132f2c44dc903e704146361138ccd7c672ec9e2 (diff) | |
| parent | 51be46ec4d0b64c1deb60a4814bcd24b6b478eeb (diff) | |
| download | git-125d8ecefe817db2d51dd5a85c287989ef8a0c0b.tar.gz | |
Merge branch 'ap/remote-hg-skip-null-bookmarks'
* ap/remote-hg-skip-null-bookmarks:
remote-hg: do not fail on invalid bookmarks
Diffstat (limited to 'contrib/remote-helpers/git-remote-hg')
| -rwxr-xr-x | contrib/remote-helpers/git-remote-hg | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index eb89ef6779..36b526106b 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -643,7 +643,10 @@ def do_list(parser): print "? refs/heads/branches/%s" % gitref(branch) for bmark in bmarks: - print "? refs/heads/%s" % gitref(bmark) + if bmarks[bmark].hex() == '0000000000000000000000000000000000000000': + warn("Ignoring invalid bookmark '%s'", bmark) + else: + print "? refs/heads/%s" % gitref(bmark) for tag, node in repo.tagslist(): if tag == 'tip': |