diff options
| author |  Felipe Contreras <felipe.contreras@gmail.com> | 2013-05-24 21:30:00 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-05-28 08:02:24 -0700 |
| commit | 8316d18da324f44b93faf36cddbf19411b53d101 (patch) | |
| tree | ec3e4ad9a810b32e1fd56dbf06654ae1fc9aebd9 /contrib/remote-helpers/git-remote-bzr | |
| parent | remote-hg: add check_push() helper (diff) | |
| download | tgif-8316d18da324f44b93faf36cddbf19411b53d101.tar.xz | |
remote-helpers: improve marks usage
Always convert to strings (they are unicode because they come from JSON).
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/remote-helpers/git-remote-bzr')
| -rwxr-xr-x | contrib/remote-helpers/git-remote-bzr | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr index 10300c63d1..f0e5be1d24 100755 --- a/contrib/remote-helpers/git-remote-bzr +++ b/contrib/remote-helpers/git-remote-bzr @@ -116,7 +116,10 @@ class Marks: self.last_mark = mark def get_tip(self, branch): - return self.tips.get(branch, None) + try: + return str(self.tips[branch]) + except KeyError: + return None def set_tip(self, branch, tip): self.tips[branch] = tip |