From 00612075582193318dc81c6678259a79641f8a98 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <alexander@bumpern.de>
Date: Mon, 21 Apr 2014 23:30:00 +0200
Subject: [PATCH] Use nil storage.ID for empty directories, emit in JSON

---
 storage/tree.go     | 2 +-
 storagetest/main.go | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/storage/tree.go b/storage/tree.go
index 818dd741c..411e3cffd 100644
--- a/storage/tree.go
+++ b/storage/tree.go
@@ -18,7 +18,7 @@ type Node struct {
 	ModTime time.Time   `json:"mtime"`
 	User    uint32      `json:"user"`
 	Group   uint32      `json:"group"`
-	Content ID          `json:"content"`
+	Content ID          `json:"content,omitempty"`
 }
 
 func NewTree() *Tree {
diff --git a/storagetest/main.go b/storagetest/main.go
index e17ed1fdc..c4419ebbc 100644
--- a/storagetest/main.go
+++ b/storagetest/main.go
@@ -36,6 +36,11 @@ func archive_dir(repo storage.Repository, path string) (storage.ID, error) {
 		return nil, err
 	}
 
+	// use nil ID for empty directories
+	if len(entries) == 0 {
+		return nil, nil
+	}
+
 	t := storage.NewTree()
 	for _, e := range entries {
 		node := storage.NodeFromFileInfo(e)