Merge branch 'js/read-tree' into js/c-merge-recursive

[git.git] / builtin-add.c

diff --git a/builtin-add.c b/builtin-add.c
index 3a73a173f729e0ca75e650779773316e8ae3fe98..f548b8007de79d66f7ed3fad0d96bce75c6bbf57 100644 (file)
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -82,52 +82,12 @@ static void fill_directory(struct dir_struct *dir, const char **pathspec)
                prune_directory(dir, pathspec, baselen);
 }
 
-static int add_file_to_index(const char *path, int verbose)
-{
-       int size, namelen;
-       struct stat st;
-       struct cache_entry *ce;
-
-       if (lstat(path, &st))
-               die("%s: unable to stat (%s)", path, strerror(errno));
-
-       if (!S_ISREG(st.st_mode) && !S_ISLNK(st.st_mode))
-               die("%s: can only add regular files or symbolic links", path);
-
-       namelen = strlen(path);
-       size = cache_entry_size(namelen);
-       ce = xcalloc(1, size);
-       memcpy(ce->name, path, namelen);
-       ce->ce_flags = htons(namelen);
-       fill_stat_cache_info(ce, &st);
-
-       ce->ce_mode = create_ce_mode(st.st_mode);
-       if (!trust_executable_bit) {
-               /* If there is an existing entry, pick the mode bits
-                * from it.
-                */
-               int pos = cache_name_pos(path, namelen);
-               if (pos >= 0)
-                       ce->ce_mode = active_cache[pos]->ce_mode;
-       }
-
-       if (index_path(ce->sha1, path, &st, 1))
-               die("unable to index file %s", path);
-       if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD))
-               die("unable to add %s to index",path);
-       if (verbose)
-               printf("add '%s'\n", path);
-       cache_tree_invalidate_path(active_cache_tree, path);
-       return 0;
-}
-
 static struct lock_file lock_file;
 
-int cmd_add(int argc, const char **argv, char **envp)
+int cmd_add(int argc, const char **argv, const char *prefix)
 {
        int i, newfd;
        int verbose = 0, show_only = 0;
-       const char *prefix = setup_git_directory();
        const char **pathspec;
        struct dir_struct dir;
 
@@ -159,7 +119,6 @@ int cmd_add(int argc, const char **argv, char **envp)
                }
                die(builtin_add_usage);
        }
-       git_config(git_default_config);
        pathspec = get_pathspec(prefix, argv + i);
 
        fill_directory(&dir, pathspec);