test-lib.sh: introduce test_commit() and test_merge() helpers

diff --git a/run-command.h b/run-command.h
index 4f2b7d7d403ee6d87fea5ba2dc32da7596965e5e..0211e1d471d37a41f77098e8fff8a031fb26cb71 100644 (file)
--- a/run-command.h
+++ b/run-command.h
@@ -49,11 +49,12 @@ int start_command(struct child_process *);
 int finish_command(struct child_process *);
 int run_command(struct child_process *);
 
+extern int run_hook(const char *index_file, const char *name, ...);
+
 #define RUN_COMMAND_NO_STDIN 1
 #define RUN_GIT_CMD         2  /*If this is to be git sub-command */
 #define RUN_COMMAND_STDOUT_TO_STDERR 4
 int run_command_v_opt(const char **argv, int opt);
-int run_command_v_opt_cd(const char **argv, int opt, const char *dir);
 
 /*
  * env (the environment) is to be formatted like environ: "VAR=VALUE".