From 25babd02a4151f858a631314364fdca97180f2c5 Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Thu, 30 Jan 2014 11:38:59 -0800 Subject: [PATCH] Fix checkout NONE to not remove file If you are checking out NONE, then don't remove. --- src/checkout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/checkout.c b/src/checkout.c index 5b1f6cdcc..72fe5368f 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -246,7 +246,7 @@ static int checkout_action_no_wd( *action = CHECKOUT_ACTION_IF(SAFE, UPDATE_BLOB, NONE); break; case GIT_DELTA_DELETED: /* case 8 or 25 */ - *action = CHECKOUT_ACTION__REMOVE; + *action = CHECKOUT_ACTION_IF(SAFE, REMOVE, NONE); break; default: /* impossible */ break;