summaryrefslogtreecommitdiff
path: root/builtin-checkout.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-20 23:54:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-21 00:07:20 (GMT)
commit6010d2d957fb05838cd3ab887ac261752ff8ff87 (patch)
tree049bfc4f7ff92b6113686ac429b76e66dc9dcad4 /builtin-checkout.c
parentb0030db331141bedfaf02f34a83f18712c0ae011 (diff)
downloadgit-6010d2d957fb05838cd3ab887ac261752ff8ff87.zip
git-6010d2d957fb05838cd3ab887ac261752ff8ff87.tar.gz
git-6010d2d957fb05838cd3ab887ac261752ff8ff87.tar.bz2
checkout: work from a subdirectory
When switching branches from a subdirectory, checkout rewritten in C extracted the toplevel of the tree in there. This should fix it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-checkout.c')
-rw-r--r--builtin-checkout.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c
index 1fc1e56..f51b77a 100644
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -237,7 +237,6 @@ static int merge_working_tree(struct checkout_opts *opts,
topts.dir = xcalloc(1, sizeof(*topts.dir));
topts.dir->show_ignored = 1;
topts.dir->exclude_per_dir = ".gitignore";
- topts.prefix = prefix;
tree = parse_tree_indirect(old->commit->object.sha1);
init_tree_desc(&trees[0], tree->buffer, tree->size);
tree = parse_tree_indirect(new->commit->object.sha1);