Commit 2e64fa1d authored by bauerb@chromium.org's avatar bauerb@chromium.org

Pass --rmdir to git svn dcommit to delete empty directories.

BUG=80178
TEST=none

Review URL: http://codereview.chromium.org/6902199

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@84230 0039d316-1c4b-4281-b951-d872f2087c98
parent 6e043f75
...@@ -1183,7 +1183,8 @@ def SendUpstream(parser, args, cmd): ...@@ -1183,7 +1183,8 @@ def SendUpstream(parser, args, cmd):
logging.debug(output) logging.debug(output)
else: else:
# dcommit the merge branch. # dcommit the merge branch.
retcode, output = RunGitWithCode(['svn', 'dcommit', '--no-rebase']) retcode, output = RunGitWithCode(['svn', 'dcommit',
'--no-rebase', '--rmdir'])
finally: finally:
# And then swap back to the original branch and clean up. # And then swap back to the original branch and clean up.
RunGit(['checkout', '-q', cl.GetBranch()]) RunGit(['checkout', '-q', cl.GetBranch()])
......
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