Skip to content

Commit 715d64f

Browse files
felipecgitster
authored andcommitted
remote-bzr: always try to update the worktree
And fail properly when we can't. Signed-off-by: Felipe Contreras <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent aa12a43 commit 715d64f

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

contrib/remote-helpers/git-remote-bzr

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -641,9 +641,13 @@ def do_export(parser):
641641
except bzrlib.errors.DivergedBranches:
642642
print "error %s non-fast forward" % ref
643643
continue
644-
else:
644+
645+
try:
645646
wt = repo.bzrdir.open_workingtree()
646647
wt.update()
648+
except bzrlib.errors.NoWorkingTree:
649+
pass
650+
647651
print "ok %s" % ref
648652

649653
print

0 commit comments

Comments
 (0)