Merge branch 'nh/http'

diff --git a/read-tree.c b/read-tree.c
index be29b3fe11a370e53d3dce6a43dfccdc0e22ae2c..1c3b09beffdf347af40b385f632d481c99645a33 100644 (file)
--- 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) {