aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2013-04-30 20:09:56 -0500
committerJunio C Hamano <gitster@pobox.com>2013-04-30 22:06:46 -0700
commit715d64fe99885a37c38aff75eebfaf42b669d914 (patch)
treeb720b3100124d3ec42d4f7383106cdc9c2e90367 /contrib
parentaa12a431f3bb96fa01cd1efa97eb1273d9a00c0e (diff)
downloadgit-715d64fe99885a37c38aff75eebfaf42b669d914.tar.gz
git-715d64fe99885a37c38aff75eebfaf42b669d914.tar.xz
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>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/remote-helpers/git-remote-bzr6
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr
index b428244ca..eb91d2814 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