unpack-trees: drop unused error_type parameters

peff · gitster · commit df351c6e676e · 2019-03-20T18:34:09.000+09:00
The verify_clean_subdirectory() helper takes an error_type parameter
from the caller, but doesn't actually use it. Instead, when it calls
add_rejected_path() it passes NOT_UPTODATE_DIR, its own custom error
type which is more specific than what the caller provides. Likewise for
verify_clean_submodule(), which always passes WOULD_LOSE_SUBMODULE.

Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/unpack-trees.c b/unpack-trees.c
@@ -1758,7 +1758,6 @@ static void invalidate_ce_path(const struct cache_entry *ce,
  */
 static int verify_clean_submodule(const char *old_sha1,
 				  const struct cache_entry *ce,
-				  enum unpack_trees_error_types error_type,
 				  struct unpack_trees_options *o)
 {
 	if (!submodule_from_ce(ce))
@@ -1769,7 +1768,6 @@ static int verify_clean_submodule(const char *old_sha1,
 }
 
 static int verify_clean_subdirectory(const struct cache_entry *ce,
-				     enum unpack_trees_error_types error_type,
 				     struct unpack_trees_options *o)
 {
 	/*
@@ -1792,7 +1790,7 @@ static int verify_clean_subdirectory(const struct cache_entry *ce,
 		if (!sub_head && oideq(&oid, &ce->oid))
 			return 0;
 		return verify_clean_submodule(sub_head ? NULL : oid_to_hex(&oid),
-					      ce, error_type, o);
+					      ce, o);
 	}
 
 	/*
@@ -1888,7 +1886,7 @@ static int check_ok_to_remove(const char *name, int len, int dtype,
 		 * files that are in "foo/" we would lose
 		 * them.
 		 */
-		if (verify_clean_subdirectory(ce, error_type, o) < 0)
+		if (verify_clean_subdirectory(ce, o) < 0)
 			return -1;
 		return 0;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1758,7 +1758,6 @@ static void invalidate_ce_path(const struct cache_entry *ce,`
`1758`	`1758`	`*/`
`1759`	`1759`	`static int verify_clean_submodule(const char *old_sha1,`
`1760`	`1760`	`const struct cache_entry *ce,`
`1761`		`- enum unpack_trees_error_types error_type,`
`1762`	`1761`	`struct unpack_trees_options *o)`
`1763`	`1762`	`{`
`1764`	`1763`	`if (!submodule_from_ce(ce))`
`@@ -1769,7 +1768,6 @@ static int verify_clean_submodule(const char *old_sha1,`
`1769`	`1768`	`}`
`1770`	`1769`
`1771`	`1770`	`static int verify_clean_subdirectory(const struct cache_entry *ce,`
`1772`		`- enum unpack_trees_error_types error_type,`
`1773`	`1771`	`struct unpack_trees_options *o)`
`1774`	`1772`	`{`
`1775`	`1773`	`/*`
`@@ -1792,7 +1790,7 @@ static int verify_clean_subdirectory(const struct cache_entry *ce,`
`1792`	`1790`	`if (!sub_head && oideq(&oid, &ce->oid))`
`1793`	`1791`	`return 0;`
`1794`	`1792`	`return verify_clean_submodule(sub_head ? NULL : oid_to_hex(&oid),`
`1795`		`- ce, error_type, o);`
	`1793`	`+ ce, o);`
`1796`	`1794`	`}`
`1797`	`1795`
`1798`	`1796`	`/*`
`@@ -1888,7 +1886,7 @@ static int check_ok_to_remove(const char *name, int len, int dtype,`
`1888`	`1886`	`* files that are in "foo/" we would lose`
`1889`	`1887`	`* them.`
`1890`	`1888`	`*/`
`1891`		`- if (verify_clean_subdirectory(ce, error_type, o) < 0)`
	`1889`	`+ if (verify_clean_subdirectory(ce, o) < 0)`
`1892`	`1890`	`return -1;`
`1893`	`1891`	`return 0;`
`1894`	`1892`	`}`