From de84f99c12d1819479116685393afb1ebe99810b Mon Sep 17 00:00:00 2001 From: Shawn Pearce Date: Sun, 5 Mar 2006 03:24:15 -0500 Subject: 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 --- apply.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'apply.c') diff --git a/apply.c b/apply.c index c369966867..849a8b4485 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; } -- cgit v1.2.3