read_gitfile_gently(): rename misnamed function to read_gitfile()

The function was not gentle at all to the callers and died without giving
them a chance to deal with possible errors. Rename it to read_gitfile(),
and update all the callers.

As no existing caller needs a true "gently" variant, we do not bother
adding one at this point.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/init-db.c b/builtin/init-db.c
index 025aa47c804e4400cfa16ae8acd8dc2a5175e7c0..d07554c8844a9b7dd3d4ae2b5efe2cbde623e4af 100644 (file)
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -347,7 +347,7 @@ static void separate_git_dir(const char *git_dir)
                const char *src;
 
                if (S_ISREG(st.st_mode))
                const char *src;
 
                if (S_ISREG(st.st_mode))

-                       src = read_gitfile_gently(git_link);
+                       src = read_gitfile(git_link);

                else if (S_ISDIR(st.st_mode))
                        src = git_link;
                else
                else if (S_ISDIR(st.st_mode))
                        src = git_link;
                else

diff --git a/cache.h b/cache.h
index e11cf6ab1c73ac97c94e76e8c8699d55af95b978..1abf71505007a9ca8476e24cf1a097c0d9f8b302 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -420,7 +420,7 @@ extern char *get_index_file(void);
 extern char *get_graft_file(void);
 extern int set_git_dir(const char *path);
 extern const char *get_git_work_tree(void);
 extern char *get_graft_file(void);
 extern int set_git_dir(const char *path);
 extern const char *get_git_work_tree(void);

-extern const char *read_gitfile_gently(const char *path);
+extern const char *read_gitfile(const char *path);

 extern void set_git_work_tree(const char *tree);
 
 #define ALTERNATE_DB_ENVIRONMENT "GIT_ALTERNATE_OBJECT_DIRECTORIES"
 extern void set_git_work_tree(const char *tree);
 
 #define ALTERNATE_DB_ENVIRONMENT "GIT_ALTERNATE_OBJECT_DIRECTORIES"

diff --git a/environment.c b/environment.c
index 94d58fd24413ec1d1a5769029bd5149b609f0d4e..2228c4e9a14ed6b1b936c838b52f66909429d9d2 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -91,7 +91,7 @@ static void setup_git_env(void)
        git_dir = getenv(GIT_DIR_ENVIRONMENT);
        git_dir = git_dir ? xstrdup(git_dir) : NULL;
        if (!git_dir) {
        git_dir = getenv(GIT_DIR_ENVIRONMENT);
        git_dir = git_dir ? xstrdup(git_dir) : NULL;
        if (!git_dir) {

-               git_dir = read_gitfile_gently(DEFAULT_GIT_DIR_ENVIRONMENT);
+               git_dir = read_gitfile(DEFAULT_GIT_DIR_ENVIRONMENT);

                git_dir = git_dir ? xstrdup(git_dir) : NULL;
        }
        if (!git_dir)
                git_dir = git_dir ? xstrdup(git_dir) : NULL;
        }
        if (!git_dir)

diff --git a/path.c b/path.c
index 4d73cc9cd26708b4cb41e86fb319b93f526cb2f2..6f3f5d56c0ed76f50d1aa37646d18ae280f1edbb 100644 (file)
--- a/path.c
+++ b/path.c
@@ -139,7 +139,7 @@ char *git_path_submodule(const char *path, const char *fmt, ...)
                strbuf_addch(&buf, '/');
        strbuf_addstr(&buf, ".git");
 
                strbuf_addch(&buf, '/');
        strbuf_addstr(&buf, ".git");
 

-       git_dir = read_gitfile_gently(buf.buf);
+       git_dir = read_gitfile(buf.buf);

        if (git_dir) {
                strbuf_reset(&buf);
                strbuf_addstr(&buf, git_dir);
        if (git_dir) {
                strbuf_reset(&buf);
                strbuf_addstr(&buf, git_dir);

diff --git a/refs.c b/refs.c
index b10419a69815ef1c005915f3606c992659e60c77..c98c006e7a0270db2ebeb628cacc6027645eb4b2 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -451,7 +451,7 @@ int resolve_gitlink_ref(const char *path, const char *refname, unsigned char *re
        memcpy(gitdir + len, "/.git", 6);
        len += 5;
 
        memcpy(gitdir + len, "/.git", 6);
        len += 5;
 

-       tmp = read_gitfile_gently(gitdir);
+       tmp = read_gitfile(gitdir);

        if (tmp) {
                free(gitdir);
                len = strlen(tmp);
        if (tmp) {
                free(gitdir);
                len = strlen(tmp);

diff --git a/setup.c b/setup.c
index ce87900ce3c68ace0f231827bdda0e9a65ef15b3..1b06db53fc24f1347e2a73bbecb44a059882e898 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -375,7 +375,7 @@ static int check_repository_format_gently(const char *gitdir, int *nongit_ok)
  * Try to read the location of the git directory from the .git file,
  * return path to git directory if found.
  */
  * Try to read the location of the git directory from the .git file,
  * return path to git directory if found.
  */

-const char *read_gitfile_gently(const char *path)
+const char *read_gitfile(const char *path)

 {
        char *buf;
        char *dir;
 {
        char *buf;
        char *dir;


@@ -437,7 +437,7 @@ static const char *setup_explicit_git_dir(const char *gitdirenv,
        if (PATH_MAX - 40 < strlen(gitdirenv))
                die("'$%s' too big", GIT_DIR_ENVIRONMENT);
 
        if (PATH_MAX - 40 < strlen(gitdirenv))
                die("'$%s' too big", GIT_DIR_ENVIRONMENT);
 

-       gitfile = (char*)read_gitfile_gently(gitdirenv);
+       gitfile = (char*)read_gitfile(gitdirenv);

        if (gitfile) {
                gitfile = xstrdup(gitfile);
                gitdirenv = gitfile;
        if (gitfile) {
                gitfile = xstrdup(gitfile);
                gitdirenv = gitfile;


@@ -661,7 +661,7 @@ static const char *setup_git_directory_gently_1(int *nongit_ok)
        if (one_filesystem)
                current_device = get_device_or_die(".", NULL);
        for (;;) {
        if (one_filesystem)
                current_device = get_device_or_die(".", NULL);
        for (;;) {

-               gitfile = (char*)read_gitfile_gently(DEFAULT_GIT_DIR_ENVIRONMENT);
+               gitfile = (char*)read_gitfile(DEFAULT_GIT_DIR_ENVIRONMENT);

                if (gitfile)
                        gitdirenv = gitfile = xstrdup(gitfile);
                else {
                if (gitfile)
                        gitdirenv = gitfile = xstrdup(gitfile);
                else {

diff --git a/submodule.c b/submodule.c
index b6dec70bd1a6b35c8ecc6a1a9953d64bfe6c4510..b8b0326c5090f545ebaf5e26146588e7009eed01 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -32,7 +32,7 @@ static int add_submodule_odb(const char *path)
        const char *git_dir;
 
        strbuf_addf(&objects_directory, "%s/.git", path);
        const char *git_dir;
 
        strbuf_addf(&objects_directory, "%s/.git", path);

-       git_dir = read_gitfile_gently(objects_directory.buf);
+       git_dir = read_gitfile(objects_directory.buf);

        if (git_dir) {
                strbuf_reset(&objects_directory);
                strbuf_addstr(&objects_directory, git_dir);
        if (git_dir) {
                strbuf_reset(&objects_directory);
                strbuf_addstr(&objects_directory, git_dir);


@@ -478,7 +478,7 @@ int fetch_populated_submodules(int num_options, const char **options,
                strbuf_addf(&submodule_path, "%s/%s", work_tree, ce->name);
                strbuf_addf(&submodule_git_dir, "%s/.git", submodule_path.buf);
                strbuf_addf(&submodule_prefix, "%s%s/", prefix, ce->name);
                strbuf_addf(&submodule_path, "%s/%s", work_tree, ce->name);
                strbuf_addf(&submodule_git_dir, "%s/.git", submodule_path.buf);
                strbuf_addf(&submodule_prefix, "%s%s/", prefix, ce->name);

-               git_dir = read_gitfile_gently(submodule_git_dir.buf);
+               git_dir = read_gitfile(submodule_git_dir.buf);

                if (!git_dir)
                        git_dir = submodule_git_dir.buf;
                if (is_directory(git_dir)) {
                if (!git_dir)
                        git_dir = submodule_git_dir.buf;
                if (is_directory(git_dir)) {


@@ -516,7 +516,7 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)
        const char *git_dir;
 
        strbuf_addf(&buf, "%s/.git", path);
        const char *git_dir;
 
        strbuf_addf(&buf, "%s/.git", path);

-       git_dir = read_gitfile_gently(buf.buf);
+       git_dir = read_gitfile(buf.buf);

        if (!git_dir)
                git_dir = buf.buf;
        if (!is_directory(git_dir)) {
        if (!git_dir)
                git_dir = buf.buf;
        if (!is_directory(git_dir)) {