From 64e14364322c52299b8f6ed775b19e5512ce30aa Mon Sep 17 00:00:00 2001 From: "luqui@chromium.org" Date: Wed, 7 Jan 2015 00:29:29 +0000 Subject: [PATCH] Added error check to git cl that we are on a branch when we try to upload. BUG=443264 R=iannucci@chromium.org,maruel@chromium.org Review URL: https://codereview.chromium.org/811023003/ git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@293537 0039d316-1c4b-4281-b951-d872f2087c98 --- git_cl.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/git_cl.py b/git_cl.py index c881729c0..4c91b6c76 100755 --- a/git_cl.py +++ b/git_cl.py @@ -1866,6 +1866,9 @@ def CMDupload(parser, args): # TODO(ukai): is it ok for gerrit case? base_branch = args[0] else: + if cl.GetBranch() is None: + DieWithError('Can\'t upload from detached HEAD state. Get on a branch!') + # Default to diffing against common ancestor of upstream branch base_branch = cl.GetCommonAncestorWithUpstream() args = [base_branch, 'HEAD']