diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-07 23:52:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-07 23:52:40 -0700 |
| commit | 640ee0d1cd771bf6093602f1beb143d356607446 (patch) | |
| tree | 4beb1f02eadd8fbb8957078ca6c4684e1bb78fb7 /builtin-read-tree.c | |
| parent | 5838dffdcbe92bbbf50a29067fd9dc871155d76d (diff) | |
| parent | c81935348be263de3da085e6ac828b583a85c905 (diff) | |
| download | git-640ee0d1cd771bf6093602f1beb143d356607446.tar.gz | |
Merge branch 'jc/read-tree-df' (early part)
* 'jc/read-tree-df' (early part):
Fix switching to a branch with D/F when current branch has file D.
Fix twoway_merge that passed d/f conflict marker to merged_entry().
Fix read-tree --prefix=dir/.
unpack-trees: get rid of *indpos parameter.
unpack_trees.c: pass unpack_trees_options structure to keep_entry() as well.
add_cache_entry(): removal of file foo does not conflict with foo/bar
Diffstat (limited to 'builtin-read-tree.c')
| -rw-r--r-- | builtin-read-tree.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin-read-tree.c b/builtin-read-tree.c index 213bd93c7f..316fb0f8da 100644 --- a/builtin-read-tree.c +++ b/builtin-read-tree.c @@ -233,6 +233,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) { |