summaryrefslogtreecommitdiff
path: root/prepareRelease.go
diff options
context:
space:
mode:
Diffstat (limited to 'prepareRelease.go')
-rw-r--r--prepareRelease.go10
1 files changed, 8 insertions, 2 deletions
diff --git a/prepareRelease.go b/prepareRelease.go
index 16a7b1d..4cc3bcb 100644
--- a/prepareRelease.go
+++ b/prepareRelease.go
@@ -165,8 +165,14 @@ func rePrepareRelease() {
// they are actually equal
continue
}
- b1 := check.CountDiffObjects(oldlhash, newmhash)
- b2 := check.CountDiffObjects(newmhash, oldlhash)
+ b1, err := check.CountDiffObjects(oldlhash, newmhash)
+ if err != nil {
+ badExit(err)
+ }
+ b2, err := check.CountDiffObjects(newmhash, oldlhash)
+ if err != nil {
+ badExit(err)
+ }
if b1 != 0 {
log.Printf("HASH ERROR %-50s tag %s < %s\n", check.GetGoPath(), newmhash, oldlhash)
log.Info("old vs new count", b1, b2, "git merge", oldlhash)