hooks: simplify handle_hook_replacement()

Now that we don't skip the post-index-change hook, we don't need to pass
the return value as an out-parameter in this method.

Signed-off-by: Derrick Stolee <[email protected]>

Author: derrickstolee

hook.c

@@ -236,13 +236,11 @@ static int post_index_change_sentinel_exists(struct repository *r)
 /**
  * See if we can replace the requested hook with an internal behavior.
  * Returns 0 if the real hook should run. Returns nonzero if we instead
- * executed custom internal behavior and the value to return is set to
- * 'result'.
+ * executed custom internal behavior and the real hook should not run.
  */
 static int handle_hook_replacement(struct repository *r,
 				   const char *hook_name,
-				   struct strvec *args,
-				   int *result)
+				   struct strvec *args)
 {
 	const char *strval;
 	if (repo_config_get_string_tmp(r, "postcommand.strategy", &strval) ||
@@ -252,17 +250,14 @@ static int handle_hook_replacement(struct repository *r,
 	if (!strcmp(hook_name, "post-index-change")) {
 		/* Create a sentinel file only if the worktree changed. */
 		if (!strcmp(args->v[0], "1"))
-			*result = write_post_index_change_sentinel(r);
-		else
-			*result = 0;
+			write_post_index_change_sentinel(r);
 
 		/* We don't skip post-index-change hooks that exist. */
 		return 0;
 	}
 	if (!strcmp(hook_name, "post-command") &&
 	    !post_index_change_sentinel_exists(r)) {
 		/* We skip the post-command hook in this case. */
-		*result = 0;
 		return 1;
 	}
 
@@ -295,12 +290,9 @@ int run_hooks_opt(struct repository *r, const char *hook_name,
 	};
 
 	/* Interject hook behavior depending on strategy. */
-	if (r && r->gitdir) {
-		int result = 0;
-		if (handle_hook_replacement(r, hook_name,
-					    &options->args, &result))
-			return result;
-	}
+	if (r && r->gitdir &&
+	    handle_hook_replacement(r, hook_name, &options->args))
+		return 0;
 
 	hook_path = find_hook(r, hook_name);