commit 41a9ce45ee24810e55e26bef7a9fb821ea4b7633
author tandrii@chromium.org <tandrii@chromium.org> Thu Aug 06 17:57:12 2015 +0000
committer tandrii@chromium.org <tandrii@chromium.org> Thu Aug 06 17:57:12 2015 +0000
tree 7bca11168f0c223dd634588942b68e6a40517a62
parent 310db36f5209cc42226340e5eb8d567c112ad023

Fail with user friendly error when no new parent branch is specified.

Before this change, running
$ git reparent-branch
produced stacktrace and
"TypeError: sequence item 4: expected string, NoneType found"

R=iannucci@chromium.org
TEST=manual + unittest + coverage.
BUG=

Review URL: https://codereview.chromium.org/1280633003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@296235 0039d316-1c4b-4281-b951-d872f2087c98

git_reparent_branch.py

diff --git a/git_reparent_branch.py b/git_reparent_branch.py
index f24f52f..be44bc6 100755
--- a/git_reparent_branch.py
+++ b/git_reparent_branch.py
@@ -36,6 +36,8 @@
   elif opts.lkgr:
     new_parent = 'lkgr'
   else:
+    if not opts.new_parent:
+      parser.error('Must specify new parent somehow')
     new_parent = opts.new_parent
   cur_parent = upstream(branch)