undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tf/cleanup-builtin-help-headers'

Browse Source 
* tf/cleanup-builtin-help-headers:
  builtin.h: Move two functions definitions to help.h.
This commit is contained in:
Junio C Hamano 2010-09-08 09:17:01 -07:00
commit 154adcf9c0
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin.h
View File

@ -11,8 +11,6 @@ extern const char git_version_string[];
extern const char git_usage_string[]; extern const char git_usage_string[];
extern const char git_more_info_string[]; extern const char git_more_info_string[];
extern void list_common_cmds_help(void);
extern const char *help_unknown_cmd(const char *cmd);
extern void prune_packed_objects(int); extern void prune_packed_objects(int);
extern int fmt_merge_msg(int merge_summary, struct strbuf *in, extern int fmt_merge_msg(int merge_summary, struct strbuf *in,
struct strbuf *out); struct strbuf *out);

3
git.c
View File

@ -1,6 +1,7 @@
#include "builtin.h" #include "builtin.h"
#include "exec_cmd.h"
#include "cache.h" #include "cache.h"
#include "exec_cmd.h"
#include "help.h"
#include "quote.h" #include "quote.h"
#include "run-command.h" #include "run-command.h"

13
help.h
View File

@ -16,14 +16,17 @@ static inline void mput_char(char c, unsigned int num)
putchar(c); putchar(c);
} }
void load_command_list(const char *prefix, extern void list_common_cmds_help(void);
extern const char *help_unknown_cmd(const char *cmd);
extern void load_command_list(const char *prefix,
struct cmdnames *main_cmds, struct cmdnames *main_cmds,
struct cmdnames *other_cmds); struct cmdnames *other_cmds);
void add_cmdname(struct cmdnames *cmds, const char *name, int len); extern void add_cmdname(struct cmdnames *cmds, const char *name, int len);
/* Here we require that excludes is a sorted list. */ /* Here we require that excludes is a sorted list. */
void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes); extern void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes);
int is_in_cmdlist(struct cmdnames *c, const char *s); extern int is_in_cmdlist(struct cmdnames *cmds, const char *name);
void list_commands(const char *title, struct cmdnames *main_cmds, extern void list_commands(const char *title,
struct cmdnames *main_cmds,
struct cmdnames *other_cmds); struct cmdnames *other_cmds);
#endif /* HELP_H */ #endif /* HELP_H */