git_rebase_update.py - Issue 1497313002: Fix multi-rename empty branch detection.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: git_rebase_update.py

Issue 1497313002: Fix multi-rename empty branch detection. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@add_better_error_to_rp

Patch Set: Created 5 years 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 9d5755e9f0850c84b7373d40dc2803d4a2269bd4..a725207a90f2d3944826f5f71cb94b18164226c0 100755

--- a/git_rebase_update.py

+++ b/git_rebase_update.py

@@ -93,9 +93,9 @@ def remove_empty_branches(branch_tree):

for branch, parent in git.topo_iter(branch_tree, top_down=False):

downstreams[parent].append(branch)

- # If branch and parent have the same state, then branch has to be marked

+ # If branch and parent have the same tree, then branch has to be marked

# for deletion and its children and grand-children reparented to parent.

- if git.hash_one(branch) == git.hash_one(parent):

+ if git.hash_one(branch+":") == git.hash_one(parent+":"):

ensure_root_checkout()

logging.debug('branch %s merged to %s', branch, parent)

« no previous file with comments | « no previous file | no next file » | no next file with comments »