Fix read-tree --prefix=dir/.

Junio C Hamano · Junio C Hamano · commit 2960a1d9eef8 · 2007-04-04T00:19:29.000-07:00
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 &lt;junkio@cox.net&gt;
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -228,6 +228,7 @@ int cmd_read_tree(int argc, const char *argv, const char unused_prefix)`
`228`	`228`	`if (0 <= pos)`
`229`	`229`	`die("file '%.*s' already exists.",`
`230`	`230`	`pfxlen-1, opts.prefix);`
	`231`	`+ opts.pos = -1 - pos;`
`231`	`232`	`}`
`232`	`233`
`233`	`234`	`if (opts.merge) {`