path: root/apply.c
diff options
authorShawn Pearce <>2006-03-05 08:24:15 (GMT)
committerJunio C Hamano <>2006-03-05 08:58:13 (GMT)
commitde84f99c12d1819479116685393afb1ebe99810b (patch)
tree6e30242eea2f8e51c936f11ea31ad4f839afb63a /apply.c
parent46444f514bf5a1df17885283634256a86fa11196 (diff)
Add --temp and --stage=all options to checkout-index.
Sometimes it is convient for a Porcelain to be able to checkout all unmerged files in all stages so that an external merge tool can be executed by the Porcelain or the end-user. Using git-unpack-file on each stage individually incurs a rather high penalty due to the need to fork for each file version obtained. git-checkout-index -a --stage=all will now do the same thing, but faster. Signed-off-by: Shawn O. Pearce <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'apply.c')
1 files changed, 2 insertions, 1 deletions
diff --git a/apply.c b/apply.c
index c369966..849a8b4 100644
--- a/apply.c
+++ b/apply.c
@@ -1402,7 +1402,8 @@ static int check_patch(struct patch *patch)
costate.not_new = 0;
costate.refresh_cache = 1;
if (checkout_entry(active_cache[pos],
- &costate) ||
+ &costate,
+ NULL) ||
lstat(old_name, &st))
return -1;