summaryrefslogtreecommitdiff
path: root/read-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-03-07 04:58:17 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-07 04:58:17 (GMT)
commit2dcdb4c69737185f0b0e9fe08ba52b95b84f13da (patch)
tree5097e633924587ada62953ac4e6435bf56ed22a2 /read-tree.c
parent3ca1fff6117f971918ee353540f2633e163e6c6b (diff)
parentde84f99c12d1819479116685393afb1ebe99810b (diff)
downloadgit-2dcdb4c69737185f0b0e9fe08ba52b95b84f13da.zip
git-2dcdb4c69737185f0b0e9fe08ba52b95b84f13da.tar.gz
git-2dcdb4c69737185f0b0e9fe08ba52b95b84f13da.tar.bz2
Merge branch 'sp/checkout'
* sp/checkout: Add --temp and --stage=all options to checkout-index.
Diffstat (limited to 'read-tree.c')
-rw-r--r--read-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/read-tree.c b/read-tree.c
index be29b3f..1c3b09b 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -337,7 +337,7 @@ static void check_updates(struct cache_entry **src, int nr)
if (ce->ce_flags & mask) {
ce->ce_flags &= ~mask;
if (update)
- checkout_entry(ce, &state);
+ checkout_entry(ce, &state, NULL);
}
}
if (total) {