Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

Unified Diff: git_rebase_update.py

Issue 756223002: Change git-rebase-update to always keep branch 'master'. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: git_rebase_update.py
diff --git a/git_rebase_update.py b/git_rebase_update.py
index a61e53a3ab5b5b94e482e0eef9e71fd82ad9f2c6..5ad0ee176fd2d1296bed485d723f55b961a3ef15 100755
--- a/git_rebase_update.py
+++ b/git_rebase_update.py
@@ -84,6 +84,8 @@ def remove_empty_branches(branch_tree):
deletions = set()
downstreams = collections.defaultdict(list)
for branch, parent in git.topo_iter(branch_tree, top_down=False):
+ if branch == 'master':
+ continue
downstreams[parent].append(branch)
if git.hash_one(branch) == git.hash_one(parent):

Powered by Google App Engine
This is Rietveld 408576698