summaryrefslogtreecommitdiff
path: root/builtin-add.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-07-29 01:54:54 -0700
committerJunio C Hamano <junkio@cox.net>2006-07-29 01:54:54 -0700
commit7061cf0f205e86613c3a3306fdfedf2a5dcc8a65 (patch)
treee0595e44fc820032fd5ee942a031439f2e6da3b1 /builtin-add.c
parentac64a722072bb348476a8a029de9a82073e07fba (diff)
parenta633fca0c056aa221d23493c276d3713191621b3 (diff)
downloadgit-7061cf0f205e86613c3a3306fdfedf2a5dcc8a65.tar.gz
Merge branch 'lt/setup' into __/setup-n-mv
This merges the new built-in calling convention code into Johannes's builtin-mv topic in order to resolve their conflicts early on. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-add.c')
-rw-r--r--builtin-add.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin-add.c b/builtin-add.c
index 72d2853176..f548b8007d 100644
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -84,11 +84,10 @@ static void fill_directory(struct dir_struct *dir, const char **pathspec)
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;