From 2960a1d9eef846de9cfd9d6e32d203339d792120 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 2 Apr 2007 12:40:19 -0700 Subject: Fix read-tree --prefix=dir/. The existing code is not wrong per-se, but it started scanning the index from a location that does not match the tree being read, and wasted cycles. Signed-off-by: Junio C Hamano --- builtin-read-tree.c | 1 + 1 file changed, 1 insertion(+) (limited to 'builtin-read-tree.c') diff --git a/builtin-read-tree.c b/builtin-read-tree.c index 793eae0a5f..5fb84b81a7 100644 --- a/builtin-read-tree.c +++ b/builtin-read-tree.c @@ -228,6 +228,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix) if (0 <= pos) die("file '%.*s' already exists.", pfxlen-1, opts.prefix); + opts.pos = -1 - pos; } if (opts.merge) { -- cgit v1.2.3