X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=unpack-trees.c;h=62276d4fef5f67e7147377f16e24e30abca0906a;hb=fa364ad790ae0a778ba14b5e5fc9fe910ab4b67e;hp=50189909b86d6ab48a0aa15893f5b66c2e9ce613;hpb=fe3ec21fb03e7d02d00fc845e7a7d3e692bb67a2;p=thirdparty%2Fgit.git diff --git a/unpack-trees.c b/unpack-trees.c index 50189909b8..62276d4fef 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -315,7 +315,7 @@ static struct progress *get_progress(struct unpack_trees_options *o) total++; } - return start_delayed_progress(_("Checking out files"), total); + return start_delayed_progress(_("Updating files"), total); } static void setup_collided_checkout_detection(struct checkout *state, @@ -840,7 +840,7 @@ static int traverse_trees_recursive(int n, unsigned long dirmask, const struct object_id *oid = NULL; if (dirmask & 1) oid = &names[i].oid; - buf[nr_buf++] = fill_tree_descriptor(t + i, oid); + buf[nr_buf++] = fill_tree_descriptor(the_repository, t + i, oid); } }