X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-add.c;h=febb75ed994b5edc51afc60e2d46483fa9e273f2;hb=73bcf53342f16a66ae4e02ed50a08bd34d846bfb;hp=72d2853176f9c6d8b7c678bce64f5f482c2c5345;hpb=11be42a47632a6f7219d34f5e312aa20ae076142;p=git.git

diff --git a/builtin-add.c b/builtin-add.c
index 72d285317..febb75ed9 100644
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -70,7 +70,6 @@ static void fill_directory(struct dir_struct *dir, const char **pathspec)
 	base = "";
 	if (baselen) {
 		char *common = xmalloc(baselen + 1);
-		common = xmalloc(baselen + 1);
 		memcpy(common, *pathspec, baselen);
 		common[baselen] = 0;
 		path = base = common;
@@ -84,19 +83,16 @@ 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;
 
 	git_config(git_default_config);
 
-	newfd = hold_lock_file_for_update(&lock_file, get_index_file());
-	if (newfd < 0)
-		die("unable to create new index file");
+	newfd = hold_lock_file_for_update(&lock_file, get_index_file(), 1);
 
 	if (read_cache() < 0)
 		die("index file corrupt");
@@ -118,7 +114,7 @@ int cmd_add(int argc, const char **argv, char **envp)
 			verbose = 1;
 			continue;
 		}
-		die(builtin_add_usage);
+		usage(builtin_add_usage);
 	}
 	pathspec = get_pathspec(prefix, argv + i);