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

Issue 1064933004: git-squash-branch: handle empty squashes and dirty trees (Closed)

Created:
5 years, 8 months ago by Sam Clegg
Modified:
5 years, 8 months ago
Reviewers:
iannucci
CC:
chromium-reviews, dpranke+depot_tools_chromium.org, iannucci+depot_tools_chromium.org
Target Ref:
refs/heads/master
Project:
tools
Visibility:
Public.

Description

git-squash-branch: handle empty squashes Error out of the current tree is dirty (previously the dirty content would be incorporated silently into the newly squashed branch!). Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=294744

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+52 lines, -31 lines) Patch
M git_cl.py View 7 chunks +6 lines, -20 lines 0 comments Download
M git_common.py View 2 chunks +25 lines, -0 lines 0 comments Download
M git_squash_branch.py View 2 chunks +4 lines, -2 lines 0 comments Download
M testing_support/git_test_utils.py View 1 chunk +0 lines, -1 line 0 comments Download
M tests/git_cl_test.py View 4 chunks +1 line, -7 lines 0 comments Download
M tests/git_common_test.py View 2 chunks +16 lines, -1 line 0 comments Download

Messages

Total messages: 8 (2 generated)
Sam Clegg
5 years, 8 months ago (2015-04-09 19:04:42 UTC) #2
iannucci
lgtm. Does it need a doc update? Don't think so, but just asking in case ...
5 years, 8 months ago (2015-04-09 19:07:29 UTC) #3
Sam Clegg
On 2015/04/09 19:07:29, iannucci wrote: > lgtm. Does it need a doc update? Don't think ...
5 years, 8 months ago (2015-04-09 19:08:24 UTC) #4
iannucci
On 2015/04/09 19:08:24, Sam Clegg wrote: > On 2015/04/09 19:07:29, iannucci wrote: > > lgtm. ...
5 years, 8 months ago (2015-04-09 19:10:29 UTC) #5
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1064933004/1
5 years, 8 months ago (2015-04-09 19:26:33 UTC) #7
commit-bot: I haz the power
5 years, 8 months ago (2015-04-09 19:29:43 UTC) #8
Message was sent while issue was closed.
Committed patchset #1 (id:1) as
http://src.chromium.org/viewvc/chrome?view=rev&revision=294744

Powered by Google App Engine
This is Rietveld 408576698