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

Issue 1497313002: Fix multi-rename empty branch detection. (Closed)

Created:
5 years ago by iannucci
Modified:
5 years ago
CC:
chromium-reviews, dpranke+depot_tools_chromium.org, iannucci+depot_tools_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/tools/depot_tools.git@add_better_error_to_rp
Target Ref:
refs/heads/master
Visibility:
Public.

Description

Fix multi-rename empty branch detection. This changes the 'empty' branch detection to compare the commit trees instead of the commit hashes. This avoids empty-branch detection when you have multiple renames on the branch that end up canceling eachother out. Previously you'd end up with the rename-commits, in order, in your rebased branch, even though when you run `git upstream-diff` you get nothing. R=agable@chromium.org, jochen@chromium.org, vadimsh@chromium.org BUG=438208 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=297849

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+2 lines, -2 lines) Patch
M git_rebase_update.py View 1 chunk +2 lines, -2 lines 0 comments Download

Depends on Patchset:

Messages

Total messages: 7 (2 generated)
iannucci
5 years ago (2015-12-04 19:03:33 UTC) #1
agable
lgtm
5 years ago (2015-12-04 19:06:48 UTC) #2
iannucci
On 2015/12/04 at 19:03:33, iannucci wrote: > It's not just renames, actually, it's any series ...
5 years ago (2015-12-04 19:07:27 UTC) #3
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1497313002/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1497313002/1
5 years ago (2015-12-04 19:07:38 UTC) #5
commit-bot: I haz the power
5 years ago (2015-12-04 19:09:33 UTC) #7
Message was sent while issue was closed.
Committed patchset #1 (id:1) as
http://src.chromium.org/viewvc/chrome?view=rev&revision=297849

Powered by Google App Engine
This is Rietveld 408576698