Make git-update-index a builtin

Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Makefile b/Makefile
index 2e093af6ae4afa7f296783f3bd37c1f89e92c5e0..915f130306e5a1018ea12bdbdfde779c837ee0f1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -157,7 +157,7 @@ PROGRAMS = \
        git-send-pack$X git-shell$X \
        git-show-index$X git-ssh-fetch$X \
        git-ssh-upload$X git-unpack-file$X \
-       git-unpack-objects$X git-update-index$X git-update-server-info$X \
+       git-unpack-objects$X git-update-server-info$X \
        git-upload-pack$X git-verify-pack$X \
        git-update-ref$X git-symbolic-ref$X \
        git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \
@@ -170,7 +170,7 @@ BUILT_INS = git-log$X git-whatchanged$X git-show$X \
        git-init-db$X git-tar-tree$X git-upload-tar$X git-format-patch$X \
        git-ls-files$X git-ls-tree$X git-get-tar-commit-id$X \
        git-read-tree$X git-commit-tree$X git-write-tree$X \
-       git-apply$X git-show-branch$X git-diff-files$X \
+       git-apply$X git-show-branch$X git-diff-files$X git-update-index$X \
        git-diff-index$X git-diff-stages$X git-diff-tree$X git-cat-file$X
 
 # what 'all' will build and 'install' will install, in gitexecdir
@@ -221,7 +221,7 @@ BUILTIN_OBJS = \
        builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o \
        builtin-grep.o builtin-add.o builtin-rev-list.o builtin-check-ref-format.o \
        builtin-rm.o builtin-init-db.o builtin-rev-parse.o \
-       builtin-tar-tree.o builtin-upload-tar.o \
+       builtin-tar-tree.o builtin-upload-tar.o builtin-update-index.o \
        builtin-ls-files.o builtin-ls-tree.o builtin-write-tree.o \
        builtin-read-tree.o builtin-commit-tree.o builtin-mailinfo.o \
        builtin-apply.o builtin-show-branch.o builtin-diff-files.o \

diff --git a/update-index.c b/builtin-update-index.c
similarity index 97%
rename from update-index.c
rename to builtin-update-index.c
index fbccc4a67b95dae4ff5c4f9bb02fc28e8887bc67..325cd0944dd81e1531dd097da3069c46a5321523 100644 (file)
--- a/update-index.c
+++ b/builtin-update-index.c
@@ -8,6 +8,7 @@
 #include "quote.h"
 #include "cache-tree.h"
 #include "tree-walk.h"
+#include "builtin.h"
 
 /*
  * Default to not allowing changes to the list of files. The
@@ -186,8 +187,6 @@ static void chmod_path(int flip, const char *path)
        die("git-update-index: cannot chmod %cx '%s'", flip, path);
 }
 
-static struct lock_file lock_file;
-
 static void update_one(const char *path, const char *prefix, int prefix_length)
 {
        const char *p = prefix_path(prefix, prefix_length, path);
@@ -238,7 +237,7 @@ static void read_index_info(int line_termination)
                 * (2) mode SP type SP sha1          TAB path
                 * The second format is to stuff git-ls-tree output
                 * into the index file.
-                * 
+                *
                 * (3) mode         SP sha1 SP stage TAB path
                 * This format is to put higher order stages into the
                 * index file and matches git-ls-files --stage output.
@@ -477,7 +476,7 @@ static int do_reupdate(int ac, const char **av,
        return 0;
 }
 
-int main(int argc, const char **argv)
+int cmd_update_index(int argc, const char **argv, char **envp)
 {
        int i, newfd, entries, has_errors = 0, line_termination = '\n';
        int allow_options = 1;
@@ -486,12 +485,16 @@ int main(int argc, const char **argv)
        int prefix_length = prefix ? strlen(prefix) : 0;
        char set_executable_bit = 0;
        unsigned int refresh_flags = 0;
+       struct lock_file *lock_file;
 
        git_config(git_default_config);
 
-       newfd = hold_lock_file_for_update(&lock_file, get_index_file());
+       /* We can't free this memory, it becomes part of a linked list parsed atexit() */
+       lock_file = xmalloc(sizeof(struct lock_file));
+
+       newfd = hold_lock_file_for_update(lock_file, get_index_file());
        if (newfd < 0)
-               die("unable to create new index file");
+               die("unable to create new cachefile");
 
        entries = read_cache();
        if (entries < 0)
@@ -645,9 +648,11 @@ int main(int argc, const char **argv)
  finish:
        if (active_cache_changed) {
                if (write_cache(newfd, active_cache, active_nr) ||
-                   commit_lock_file(&lock_file))
+                   commit_lock_file(lock_file))
                        die("Unable to write new index file");
        }
 
+       rollback_lock_file(lock_file);
+
        return has_errors ? 1 : 0;
 }

diff --git a/builtin.h b/builtin.h
index e50379d45a3b4bc6d57ce17f7d80b5fca2fb5aa4..03ffdc35e7098119592a00fae04d7041f926be86 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -47,6 +47,7 @@ extern int cmd_diff_stages(int argc, const char **argv, char **envp);
 extern int cmd_diff_tree(int argc, const char **argv, char **envp);
 extern int cmd_cat_file(int argc, const char **argv, char **envp);
 extern int cmd_rev_parse(int argc, const char **argv, char **envp);
+extern int cmd_update_index(int argc, const char **argv, char **envp);
 
 extern int cmd_write_tree(int argc, const char **argv, char **envp);
 extern int write_tree(unsigned char *sha1, int missing_ok, const char *prefix);

diff --git a/git.c b/git.c
index f00a07272a4d20ffe02e5580f7a39a2597d1f6ff..28c76412913ed91da14452ae8347687496ab09e9 100644 (file)
--- a/git.c
+++ b/git.c
@@ -182,7 +182,8 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "write-tree", cmd_write_tree },
                { "mailsplit", cmd_mailsplit },
                { "mailinfo", cmd_mailinfo },
-               { "stripspace", cmd_stripspace }
+               { "stripspace", cmd_stripspace },
+               { "update-index", cmd_update_index }
        };
        int i;