summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Belfer <rb@github.com>2014-01-30 11:38:59 -0800
committerRussell Belfer <rb@github.com>2014-01-30 11:38:59 -0800
commit25babd02a4151f858a631314364fdca97180f2c5 (patch)
tree5cb1202e40957c541a27a7589dfaa400be605042
parentb794cbcdb638676e593cc8d2ff3394ae21f2a185 (diff)
downloadlibgit2-25babd02a4151f858a631314364fdca97180f2c5.tar.gz
Fix checkout NONE to not remove file
If you are checking out NONE, then don't remove.
-rw-r--r--src/checkout.c2
1 files changed, 1 insertions, 1 deletions
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;