diff options
| author | Catalin Marinas <catalin.marinas@gmail.com> | 2012-04-18 11:58:35 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@gmail.com> | 2012-04-18 11:58:35 +0100 |
| commit | 86bed8d7a60cc7fa2821ebc3e6ed31a4e31df28c (patch) | |
| tree | e50119ef9243f082ecb9f4f4e114426585bf62d2 | |
| parent | 43cff23310e9ed4ac2171d5a32d753f79a952ce2 (diff) | |
| download | stgit-86bed8d7a60cc7fa2821ebc3e6ed31a4e31df28c.tar.gz | |
Fix the 'status --reset' error messages
They should now be 'reset --hard'.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
| -rw-r--r-- | stgit/commands/common.py | 4 | ||||
| -rw-r--r-- | stgit/lib/transaction.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/stgit/commands/common.py b/stgit/commands/common.py index fa46510..a6ddb0d 100644 --- a/stgit/commands/common.py +++ b/stgit/commands/common.py @@ -109,7 +109,7 @@ def color_diff_flags(): def check_local_changes(): if git.local_changes(): raise CmdException('local changes in the tree. Use "refresh" or' - ' "status --reset"') + ' "reset --hard"') def check_head_top_equal(crt_series): if not crt_series.head_top_equal(): @@ -121,7 +121,7 @@ def check_conflicts(): if git.get_conflicts(): raise CmdException('Unsolved conflicts. Please fix the conflicts' ' then use "git add --update <files>" or revert the' - ' changes with "status --reset".') + ' changes with "reset --hard".') def print_crt_patch(crt_series, branch = None): if not branch: diff --git a/stgit/lib/transaction.py b/stgit/lib/transaction.py index 252693e..4d7214e 100644 --- a/stgit/lib/transaction.py +++ b/stgit/lib/transaction.py @@ -152,9 +152,9 @@ class StackTransaction(object): self.__abort() def __assert_index_worktree_clean(self, iw): if not iw.worktree_clean(): - self.__halt('Worktree not clean. Use "refresh" or "status --reset"') + self.__halt('Worktree not clean. Use "refresh" or "reset --hard"') if not iw.index.is_clean(self.stack.head): - self.__halt('Index not clean. Use "refresh" or "status --reset"') + self.__halt('Index not clean. Use "refresh" or "reset --hard"') def __checkout(self, tree, iw, allow_bad_head): if not allow_bad_head: self.__assert_head_top_equal() |