summaryrefslogtreecommitdiff
path: root/git_review
diff options
context:
space:
mode:
Diffstat (limited to 'git_review')
-rw-r--r--git_review/cmd.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/git_review/cmd.py b/git_review/cmd.py
index 4230892..bbf0bf9 100644
--- a/git_review/cmd.py
+++ b/git_review/cmd.py
@@ -1130,8 +1130,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
@@ -1246,8 +1246,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