Merge branch 'rs/simplify-transport-get'

diff --git a/exec_cmd.h b/exec_cmd.h
index 307b55cbad460f62edc3a9e6399690e45bdc7b0f..93b0c02529a854af4ccb648ea0d0571c5495b63a 100644 (file)
--- a/exec_cmd.h
+++ b/exec_cmd.h
@@ -7,8 +7,8 @@ extern const char *git_exec_path(void);
 extern void setup_path(void);
 extern const char **prepare_git_cmd(const char **argv);
 extern int execv_git_cmd(const char **argv); /* NULL terminated */
-__attribute__((sentinel))
+LAST_ARG_MUST_BE_NULL
 extern int execl_git_cmd(const char *cmd, ...);
-extern const char *system_path(const char *path);
+extern char *system_path(const char *path);
 
 #endif /* GIT_EXEC_CMD_H */