summaryrefslogtreecommitdiff
path: root/dir.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-05-08 15:37:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-05-08 15:37:25 (GMT)
commit0b179f3175d1a152b1d22ce8352efda34b258ce2 (patch)
tree9e16191a22ae5cd48da67b0197af2aa94fc45462 /dir.h
parentce2a18f2b1dd71966c00109f3da42df64bb836dd (diff)
parent0daf7ff6c0f877e4b518893b51d44e024fc88fb3 (diff)
downloadgit-0b179f3175d1a152b1d22ce8352efda34b258ce2.zip
git-0b179f3175d1a152b1d22ce8352efda34b258ce2.tar.gz
git-0b179f3175d1a152b1d22ce8352efda34b258ce2.tar.bz2
Merge branch 'nd/sha1-name-c-wo-the-repository'
Further code clean-up to allow the lowest level of name-to-object mapping layer to work with a passed-in repository other than the default one. * nd/sha1-name-c-wo-the-repository: (34 commits) sha1-name.c: remove the_repo from get_oid_mb() sha1-name.c: remove the_repo from other get_oid_* sha1-name.c: remove the_repo from maybe_die_on_misspelt_object_name submodule-config.c: use repo_get_oid for reading .gitmodules sha1-name.c: add repo_get_oid() sha1-name.c: remove the_repo from get_oid_with_context_1() sha1-name.c: remove the_repo from resolve_relative_path() sha1-name.c: remove the_repo from diagnose_invalid_index_path() sha1-name.c: remove the_repo from handle_one_ref() sha1-name.c: remove the_repo from get_oid_1() sha1-name.c: remove the_repo from get_oid_basic() sha1-name.c: remove the_repo from get_describe_name() sha1-name.c: remove the_repo from get_oid_oneline() sha1-name.c: add repo_interpret_branch_name() sha1-name.c: remove the_repo from interpret_branch_mark() sha1-name.c: remove the_repo from interpret_nth_prior_checkout() sha1-name.c: remove the_repo from get_short_oid() sha1-name.c: add repo_for_each_abbrev() sha1-name.c: store and use repo in struct disambiguate_state sha1-name.c: add repo_find_unique_abbrev_r() ...
Diffstat (limited to 'dir.h')
-rw-r--r--dir.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/dir.h b/dir.h
index 823bae6..c23313b 100644
--- a/dir.h
+++ b/dir.h
@@ -269,7 +269,9 @@ extern void add_exclude(const char *string, const char *base,
int baselen, struct exclude_list *el, int srcpos);
extern void clear_exclude_list(struct exclude_list *el);
extern void clear_directory(struct dir_struct *dir);
-extern int file_exists(const char *);
+
+int repo_file_exists(struct repository *repo, const char *path);
+int file_exists(const char *);
extern int is_inside_dir(const char *dir);
extern int dir_inside_of(const char *subdir, const char *dir);