From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Sep 2017 05:47:52 +0000 (+0900)
Subject: Merge branch 'hn/typofix'
X-Git-Tag: v2.15.0-rc0~47
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8174645831a4b2b0722469d4f360bc97da2e2a6a?ds=inline;hp=-c

Merge branch 'hn/typofix'

* hn/typofix:
submodule.h: typofix
---

8174645831a4b2b0722469d4f360bc97da2e2a6a
diff --combined submodule.h
index 6b52133c88,3c239d1ecf..f0da0277a4
--- a/submodule.h
+++ b/submodule.h
@@@ -33,18 -33,22 +33,18 @@@ struct submodule_update_strategy 
  };
  #define SUBMODULE_UPDATE_STRATEGY_INIT {SM_UPDATE_UNSPECIFIED, NULL}
  
 -extern int is_staging_gitmodules_ok(void);
 +extern int is_gitmodules_unmerged(const struct index_state *istate);
 +extern int is_staging_gitmodules_ok(const struct index_state *istate);
  extern int update_path_in_gitmodules(const char *oldpath, const char *newpath);
  extern int remove_path_from_gitmodules(const char *path);
  extern void stage_updated_gitmodules(void);
  extern void set_diffopt_flags_from_submodule_config(struct diff_options *,
  		const char *path);
 -extern int submodule_config(const char *var, const char *value, void *cb);
  extern int git_default_submodule_config(const char *var, const char *value, void *cb);
  
  struct option;
  int option_parse_recurse_submodules_worktree_updater(const struct option *opt,
  						     const char *arg, int unset);
 -void load_submodule_cache(void);
 -extern void gitmodules_config(void);
 -extern void repo_read_gitmodules(struct repository *repo);
 -extern void gitmodules_config_sha1(const unsigned char *commit_sha1);
  extern int is_submodule_active(struct repository *repo, const char *path);
  /*
   * Determine if a submodule has been populated at a given 'path' by checking if
@@@ -57,17 -61,22 +57,17 @@@ extern void die_in_unpopulated_submodul
  					 const char *prefix);
  extern void die_path_inside_submodule(const struct index_state *istate,
  				      const struct pathspec *ps);
 +extern enum submodule_update_type parse_submodule_update_type(const char *value);
  extern int parse_submodule_update_strategy(const char *value,
  		struct submodule_update_strategy *dst);
  extern const char *submodule_strategy_to_string(const struct submodule_update_strategy *s);
  extern void handle_ignore_submodules_arg(struct diff_options *, const char *);
 -extern void show_submodule_summary(FILE *f, const char *path,
 -		const char *line_prefix,
 +extern void show_submodule_summary(struct diff_options *o, const char *path,
  		struct object_id *one, struct object_id *two,
 -		unsigned dirty_submodule, const char *meta,
 -		const char *del, const char *add, const char *reset);
 -extern void show_submodule_inline_diff(FILE *f, const char *path,
 -		const char *line_prefix,
 +		unsigned dirty_submodule);
 +extern void show_submodule_inline_diff(struct diff_options *o, const char *path,
  		struct object_id *one, struct object_id *two,
 -		unsigned dirty_submodule, const char *meta,
 -		const char *del, const char *add, const char *reset,
 -		const struct diff_options *opt);
 -extern void set_config_fetch_recurse_submodules(int value);
 +		unsigned dirty_submodule);
  /* Check if we want to update any submodule.*/
  extern int should_update_submodules(void);
  /*
@@@ -78,7 -87,6 +78,7 @@@ extern const struct submodule *submodul
  extern void check_for_new_submodule_commits(struct object_id *oid);
  extern int fetch_populated_submodules(const struct argv_array *options,
  			       const char *prefix, int command_line_option,
 +			       int default_option,
  			       int quiet, int max_parallel_jobs);
  extern unsigned is_submodule_modified(const char *path, int ignore_untracked);
  extern int submodule_uses_gitfile(const char *path);
@@@ -104,6 -112,7 +104,6 @@@ extern int push_unpushed_submodules(str
  				    const struct string_list *push_options,
  				    int dry_run);
  extern void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir);
 -extern int parallel_submodules(void);
  /*
   * Given a submodule path (as in the index), return the repository
   * path of that submodule in 'buf'. Return -1 on error or when the
@@@ -120,7 -129,7 +120,7 @@@ extern int submodule_move_head(const ch
  
  /*
   * Prepare the "env_array" parameter of a "struct child_process" for executing
-  * a submodule by clearing any repo-specific envirionment variables, but
+  * a submodule by clearing any repo-specific environment variables, but
   * retaining any config in the environment.
   */
  extern void prepare_submodule_repo_env(struct argv_array *out);