From 13a5d485748fe5468724fbf68067c4fe557e8e63 Mon Sep 17 00:00:00 2001
From: Steven Walter <swalter@lpdev.prtdev.lexmark.com>
Date: Wed, 6 Aug 2008 09:45:28 -0400
Subject: [PATCH] unstage_one: don't fail when there are staged and unstaged
 changes

---
 yap/yap.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yap/yap.py b/yap/yap.py
index 60b9ec8..380260d 100644
--- a/yap/yap.py
+++ b/yap/yap.py
@@ -185,7 +185,7 @@ class Yap(object):
         if run_command("git rev-parse HEAD"):
             rc = run_command("git update-index --force-remove '%s'" % file)
         else:
-            rc = run_command("git diff-index -p HEAD '%s' | git apply -R --cached" % file)
+            rc = run_command("git diff-index --cached -p HEAD '%s' | git apply -R --cached" % file)
         if rc:
             raise YapError("Failed to unstage")
 
-- 
2.11.4.GIT