From f246cc9cdd9091baa5f956f7c8119a49e8379f91 Mon Sep 17 00:00:00 2001 From: creack Date: Thu, 21 Mar 2013 10:12:05 -0700 Subject: [PATCH] Apply the new WalkHistory prototype to merge --- commands.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/commands.go b/commands.go index 60bfadfffe..d5fcacb9f7 100644 --- a/commands.go +++ b/commands.go @@ -331,13 +331,14 @@ func (srv *Server) CmdHistory(stdin io.ReadCloser, stdout io.Writer, args ...str return err } var child *Image - return image.WalkHistory(func(img *Image) { + return image.WalkHistory(func(img *Image) error { if child == nil { fmt.Fprintf(stdout, " %s\n", img.Id) } else { fmt.Fprintf(stdout, " = %s + %s\n", img.Id, strings.Join(child.ParentCommand, " ")) } child = img + return nil }) }