From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Thu, 19 Jan 2006 15:01:29 +0000 (+0000)
Subject: Fix the 'status --reset' for individual files
X-Git-Tag: v0.14.3~555^2~1
X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/15de5ae14f1c76adac52ca5633a679fba79a877c?hp=4625b604cae3553d4db0177d4ab9f3ad682bdd15

Fix the 'status --reset' for individual files

By default, status --reset calls resolved which updates the tree index and
the git-checkout-index -f does not overwrite the files anymore. This patch
explicitely resets the files to the HEAD tree id.

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

diff --git a/stgit/git.py b/stgit/git.py
index 61436bb..582e803 100644
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -599,7 +599,7 @@ def switch(tree_id):
 
     __set_head(tree_id)
 
-def reset(files = None, tree_id = None):
+def reset(files = None, tree_id = 'HEAD'):
     """Revert the tree changes relative to the given tree_id. It removes
     any local changes
     """