commit 60fdc5cad126fb5664ee957b91edd1c304bfc513
author Theodore Dubois <tbodt@google.com> Tue Jul 30 12:14:25 2019 -0700
committer Mike Frysinger <vapier@google.com> Wed Sep 04 04:34:50 2019 +0000
tree 0fff7d8a99ee6e25189147610b26acf2707989dc
parent 46702eddc7b5f38391e121e47f0ab4dbd6fbdf58

Add repo start option to create the branch based off HEAD

This makes it way easier to recover from forgetting to run repo start
before committing: just run `repo start -b new-branch`, instead of
all that tedious mucking around with reflogs.

Change-Id: I56d49dce5d027e28fbba0507ac10cd763ccfc36d
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/232712
Reviewed-by: Mike Frysinger <vapier@google.com>
Reviewed-by: David Pursehouse <dpursehouse@collab.net>
Tested-by: Mike Frysinger <vapier@google.com>

project.py

diff --git a/project.py b/project.py
index 8212e0c..4076bc5 100755
--- a/project.py
+++ b/project.py
@@ -1697,7 +1697,7 @@
 
 # Branch Management ##
 
-  def StartBranch(self, name, branch_merge=''):
+  def StartBranch(self, name, branch_merge='', revision=None):
     """Create a new branch off the manifest's revision.
     """
     if not branch_merge:
@@ -1718,7 +1718,11 @@
     branch.merge = branch_merge
     if not branch.merge.startswith('refs/') and not ID_RE.match(branch_merge):
       branch.merge = R_HEADS + branch_merge
-    revid = self.GetRevisionId(all_refs)
+
+    if revision is None:
+      revid = self.GetRevisionId(all_refs)
+    else:
+      revid = self.work_git.rev_parse(revision)
 
     if head.startswith(R_HEADS):
       try:

subcmds/start.py

diff --git a/subcmds/start.py b/subcmds/start.py
index 5d4c9c0..6ec0b2c 100644
--- a/subcmds/start.py
+++ b/subcmds/start.py
@@ -40,6 +40,10 @@
     p.add_option('--all',
                  dest='all', action='store_true',
                  help='begin branch in all projects')
+    p.add_option('-r', '--rev', '--revision', dest='revision',
+                 help='point branch at this revision instead of upstream')
+    p.add_option('--head', dest='revision', action='store_const', const='HEAD',
+                 help='abbreviation for --rev HEAD')
 
   def ValidateOptions(self, opt, args):
     if not args:
@@ -108,7 +112,8 @@
         else:
           branch_merge = self.manifest.default.revisionExpr
 
-      if not project.StartBranch(nb, branch_merge=branch_merge):
+      if not project.StartBranch(
+          nb, branch_merge=branch_merge, revision=opt.revision):
         err.append(project)
     pm.end()