checkout: make reset_clean_to_new() not die by itself

gitster · gitster · commit 84a5750bc5e5 · 2008-05-28T17:38:21.000-07:00
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 &lt;gitster@pobox.com&gt;
diff --git a/builtin-checkout.c b/builtin-checkout.c
@@ -172,7 +172,7 @@ static int reset_to_new(struct tree *tree, int quiet)
 	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 tree_desc tree_desc;
@@ -189,7 +189,8 @@ static void reset_clean_to_new(struct tree *tree, int quiet)
 	parse_tree(tree);
 	init_tree_desc(&tree_desc, tree->buffer, tree->size);
 	if (unpack_trees(1, &tree_desc, &opts))
-		exit(128);
+		return 128;
+	return 0;
 }
 
 struct checkout_opts {
@@ -295,7 +296,9 @@ static int merge_working_tree(struct checkout_opts *opts,
 				return ret;
 			merge_trees(new->commit->tree, work, old->commit->tree,
 				    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;
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ static int reset_to_new(struct tree *tree, int quiet)`
`172`	`172`	`return 0;`
`173`	`173`	`}`
`174`	`174`
`175`		`-static void reset_clean_to_new(struct tree *tree, int quiet)`
	`175`	`+static int reset_clean_to_new(struct tree *tree, int quiet)`
`176`	`176`	`{`
`177`	`177`	`struct unpack_trees_options opts;`
`178`	`178`	`struct tree_desc tree_desc;`
`@@ -189,7 +189,8 @@ static void reset_clean_to_new(struct tree *tree, int quiet)`
`189`	`189`	`parse_tree(tree);`
`190`	`190`	`init_tree_desc(&tree_desc, tree->buffer, tree->size);`
`191`	`191`	`if (unpack_trees(1, &tree_desc, &opts))`
`192`		`- exit(128);`
	`192`	`+ return 128;`
	`193`	`+ return 0;`
`193`	`194`	`}`
`194`	`195`
`195`	`196`	`struct checkout_opts {`
`@@ -295,7 +296,9 @@ static int merge_working_tree(struct checkout_opts *opts,`
`295`	`296`	`return ret;`
`296`	`297`	`merge_trees(new->commit->tree, work, old->commit->tree,`
`297`	`298`	`new->name, "local", &result);`
`298`		`- reset_clean_to_new(new->commit->tree, opts->quiet);`
	`299`	`+ ret = reset_clean_to_new(new->commit->tree, opts->quiet);`
	`300`	`+ if (ret)`
	`301`	`+ return ret;`
`299`	`302`	`}`
`300`	`303`	`}`
`301`	`304`