Commit 196809e7 authored by iannucci@chromium.org's avatar iannucci@chromium.org

Only chdir in rebase-update if there's a directory to go back to.

TBR=agable@chromium.org
BUG=499031

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@295642 0039d316-1c4b-4281-b951-d872f2087c98
parent dabb78bf
...@@ -271,7 +271,8 @@ def main(args=None): ...@@ -271,7 +271,8 @@ def main(args=None):
% (return_branch, root_branch) % (return_branch, root_branch)
) )
git.run('checkout', root_branch) git.run('checkout', root_branch)
os.chdir(return_workdir) if return_workdir:
os.chdir(return_workdir)
git.set_config(STARTING_BRANCH_KEY, '') git.set_config(STARTING_BRANCH_KEY, '')
git.set_config(STARTING_WORKDIR_KEY, '') git.set_config(STARTING_WORKDIR_KEY, '')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment