Add tag, if one exists, to display of commit info in conflicts.
diff --git a/repo/installer.go b/repo/installer.go index 1ae1901..1469042 100644 --- a/repo/installer.go +++ b/repo/installer.go
@@ -741,8 +741,16 @@ func displayCommitInfo(repo vcs.Repo, dep *cfg.Dependency) { c, err := repo.CommitInfo(dep.Reference) + ref := dep.Reference + if err == nil { - singleInfo(displayCommitInfoTemplate, dep.Name, dep.Reference, c.Author, c.Date.Format(time.RFC1123Z), commitSubjectFirstLine(c.Message)) + tgs, err2 := repo.TagsFromCommit(c.Commit) + if err2 == nil && len(tgs) > 0 { + if tgs[0] != dep.Reference { + ref = ref + " (" + tgs[0] + ")" + } + } + singleInfo(displayCommitInfoTemplate, dep.Name, ref, c.Author, c.Date.Format(time.RFC1123Z), commitSubjectFirstLine(c.Message)) } }