From cf7ec4e45add357fa478bc9803df0a9bcb43186c Mon Sep 17 00:00:00 2001
From: Collin Mulliner <collin.mulliner@getcruise.com>
Date: Mon, 18 Nov 2019 15:22:16 -0500
Subject: [PATCH] only include current path if .new file written

---
 pkg/analyzer/filetree/filetree.go | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkg/analyzer/filetree/filetree.go b/pkg/analyzer/filetree/filetree.go
index 7f3191c..51e4bb5 100644
--- a/pkg/analyzer/filetree/filetree.go
+++ b/pkg/analyzer/filetree/filetree.go
@@ -232,11 +232,13 @@ func (state *fileTreeType) Finalize() string {
 		}
 	}
 
+	treeUpdated := false
 	if len(added) > 0 || len(removed) > 0 || (len(changed) > 0 && state.config.CheckPermsOwnerChange) {
 		err := state.saveTree()
 		if err != nil {
 			panic("saveTree failed")
 		}
+		treeUpdated = true
 	}
 
 	for _, fi := range added {
@@ -259,9 +261,14 @@ func (state *fileTreeType) Finalize() string {
 	if state.config.OldTreeFilePath != "" {
 		type reportData struct {
 			OldFileTreePath     string `json:"old_file_tree_path"`
-			CurrentFileTreePath string `json:"current_file_tree_path"`
+			CurrentFileTreePath string `json:"current_file_tree_path,omitempty"`
 		}
-		data := reportData{state.config.OldTreeFilePath, state.config.OldTreeFilePath + newFileTreeExt}
+		newPath := ""
+		if treeUpdated {
+			newPath = state.config.OldTreeFilePath + newFileTreeExt
+		}
+
+		data := reportData{state.config.OldTreeFilePath, newPath}
 		jdata, _ := json.Marshal(&data)
 		return string(jdata)
 	}