From 7db2369081ba37baf820ce5927057fcfac0b0ac2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 11 Oct 2015 19:25:02 +0200 Subject: [PATCH] Shorten error message for tree errors --- checker/checker.go | 6 +++--- repository/index.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/checker/checker.go b/checker/checker.go index dc2d88c8c..7c6f2dad9 100644 --- a/checker/checker.go +++ b/checker/checker.go @@ -204,14 +204,14 @@ type Error struct { func (e Error) Error() string { if e.BlobID != nil && e.TreeID != nil { - msg := "tree " + e.TreeID.String() - msg += ", blob " + e.BlobID.String() + msg := "tree " + e.TreeID.Str() + msg += ", blob " + e.BlobID.Str() msg += ": " + e.Err.Error() return msg } if e.TreeID != nil { - return "tree " + e.TreeID.String() + ": " + e.Err.Error() + return "tree " + e.TreeID.Str() + ": " + e.Err.Error() } return e.Err.Error() diff --git a/repository/index.go b/repository/index.go index 0611ced6b..39152e6a5 100644 --- a/repository/index.go +++ b/repository/index.go @@ -219,7 +219,7 @@ func (idx *Index) generatePackList(selectFn func(indexEntry) bool) ([]*packJSON, continue } - debug.Log("Index.generatePackList", "handle blob %q", id[:8]) + debug.Log("Index.generatePackList", "handle blob %v", id.Str()) if blob.packID.IsNull() { debug.Log("Index.generatePackList", "blob %q has no packID! (type %v, offset %v, length %v)",