mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

checkout: make reset_clean_to_new() not die by itself

Browse Source 
Instead, have its error percolate up through the callchain and let it be
the exit status of the main command.  No semantic changes yet.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2008-05-28 14:54:02 -07:00
parent d2b3691b61
commit 84a5750bc5
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
builtin-checkout.c
View File

@ -172,7 +172,7 @@ static int reset_to_new(struct tree *tree, int quiet)
return 0; return 0;
} }
static void reset_clean_to_new(struct tree *tree, int quiet) static int reset_clean_to_new(struct tree *tree, int quiet)
{ {
struct unpack_trees_options opts; struct unpack_trees_options opts;
struct tree_desc tree_desc; struct tree_desc tree_desc;
@ -189,7 +189,8 @@ static void reset_clean_to_new(struct tree *tree, int quiet)
parse_tree(tree); parse_tree(tree);
init_tree_desc(&tree_desc, tree->buffer, tree->size); init_tree_desc(&tree_desc, tree->buffer, tree->size);
if (unpack_trees(1, &tree_desc, &opts)) if (unpack_trees(1, &tree_desc, &opts))
exit(128); return 128;
return 0;
} }
struct checkout_opts { struct checkout_opts {
@ -295,7 +296,9 @@ static int merge_working_tree(struct checkout_opts *opts,
return ret; return ret;
merge_trees(new->commit->tree, work, old->commit->tree, merge_trees(new->commit->tree, work, old->commit->tree,
new->name, "local", &result); new->name, "local", &result);
reset_clean_to_new(new->commit->tree, opts->quiet); ret = reset_clean_to_new(new->commit->tree, opts->quiet);
if (ret)
return ret;
} }
} }