summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doPatch.go1
-rw-r--r--helperPatches.go8
2 files changed, 9 insertions, 0 deletions
diff --git a/doPatch.go b/doPatch.go
index ee70400..50e12de 100644
--- a/doPatch.go
+++ b/doPatch.go
@@ -38,6 +38,7 @@ func doPatch() error {
log.Info("patch", p.Filename, p.Namespace)
}
me.forge.SubmitPatchesNew(old, "oldpatchset")
+ log.Infof("submitted %d old patches\n", old.Len())
return nil
}
diff --git a/helperPatches.go b/helperPatches.go
index 9280adb..c869697 100644
--- a/helperPatches.go
+++ b/helperPatches.go
@@ -108,6 +108,14 @@ func cleanSubject(line string) string {
return strings.TrimSpace(cleaned)
}
+// jcarr@framebook:~/go/src/go.wit.com/lib/protobuf/forgepb$ git branch --contains 4a27e7702b9b975b066ec9d2ee7ac932d86552e3
+// * jcarr
+// jcarr@framebook:~/go/src/go.wit.com/lib/protobuf/forgepb$ git merge-base --is-ancestor "4a27e7702b9b975b066ec9d2ee7ac932d86552e3" "devel" ; echo $?
+// 1
+// jcarr@framebook:~/go/src/go.wit.com/lib/protobuf/forgepb$ git merge-base --is-ancestor "4a27e7702b9b975b066ec9d2ee7ac932d86552e3" "jcarr" ; echo $?
+// 0
+
+
func findCommitByHash(hash string, subject string) (string, error) {
cmd := exec.Command("git", "log", "--pretty=format:%H %s")
var out bytes.Buffer