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>
Felipe Contreras committed
Apr 30, 2013 at 20:09 UTC
715d64fe99885a37c38aff75eebfaf42b669d914
1 file changed
+5
-1
contrib/remote-helpers/git-remote-bzr
+5
-1
@@ -641,9 +641,13 @@ def do_export(parser):
641
except bzrlib.errors.DivergedBranches:
642
print "error %s non-fast forward" % ref
643
continue
644
- else:
644
+
645
+ try:
646
wt = repo.bzrdir.open_workingtree()
647
wt.update()
648
+ except bzrlib.errors.NoWorkingTree:
649
+ pass
650
+
651
print "ok %s" % ref
652
653
print