From 8316d18da324f44b93faf36cddbf19411b53d101 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Fri, 24 May 2013 21:30:00 -0500 Subject: remote-helpers: improve marks usage Always convert to strings (they are unicode because they come from JSON). Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- contrib/remote-helpers/git-remote-bzr | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'contrib/remote-helpers/git-remote-bzr') 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 -- cgit v1.2.3