commit 2e64fa1d6d18a1e49def0bb35cb06a7af4d640d0
author bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu May 05 11:13:44 2011 +0000
committer bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu May 05 11:13:44 2011 +0000
tree 623c0a02029802f1b85c53ddff1cda290f4d4349
parent 6e043f755b2a1c80fdf9e54caf0e4b12739ca55c

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

git_cl.py

diff --git a/git_cl.py b/git_cl.py
index 582a4aa..9e1124c 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -1183,7 +1183,8 @@
       logging.debug(output)
     else:
       # dcommit the merge branch.
-      retcode, output = RunGitWithCode(['svn', 'dcommit', '--no-rebase'])
+      retcode, output = RunGitWithCode(['svn', 'dcommit',
+                                        '--no-rebase', '--rmdir'])
   finally:
     # And then swap back to the original branch and clean up.
     RunGit(['checkout', '-q', cl.GetBranch()])