# HG changeset patch # User Daniel Dourvaris # Date 2018-10-16 15:53:16 # Node ID 9be4493d5fa201f06f1dbc955cf057f9ba294b72 # Parent 4c30a2d8fb3f067533f14afe1232687c724fdf00 git: reset should use explicit -- to distinguish we want reset of branch name. diff --git a/rhodecode/lib/vcs/backends/git/repository.py b/rhodecode/lib/vcs/backends/git/repository.py --- a/rhodecode/lib/vcs/backends/git/repository.py +++ b/rhodecode/lib/vcs/backends/git/repository.py @@ -768,7 +768,7 @@ class GitRepository(BaseRepository): def _local_reset(self, branch_name): branch_name = '{}'.format(branch_name) - cmd = ['reset', '--hard', branch_name] + cmd = ['reset', '--hard', branch_name, '--'] self.run_git_command(cmd, fail_on_stderr=False) def _last_fetch_heads(self):