From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Wed, 1 May 2013 01:09:56 +0000 (-0500)
Subject: remote-bzr: always try to update the worktree
X-Git-Tag: v1.8.3-rc2~11^2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=715d64fe99885a37c38aff75eebfaf42b669d914;p=thirdparty%2Fgit.git

remote-bzr: always try to update the worktree

And fail properly when we can't.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr
index b428244cac..eb91d2814b 100755
--- a/contrib/remote-helpers/git-remote-bzr
+++ b/contrib/remote-helpers/git-remote-bzr
@@ -641,9 +641,13 @@ def do_export(parser):
                 except bzrlib.errors.DivergedBranches:
                     print "error %s non-fast forward" % ref
                     continue
-            else:
+
+            try:
                 wt = repo.bzrdir.open_workingtree()
                 wt.update()
+            except bzrlib.errors.NoWorkingTree:
+                pass
+
         print "ok %s" % ref
 
     print