git-svn: check_cherry_pick should exclude commits already in our history

diff --git a/setup.c b/setup.c
index 5fb9c54ba6b21aab62b76602500ae2c408f9216d..a3b76de2bb1c18e2f3b8cdf5799c3c650b16d027 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -360,6 +360,28 @@ static int cwd_contains_git_dir(const char **gitfile_dirp)
        return is_git_directory(DEFAULT_GIT_DIR_ENVIRONMENT);
 }
 
+static const char *setup_discovered_git_dir(const char *work_tree_env,
+               int offset, int len, char *cwd, int *nongit_ok)
+{
+       int root_len;
+
+       inside_git_dir = 0;
+       if (!work_tree_env)
+               inside_work_tree = 1;
+       root_len = offset_1st_component(cwd);
+       git_work_tree_cfg = xstrndup(cwd, offset > root_len ? offset : root_len);
+       if (check_repository_format_gently(nongit_ok))
+               return NULL;
+       if (offset == len)
+               return NULL;
+
+       /* Make "offset" point to past the '/', and add a '/' at the end */
+       offset++;
+       cwd[len++] = '/';
+       cwd[len] = 0;
+       return cwd + offset;
+}
+
 static const char *setup_bare_git_dir(const char *work_tree_env,
                int offset, int len, char *cwd, int *nongit_ok)
 {
@@ -369,6 +391,8 @@ static const char *setup_bare_git_dir(const char *work_tree_env,
        if (!work_tree_env)
                inside_work_tree = 0;
        if (offset != len) {
+               if (chdir(cwd))
+                       die_errno("Cannot come back to cwd");
                root_len = offset_1st_component(cwd);
                cwd[offset > root_len ? offset : root_len] = '\0';
                set_git_dir(cwd);
@@ -402,14 +426,14 @@ static dev_t get_device_or_die(const char *path, const char *prefix)
  * We cannot decide in this function whether we are in the work tree or
  * not, since the config can only be read _after_ this function was called.
  */
-const char *setup_git_directory_gently(int *nongit_ok)
+static const char *setup_git_directory_gently_1(int *nongit_ok)
 {
        const char *work_tree_env = getenv(GIT_WORK_TREE_ENVIRONMENT);
        const char *env_ceiling_dirs = getenv(CEILING_DIRECTORIES_ENVIRONMENT);
        static char cwd[PATH_MAX+1];
        const char *gitdirenv;
        const char *gitfile_dir;
-       int len, offset, ceil_offset, root_len;
+       int len, offset, ceil_offset;
        dev_t current_device = 0;
        int one_filesystem = 1;
 
@@ -454,7 +478,8 @@ const char *setup_git_directory_gently(int *nongit_ok)
                current_device = get_device_or_die(".", NULL);
        for (;;) {
                if (cwd_contains_git_dir(&gitfile_dir))
-                       break;
+                       return setup_discovered_git_dir(work_tree_env, offset,
+                                                       len, cwd, nongit_ok);
                if (is_git_directory("."))
                        return setup_bare_git_dir(work_tree_env, offset,
                                                        len, cwd, nongit_ok);
@@ -480,22 +505,16 @@ const char *setup_git_directory_gently(int *nongit_ok)
                        die_errno("Cannot change to '%s/..'", cwd);
                }
        }
+}
 
-       inside_git_dir = 0;
-       if (!work_tree_env)
-               inside_work_tree = 1;
-       root_len = offset_1st_component(cwd);
-       git_work_tree_cfg = xstrndup(cwd, offset > root_len ? offset : root_len);
-       if (check_repository_format_gently(nongit_ok))
-               return NULL;
-       if (offset == len)
-               return NULL;
+const char *setup_git_directory_gently(int *nongit_ok)
+{
+       const char *prefix;
 
-       /* Make "offset" point to past the '/', and add a '/' at the end */
-       offset++;
-       cwd[len++] = '/';
-       cwd[len] = 0;
-       return cwd + offset;
+       prefix = setup_git_directory_gently_1(nongit_ok);
+       if (startup_info)
+               startup_info->have_repository = !nongit_ok || !*nongit_ok;
+       return prefix;
 }
 
 int git_config_perm(const char *var, const char *value)