From c0d41737f1b6d7465c20722e3d315ed0df4f957d Mon Sep 17 00:00:00 2001 From: Steven Walter Date: Tue, 8 Jul 2008 15:42:01 -0400 Subject: [PATCH] cmd_unstage: work even when there are unstaged changes --- yap/yap.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/yap/yap.py b/yap/yap.py index f30450c..32cc9e4 100644 --- a/yap/yap.py +++ b/yap/yap.py @@ -339,7 +339,11 @@ flag can be used to unstage all staged changes at once. def cmd_unstage(self, *files, **flags): "[-a] | ..." if '-a' in flags: - run_safely("git read-tree -m HEAD") + try: + run_safely("git read-tree -m HEAD") + except ShellError: + run_safely("git read-tree HEAD") + run_safely("git update-index -q --refresh") self.cmd_status() return -- 2.11.4.GIT