undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

read-tree: setup worktree if merge is required

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2008-08-28 20:03:22 +07:00 committed by Junio C Hamano
parent 6577f542b3
commit b6469a81d2
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-read-tree.c
View File

@ -194,6 +194,8 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
usage(read_tree_usage); usage(read_tree_usage);
if ((opts.dir && !opts.update)) if ((opts.dir && !opts.update))
die("--exclude-per-directory is meaningless unless -u"); die("--exclude-per-directory is meaningless unless -u");
if (opts.merge && !opts.index_only)
setup_work_tree();
if (opts.merge) { if (opts.merge) {
if (stage < 2) if (stage < 2)