Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Fix read-tree --prefix=dir/.
[gitweb.git]
/
builtin-read-tree.c
diff --git
a/builtin-read-tree.c
b/builtin-read-tree.c
index 793eae0a5f4cc3d21788a3642f156410ce1ad89d..5fb84b81a7fd239141c83df1d5e3582a65543984 100644
(file)
--- 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) {