Merge branch 'howeyc-ls-command'

This commit is contained in:
Alexander Neumann 2015-05-06 20:45:31 +02:00
commit 683092f0c4

View file

@ -48,7 +48,7 @@ func printTree(prefix string, s *server.Server, id backend.ID) error {
fmt.Println(printNode(prefix, entry)) fmt.Println(printNode(prefix, entry))
if entry.Type == "dir" && entry.Subtree != nil { if entry.Type == "dir" && entry.Subtree != nil {
err = printTree(filepath.Join(prefix, entry.Name), s, id) err = printTree(filepath.Join(prefix, entry.Name), s, entry.Subtree)
if err != nil { if err != nil {
return err return err
} }
@ -72,6 +72,11 @@ func (cmd CmdLs) Execute(args []string) error {
return err return err
} }
err = s.LoadIndex()
if err != nil {
return err
}
name, err := backend.FindSnapshot(s, args[0]) name, err := backend.FindSnapshot(s, args[0])
if err != nil { if err != nil {
return err return err