[PATCH] Make is_gitfile a non-static generic function
- From
Phil Hord <hordp@cisco.com>
- Date
- Oct 11, 2011, 22:52 UTC
- Message-ID
- <4E94C8AB.3040807@cisco.com>
- In-Reply-To
- <4E94C70E.3080003@cisco.com>
The new is_gitfile is an amalgam of similar functional checks from different places in the code. All these places do slightly different checks on the suspect gitfile (for their own good reasons). But the lack of common code leads to bugs and maintenance problems. Help move the code forward by making is_gitfile() a common function that everyone can use for this purpose.
Signed-off-by: Phil Hord <hordp@cisco.com> ---
I'm not sure this function belongs in transport.c anymore, but I left it here to minimize conflicts. I think a better home would be path.c, but maybe not. If someone has a preference, please let me know.
builtin/clone.c | 8 +------- cache.h | 1 + transport.c | 6 +++++- 3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/builtin/clone.c b/builtin/clone.c index 488f48e..5110399 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -120,13 +120,7 @@ static char *get_repo_path(const char *repo, int *is_bundle) return xstrdup(absolute_path(path)); } else if (S_ISREG(st.st_mode) && st.st_size > 8) { /* Is it a "gitfile"? */ - char signature[8]; - int len, fd = open(path, O_RDONLY); - if (fd < 0) - continue; - len = read_in_full(fd, signature, 8); - close(fd); - if (len != 8 || strncmp(signature, "gitdir: ", 8)) + if (!is_gitfile(path)) continue; path = read_gitfile(path); if (path) { diff --git a/cache.h b/cache.h index 601f6f6..7a8d9f9 100644 --- a/cache.h +++ b/cache.h @@ -441,6 +441,7 @@ extern const char *get_git_work_tree(void); extern const char *read_gitfile(const char *path); extern const char *resolve_gitdir(const char *suspect); extern void set_git_work_tree(const char *tree); +extern int is_gitfile(const char *path); #define ALTERNATE_DB_ENVIRONMENT "GIT_ALTERNATE_OBJECT_DIRECTORIES" diff --git a/transport.c b/transport.c index f3195c0..d08a826 100644 --- a/transport.c +++ b/transport.c @@ -859,7 +859,11 @@ static int is_local(const char *url) has_dos_drive_prefix(url); } -static int is_gitfile(const char *url) +/* + * See if the referenced file looks like a 'gitfile'. + * Does not try to determine if the referenced gitdir is actually valid. + */ +int is_gitfile(const char *url) { struct stat st; char buf[9];
-- 1.7.7.334.gfc143d