diff --git a/applyPatch.go b/applyPatch.go index 8576add..fc9ef76 100644 --- a/applyPatch.go +++ b/applyPatch.go @@ -23,7 +23,7 @@ func dumpPatchset(pset *forgepb.Patchset) bool { var count int var bad int - all := pset.SortByFilename() + all := pset.SortPatchesByFilename() for all.Scan() { p := all.Next() if IsValidPatch(p) { @@ -96,7 +96,7 @@ func applyPatchset(pset *forgepb.Patchset) error { log.Info("applyPatches() COMMENT", pset.Comment) log.Info("applyPatches() GIT_AUTHOR_NAME", pset.GetGitAuthorName()) log.Info("applyPatches() GIT_AUTHOR_EMAIL", pset.GetGitAuthorEmail()) - all := pset.SortByFilename() + all := pset.SortPatchesByFilename() for all.Scan() { p := all.Next() // log.Info("pset filename FILENAME IS REAL?", p.Filename, pset.Name, pset.Comment) diff --git a/send.go b/send.go index fff9ac4..d201dc7 100644 --- a/send.go +++ b/send.go @@ -142,7 +142,7 @@ func sendMasterDiff() { if err != nil { badExit(err) } - all := pset.SortByFilename() + all := pset.SortPatchesByFilename() for all.Scan() { p := all.Next() log.Info("read in patch:", p.Filename)