diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-05-30 02:16:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-30 02:16:40 (GMT) |
| commit | 3c5a78280fa5535050fe83b51cafb9ca51e8d9e8 (patch) | |
| tree | c4872e1654f52d2e5e9c5160479b26c778697074 /submodule.h | |
| parent | 78089b71da60fcf846b2e7029a90db492f1d3a9d (diff) | |
| parent | 08de9151a8a67f29a3a5a36931298237d78ca736 (diff) | |
| download | git-3c5a78280fa5535050fe83b51cafb9ca51e8d9e8.zip git-3c5a78280fa5535050fe83b51cafb9ca51e8d9e8.tar.gz git-3c5a78280fa5535050fe83b51cafb9ca51e8d9e8.tar.bz2 | |
Merge branch 'bw/pathspec-sans-the-index'
Simplify parse_pathspec() codepath and stop it from looking at the
default in-core index.
* bw/pathspec-sans-the-index:
pathspec: convert find_pathspecs_matching_against_index to take an index
pathspec: remove PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP
ls-files: prevent prune_cache from overeagerly pruning submodules
pathspec: remove PATHSPEC_STRIP_SUBMODULE_SLASH_EXPENSIVE flag
submodule: add die_in_unpopulated_submodule function
pathspec: provide a more descriptive die message
Diffstat (limited to 'submodule.h')
| -rw-r--r-- | submodule.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/submodule.h b/submodule.h index 89c2ed2..8fb0f25 100644 --- a/submodule.h +++ b/submodule.h @@ -49,6 +49,10 @@ extern int is_submodule_initialized(const char *path); * Otherwise the return error code is the same as of resolve_gitdir_gently. */ extern int is_submodule_populated_gently(const char *path, int *return_error_code); +extern void die_in_unpopulated_submodule(const struct index_state *istate, + const char *prefix); +extern void die_path_inside_submodule(const struct index_state *istate, + const struct pathspec *ps); 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); |