opendev/git-review
Code Issues Proposed changes

Fix "git-review -d" erases work directory if on the same branch as the change downloaded

Browse Source 
Story: 1096057
Task: 562

Change-Id: I3fed1bc02bc29da5295e436edeaedc42c3293589
This commit is contained in:
cornelius 2016-11-18 22:32:52 +01:00 committed by Sorin Sbârnea
parent 4af1703a90
commit 9b585e00d8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
git_review/cmd.py
View File

@ -1129,8 +1129,8 @@ class CheckoutExistingBranchFailed(CommandFailed):
EXIT_CODE = 65
class ResetHardFailed(CommandFailed):
"Failed to hard reset downloaded branch"
class ResetKeepFailed(CommandFailed):
"Failed to reset downloaded branch"
EXIT_CODE = 66
@ -1245,8 +1245,8 @@ def checkout_review(branch_name, remote, remote_branch):
raise BranchTrackingMismatch
run_command_exc(CheckoutExistingBranchFailed,
"git", "checkout", branch_name)
run_command_exc(ResetHardFailed,
"git", "reset", "--hard", "FETCH_HEAD")
run_command_exc(ResetKeepFailed,
"git", "reset", "--keep", "FETCH_HEAD")
else:
raise