working from subdirectory: preparation

- prefix_filename() is like prefix_path() but can be used to
name any file on the filesystem, not the files that might go
into the index file.

- setup_git_directory_gently() tries to find the GIT_DIR, but does
not die() if called outside a git repository.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/cache.h b/cache.h
index 634b5aa69cddc412af74da94991bee96101e2701..f9b367f3142b9841a737b0738bb2a422922885ce 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -147,8 +147,10 @@ extern char *get_graft_file(void);
 #define ALTERNATE_DB_ENVIRONMENT "GIT_ALTERNATE_OBJECT_DIRECTORIES"
 
 extern const char **get_pathspec(const char *prefix, const char **pathspec);
 #define ALTERNATE_DB_ENVIRONMENT "GIT_ALTERNATE_OBJECT_DIRECTORIES"
 
 extern const char **get_pathspec(const char *prefix, const char **pathspec);

+extern const char *setup_git_directory_gently(int *);

 extern const char *setup_git_directory(void);
 extern const char *prefix_path(const char *prefix, int len, const char *path);
 extern const char *setup_git_directory(void);
 extern const char *prefix_path(const char *prefix, int len, const char *path);

+extern const char *prefix_filename(const char *prefix, int len, const char *path);

 
 #define alloc_nr(x) (((x)+16)*3/2)
 
 
 #define alloc_nr(x) (((x)+16)*3/2)
 

diff --git a/setup.c b/setup.c
index cc44a724bf3220de1cb8a3ef818e581905d7265c..bde590f7cc8ce3a6b218d22c81497da1159ac825 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -47,6 +47,21 @@ const char *prefix_path(const char *prefix, int len, const char *path)
        return path;
 }
 
        return path;
 }
 

+/* 
+ * Unlike prefix_path, this should be used if the named file does
+ * not have to interact with index entry; i.e. name of a random file
+ * on the filesystem.
+ */
+const char *prefix_filename(const char *pfx, int pfx_len, const char *arg)
+{
+       static char path[PATH_MAX];
+       if (!pfx || !*pfx || arg[0] == '/')
+               return arg;
+       memcpy(path, pfx, pfx_len);
+       strcpy(path + pfx_len, arg);
+       return path;
+}
+

 const char **get_pathspec(const char *prefix, const char **pathspec)
 {
        const char *entry = *pathspec;
 const char **get_pathspec(const char *prefix, const char **pathspec)
 {
        const char *entry = *pathspec;


@@ -92,7 +107,7 @@ static int is_toplevel_directory(void)
        return 1;
 }
 
        return 1;
 }
 

-static const char *setup_git_directory_1(void)
+const char *setup_git_directory_gently(int *nongit_ok)

 {
        static char cwd[PATH_MAX+1];
        int len, offset;
 {
        static char cwd[PATH_MAX+1];
        int len, offset;


@@ -139,8 +154,15 @@ static const char *setup_git_directory_1(void)
                        break;
                chdir("..");
                do {
                        break;
                chdir("..");
                do {

-                       if (!offset)
+                       if (!offset) {
+                               if (nongit_ok) {
+                                       if (chdir(cwd))
+                                               die("Cannot come back to cwd");
+                                       *nongit_ok = 1;
+                                       return NULL;
+                               }

                                die("Not a git repository");
                                die("Not a git repository");

+                       }

                } while (cwd[--offset] != '/');
        }
 
                } while (cwd[--offset] != '/');
        }
 


@@ -172,7 +194,7 @@ int check_repository_format(void)
 
 const char *setup_git_directory(void)
 {
 
 const char *setup_git_directory(void)
 {

-       const char *retval = setup_git_directory_1();
+       const char *retval = setup_git_directory_gently(NULL);

        check_repository_format();
        return retval;
 }
        check_repository_format();
        return retval;
 }