rev_list: handle multiple results/ref from remote for custom formats

[bup.git] / cmd / cat-file-cmd.py

diff --git a/cmd/cat-file-cmd.py b/cmd/cat-file-cmd.py
index 86816ea9657015450417147ef385e729093cf9fc..9cb6961f081645be1cf3f0f7ac0dc0896dfba832 100755 (executable)
--- a/cmd/cat-file-cmd.py
+++ b/cmd/cat-file-cmd.py
@@ -5,10 +5,10 @@ exec "$bup_python" "$0" ${1+"$@"}
 """
 # end of bup preamble
 
+from __future__ import absolute_import
 import re, stat, sys
 
-from bup import options, git
-from bup import vfs2 as vfs
+from bup import options, git, vfs
 from bup.helpers import chunkyreader, handle_ctrl_c, log, saved_errors
 from bup.repo import LocalRepo
 
@@ -39,7 +39,7 @@ if not re.match(r'/*[^/]+/[^/]+', target):
     o.fatal("path %r doesn't include a branch and revision" % target)
 
 repo = LocalRepo()
-resolved = vfs.lresolve(repo, target)
+resolved = vfs.resolve(repo, target, follow=False)
 leaf_name, leaf_item = resolved[-1]
 if not leaf_item:
     log('error: cannot access %r in %r\n'