diff options
| -rw-r--r-- | compare.go | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -1,9 +1,5 @@ package gitpb -import ( - "fmt" -) - type RepoTag struct { r *Repo t *GitTag @@ -38,7 +34,7 @@ func (rt *RepoTag) GetRef() *GitTag { return rt.t } -func (t1 *RepoTag) DeleteBranch(t2 *RepoTag) ([]string, []string, []string, []string, error) { +func (t1 *RepoTag) CompareBranch(t2 *RepoTag) ([]string, []string, []string, []string, error) { lines1, cmd1, err1 := t1.r.CountDiffObjectsNEWNEW(t1.t.Refname, t2.t.Refname) // log.Info("lessthan", t1.t.Refname, t2.t.Refname, count, t1.r.FullPath) if err1 != nil { @@ -52,7 +48,7 @@ func (t1 *RepoTag) DeleteBranch(t2 *RepoTag) ([]string, []string, []string, []st return nil, nil, cmd1, cmd2, err2 } if (len(lines1) != 0) || (len(lines2) != 0) { - return lines1, lines2, cmd1, cmd2, fmt.Errorf("nope") + return lines1, lines2, cmd1, cmd2, nil } return lines1, lines2, cmd1, cmd2, nil } |