traverse_trees_recursive(): propagate merge errors up

gitster · gitster · commit 542c264b01ac · 2008-03-10T01:26:23.000-07:00
There were few places where merge errors detected deeper in the call chain
were ignored and not propagated up the callchain to the caller.

Most notably, this caused switching branches with "git checkout" to ignore
a path modified in a work tree are different between the HEAD version and
the commit being switched to, which it internally notices but ignores it,
resulting in an incorrect two-way merge and loss of the change in the work
tree.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/unpack-trees.c b/unpack-trees.c
@@ -144,8 +144,7 @@ int traverse_trees_recursive(int n, unsigned long dirmask, unsigned long df_conf
 			sha1 = names[i].sha1;
 		fill_tree_descriptor(t+i, sha1);
 	}
-	traverse_trees(n, t, &newinfo);
-	return 0;
+	return traverse_trees(n, t, &newinfo);
 }
 
 /*
@@ -306,7 +305,9 @@ static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, str
 			if (src[0])
 				conflicts |= 1;
 		}
-		traverse_trees_recursive(n, dirmask, conflicts, names, info);
+		if (traverse_trees_recursive(n, dirmask, conflicts,
+					     names, info) < 0)
+			return -1;
 		return mask;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -144,8 +144,7 @@ int traverse_trees_recursive(int n, unsigned long dirmask, unsigned long df_conf`
`144`	`144`	`sha1 = names[i].sha1;`
`145`	`145`	`fill_tree_descriptor(t+i, sha1);`
`146`	`146`	`}`
`147`		`- traverse_trees(n, t, &newinfo);`
`148`		`- return 0;`
	`147`	`+ return traverse_trees(n, t, &newinfo);`
`149`	`148`	`}`
`150`	`149`
`151`	`150`	`/*`
`@@ -306,7 +305,9 @@ static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, str`
`306`	`305`	`if (src[0])`
`307`	`306`	`conflicts \|= 1;`
`308`	`307`	`}`
`309`		`- traverse_trees_recursive(n, dirmask, conflicts, names, info);`
	`308`	`+ if (traverse_trees_recursive(n, dirmask, conflicts,`
	`309`	`+ names, info) < 0)`
	`310`	`+ return -1;`
`310`	`311`	`return mask;`
`311`	`312`	`}`
`312`	`313`