From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Wed, 17 Oct 2007 20:35:21 +0000 (+0100)
Subject: "stg pop --keep" fails because of git-apply --index (bug #8972)
X-Git-Tag: v0.14~39
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/a77bfa77826bd527205401e8030574e2ddee7ebe

"stg pop --keep" fails because of git-apply --index (bug #8972)

This patch calls git-apply without --index if --keep is passed to the
pop or goto commands.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
---

diff --git a/stgit/stack.py b/stgit/stack.py
index f2b2afb..ad1ed2b 100644
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -1167,7 +1167,8 @@ class Series(PatchSet):
         patch = self.get_patch(name)
 
         if git.get_head_file() == self.get_name():
-            if keep and not git.apply_diff(git.get_head(), patch.get_bottom()):
+            if keep and not git.apply_diff(git.get_head(), patch.get_bottom(),
+                                           check_index = False):
                 raise StackException(
                     'Failed to pop patches while preserving the local changes')
             git.switch(patch.get_bottom(), keep)