Status: add a 'TargetRef' field

Author: cdevienne

pkg/vendir/fetch/git/status.go

@@ -20,7 +20,9 @@ func (d Sync) Status(target string) (*ctlstatus.Status, error) {
 
 	git := NewGit(d.opts, d.log, d.refFetcher)
 
-	status := ctlstatus.Status{}
+	status := ctlstatus.Status{
+		TargetRef: d.opts.Ref,
+	}
 
 	out, _, err := git.cmdRunner.Run([]string{"rev-parse", "HEAD"}, []string{}, target)
 	if err != nil {

pkg/vendir/fetch/hg/status.go

@@ -43,6 +43,7 @@ func (d Sync) Status(target string) (*ctlstatus.Status, error) {
 	bookmarks := splitted[4]
 
 	status := ctlstatus.Status{
+		TargetRef: d.opts.Ref,
 		Ref: ctlstatus.CompleteReference{
 			SHA: sha,
 		},

pkg/vendir/status/status.go

@@ -5,6 +5,7 @@ package status
 
 import (
 	"fmt"
+	"slices"
 	"strings"
 )
 
@@ -15,6 +16,7 @@ type CompleteReference struct {
 }
 
 type Status struct {
+	TargetRef         string
 	Ref               CompleteReference
 	UncommitedChanges []string
 	LocalCsets        []string
@@ -25,19 +27,25 @@ func (s Status) IsSafe() bool {
 }
 
 func (s Status) String() string {
+	messages := make([]string, 0, 3)
+
 	if s.IsSafe() {
-		return "clean"
+		messages = append(messages, "clean")
 	}
 
-	messages := make([]string, 0, 2)
-
 	if len(s.UncommitedChanges) != 0 {
 		messages = append(messages, fmt.Sprintf("%d uncommited changes", len(s.UncommitedChanges)))
 	}
 	if len(s.LocalCsets) != 0 {
 		messages = append(messages, fmt.Sprintf("%d unpushed commits", len(s.LocalCsets)))
 	}
 
+	if !strings.HasPrefix(s.Ref.SHA, s.TargetRef) &&
+		!slices.Contains(s.Ref.Tags, s.TargetRef) &&
+		!slices.Contains(s.Ref.Others, s.TargetRef) {
+		messages = append(messages, "ref mismatch")
+	}
+
 	return strings.Join(messages, ", ")
 }