diff options
| author |  Felipe Contreras <felipe.contreras@gmail.com> | 2013-04-30 20:09:56 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-04-30 22:06:46 -0700 |
| commit | 715d64fe99885a37c38aff75eebfaf42b669d914 (patch) | |
| tree | b720b3100124d3ec42d4f7383106cdc9c2e90367 /contrib | |
| parent | remote-bzr: fix order of locking in CustomTree (diff) | |
| download | tgif-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-x | contrib/remote-helpers/git-remote-bzr | 6 |
1 files changed, 5 insertions, 1 deletions
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 |