verbose show _anything_ not exact
This commit is contained in:
parent
55d8abd2a3
commit
ef1a306352
|
@ -509,6 +509,9 @@ func isBranchSubsetOfTrunk(repo *gitpb.Repo, branch string, trunk string) error
|
||||||
// log.Info("branch and trunk are identical ==", branch, b1, trunk, b2)
|
// log.Info("branch and trunk are identical ==", branch, b1, trunk, b2)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
if argv.Verbose {
|
||||||
|
log.Printf("%-40s NOT EXACT %s %s (%d) (%d)\n", repo.GetGoPath(), branch, trunk, b1, b2)
|
||||||
|
}
|
||||||
if b1 == 0 {
|
if b1 == 0 {
|
||||||
cmd := []string{"git", "merge", trunk}
|
cmd := []string{"git", "merge", trunk}
|
||||||
log.Printf("%-40s branch %s needs merge with trunk %s len(%d) %s\n", repo.GetGoPath(), branch, trunk, b2, cmd)
|
log.Printf("%-40s branch %s needs merge with trunk %s len(%d) %s\n", repo.GetGoPath(), branch, trunk, b2, cmd)
|
||||||
|
|
Loading…
Reference in New Issue