From 5113343a5d6a694ec0c57a784da83f0e8aef2457 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Fri, 14 Oct 2022 09:32:33 +0200 Subject: [PATCH] hack/tree_status.sh: print diff at the end Print the diff at the end of the report to help better understand what's going on. ``` tree is dirty, please run "make vendor" and commit all changes. M go.mod M go.sum M hack/tree_status.sh M vendor/github.com/containers/storage/store.go M vendor/modules.txt ---------------------- Diff below ---------------------- diff --git a/go.mod b/go.mod index e36d3fb95c57..167d769c378f 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/containers/image/v5 v5.23.0 github.com/containers/ocicrypt v1.1.6 github.com/containers/psgo v1.7.3 - github.com/containers/storage v1.43.1-0.20221013143630-714f4fc6e80e + github.com/containers/storage v1.43.1-0.20221014072257-a144fee6f51c github.com/coreos/go-systemd/v22 v22.4.0 github.com/coreos/stream-metadata-go v0.0.0-20210225230131-70edb9eb47b3 github.com/cyphar/filepath-securejoin v0.2.3 ``` Signed-off-by: Valentin Rothberg --- hack/tree_status.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hack/tree_status.sh b/hack/tree_status.sh index 2f56cdcd32..8c9c2abe8f 100755 --- a/hack/tree_status.sh +++ b/hack/tree_status.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -e -SUGGESTION="${SUGGESTION:-sync the vendor.conf and commit all changes.}" +SUGGESTION="${SUGGESTION:-run \"make vendor\" and commit all changes.}" STATUS=$(git status --porcelain) if [[ -z $STATUS ]] @@ -11,5 +11,9 @@ else echo "tree is dirty, please $SUGGESTION" echo "" echo "$STATUS" + echo "" + echo "---------------------- Diff below ----------------------" + echo "" + git --no-pager diff exit 1 fi