@@ -33,80 +33,80 @@ struct submodule_update_strategy {
33
33
};
34
34
#define SUBMODULE_UPDATE_STRATEGY_INIT {SM_UPDATE_UNSPECIFIED, NULL}
35
35
36
- extern int is_gitmodules_unmerged (const struct index_state * istate );
37
- extern int is_staging_gitmodules_ok (struct index_state * istate );
38
- extern int update_path_in_gitmodules (const char * oldpath , const char * newpath );
39
- extern int remove_path_from_gitmodules (const char * path );
40
- extern void stage_updated_gitmodules (struct index_state * istate );
41
- extern void set_diffopt_flags_from_submodule_config (struct diff_options * ,
42
- const char * path );
43
- extern int git_default_submodule_config (const char * var , const char * value , void * cb );
36
+ int is_gitmodules_unmerged (const struct index_state * istate );
37
+ int is_staging_gitmodules_ok (struct index_state * istate );
38
+ int update_path_in_gitmodules (const char * oldpath , const char * newpath );
39
+ int remove_path_from_gitmodules (const char * path );
40
+ void stage_updated_gitmodules (struct index_state * istate );
41
+ void set_diffopt_flags_from_submodule_config (struct diff_options * ,
42
+ const char * path );
43
+ int git_default_submodule_config (const char * var , const char * value , void * cb );
44
44
45
45
struct option ;
46
46
int option_parse_recurse_submodules_worktree_updater (const struct option * opt ,
47
47
const char * arg , int unset );
48
- extern int is_submodule_active (struct repository * repo , const char * path );
48
+ int is_submodule_active (struct repository * repo , const char * path );
49
49
/*
50
50
* Determine if a submodule has been populated at a given 'path' by checking if
51
51
* the <path>/.git resolves to a valid git repository.
52
52
* If return_error_code is NULL, die on error.
53
53
* Otherwise the return error code is the same as of resolve_gitdir_gently.
54
54
*/
55
- extern int is_submodule_populated_gently (const char * path , int * return_error_code );
56
- extern void die_in_unpopulated_submodule (const struct index_state * istate ,
57
- const char * prefix );
58
- extern void die_path_inside_submodule (const struct index_state * istate ,
59
- const struct pathspec * ps );
60
- extern enum submodule_update_type parse_submodule_update_type (const char * value );
61
- extern int parse_submodule_update_strategy (const char * value ,
62
- struct submodule_update_strategy * dst );
63
- extern const char * submodule_strategy_to_string (const struct submodule_update_strategy * s );
64
- extern void handle_ignore_submodules_arg (struct diff_options * , const char * );
65
- extern void show_submodule_summary (struct diff_options * o , const char * path ,
66
- struct object_id * one , struct object_id * two ,
67
- unsigned dirty_submodule );
68
- extern void show_submodule_inline_diff (struct diff_options * o , const char * path ,
69
- struct object_id * one , struct object_id * two ,
70
- unsigned dirty_submodule );
55
+ int is_submodule_populated_gently (const char * path , int * return_error_code );
56
+ void die_in_unpopulated_submodule (const struct index_state * istate ,
57
+ const char * prefix );
58
+ void die_path_inside_submodule (const struct index_state * istate ,
59
+ const struct pathspec * ps );
60
+ enum submodule_update_type parse_submodule_update_type (const char * value );
61
+ int parse_submodule_update_strategy (const char * value ,
62
+ struct submodule_update_strategy * dst );
63
+ const char * submodule_strategy_to_string (const struct submodule_update_strategy * s );
64
+ void handle_ignore_submodules_arg (struct diff_options * , const char * );
65
+ void show_submodule_summary (struct diff_options * o , const char * path ,
66
+ struct object_id * one , struct object_id * two ,
67
+ unsigned dirty_submodule );
68
+ void show_submodule_inline_diff (struct diff_options * o , const char * path ,
69
+ struct object_id * one , struct object_id * two ,
70
+ unsigned dirty_submodule );
71
71
/* Check if we want to update any submodule.*/
72
- extern int should_update_submodules (void );
72
+ int should_update_submodules (void );
73
73
/*
74
74
* Returns the submodule struct if the given ce entry is a submodule
75
75
* and it should be updated. Returns NULL otherwise.
76
76
*/
77
- extern const struct submodule * submodule_from_ce (const struct cache_entry * ce );
78
- extern void check_for_new_submodule_commits (struct object_id * oid );
79
- extern int fetch_populated_submodules (struct repository * r ,
80
- const struct argv_array * options ,
81
- const char * prefix ,
82
- int command_line_option ,
83
- int default_option ,
84
- int quiet , int max_parallel_jobs );
85
- extern unsigned is_submodule_modified (const char * path , int ignore_untracked );
86
- extern int submodule_uses_gitfile (const char * path );
77
+ const struct submodule * submodule_from_ce (const struct cache_entry * ce );
78
+ void check_for_new_submodule_commits (struct object_id * oid );
79
+ int fetch_populated_submodules (struct repository * r ,
80
+ const struct argv_array * options ,
81
+ const char * prefix ,
82
+ int command_line_option ,
83
+ int default_option ,
84
+ int quiet , int max_parallel_jobs );
85
+ unsigned is_submodule_modified (const char * path , int ignore_untracked );
86
+ int submodule_uses_gitfile (const char * path );
87
87
88
88
#define SUBMODULE_REMOVAL_DIE_ON_ERROR (1<<0)
89
89
#define SUBMODULE_REMOVAL_IGNORE_UNTRACKED (1<<1)
90
90
#define SUBMODULE_REMOVAL_IGNORE_IGNORED_UNTRACKED (1<<2)
91
- extern int bad_to_remove_submodule (const char * path , unsigned flags );
91
+ int bad_to_remove_submodule (const char * path , unsigned flags );
92
92
93
93
int add_submodule_odb (const char * path );
94
94
95
95
/*
96
96
* Checks if there are submodule changes in a..b. If a is the null OID,
97
97
* checks b and all its ancestors instead.
98
98
*/
99
- extern int submodule_touches_in_range (struct object_id * a ,
100
- struct object_id * b );
101
- extern int find_unpushed_submodules (struct oid_array * commits ,
102
- const char * remotes_name ,
103
- struct string_list * needs_pushing );
99
+ int submodule_touches_in_range (struct object_id * a ,
100
+ struct object_id * b );
101
+ int find_unpushed_submodules (struct oid_array * commits ,
102
+ const char * remotes_name ,
103
+ struct string_list * needs_pushing );
104
104
struct refspec ;
105
- extern int push_unpushed_submodules (struct oid_array * commits ,
106
- const struct remote * remote ,
107
- const struct refspec * rs ,
108
- const struct string_list * push_options ,
109
- int dry_run );
105
+ int push_unpushed_submodules (struct oid_array * commits ,
106
+ const struct remote * remote ,
107
+ const struct refspec * rs ,
108
+ const struct string_list * push_options ,
109
+ int dry_run );
110
110
/*
111
111
* Given a submodule path (as in the index), return the repository
112
112
* path of that submodule in 'buf'. Return -1 on error or when the
@@ -116,10 +116,10 @@ int submodule_to_gitdir(struct strbuf *buf, const char *submodule);
116
116
117
117
#define SUBMODULE_MOVE_HEAD_DRY_RUN (1<<0)
118
118
#define SUBMODULE_MOVE_HEAD_FORCE (1<<1)
119
- extern int submodule_move_head (const char * path ,
120
- const char * old ,
121
- const char * new_head ,
122
- unsigned flags );
119
+ int submodule_move_head (const char * path ,
120
+ const char * old ,
121
+ const char * new_head ,
122
+ unsigned flags );
123
123
124
124
void submodule_unset_core_worktree (const struct submodule * sub );
125
125
@@ -128,18 +128,18 @@ void submodule_unset_core_worktree(const struct submodule *sub);
128
128
* a submodule by clearing any repo-specific environment variables, but
129
129
* retaining any config in the environment.
130
130
*/
131
- extern void prepare_submodule_repo_env (struct argv_array * out );
131
+ void prepare_submodule_repo_env (struct argv_array * out );
132
132
133
133
#define ABSORB_GITDIR_RECURSE_SUBMODULES (1<<0)
134
- extern void absorb_git_dir_into_superproject (const char * prefix ,
135
- const char * path ,
136
- unsigned flags );
134
+ void absorb_git_dir_into_superproject (const char * prefix ,
135
+ const char * path ,
136
+ unsigned flags );
137
137
138
138
/*
139
139
* Return the absolute path of the working tree of the superproject, which this
140
140
* project is a submodule of. If this repository is not a submodule of
141
141
* another repository, return NULL.
142
142
*/
143
- extern const char * get_superproject_working_tree (void );
143
+ const char * get_superproject_working_tree (void );
144
144
145
145
#endif
0 commit comments