Make git-check-format-ref 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 6efc8e02752daa49305cb0238a3b37ee4d2b0d79..2149fb8cea5436f1e09b7751f9e4022efbcf58be 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -164,13 +164,13 @@ PROGRAMS = \
        git-ssh-upload$X git-tar-tree$X git-unpack-file$X \
        git-unpack-objects$X git-update-index$X git-update-server-info$X \
        git-upload-pack$X git-verify-pack$X git-write-tree$X \
        git-ssh-upload$X git-tar-tree$X git-unpack-file$X \
        git-unpack-objects$X git-update-index$X git-update-server-info$X \
        git-upload-pack$X git-verify-pack$X git-write-tree$X \

-       git-update-ref$X git-symbolic-ref$X git-check-ref-format$X \
+       git-update-ref$X git-symbolic-ref$X \

        git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \
        git-describe$X git-merge-tree$X git-blame$X git-imap-send$X
 
 BUILT_INS = git-log$X git-whatchanged$X git-show$X \
        git-count-objects$X git-diff$X git-push$X \
        git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \
        git-describe$X git-merge-tree$X git-blame$X git-imap-send$X
 
 BUILT_INS = git-log$X git-whatchanged$X git-show$X \
        git-count-objects$X git-diff$X git-push$X \

-       git-grep$X git-rev-list$X
+       git-grep$X git-rev-list$X git-check-ref-format$X

 
 # what 'all' will build and 'install' will install, in gitexecdir
 ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
 
 # what 'all' will build and 'install' will install, in gitexecdir
 ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)


@@ -218,7 +218,7 @@ LIB_OBJS = \
 
 BUILTIN_OBJS = \
        builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o \
 
 BUILTIN_OBJS = \
        builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o \

-       builtin-grep.o builtin-rev-list.o
+       builtin-grep.o builtin-rev-list.o builtin-check-ref-format.o

 
 GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
 LIBS = $(GITLIBS) -lz
 
 GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
 LIBS = $(GITLIBS) -lz

diff --git a/builtin-check-ref-format.c b/builtin-check-ref-format.c
new file mode 100644 (file)
index 0000000..4a23936
--- /dev/null
+++ b/builtin-check-ref-format.c
@@ -0,0 +1,14 @@
+/*
+ * GIT - The information manager from hell
+ */
+
+#include "cache.h"
+#include "refs.h"
+#include "builtin.h"
+
+int cmd_check_ref_format(int argc, const char **argv, char **envp)
+{
+       if (argc != 2)
+               usage("git check-ref-format refname");
+       return !!check_ref_format(argv[1]);
+}

diff --git a/builtin.h b/builtin.h
index 7dff121520c38de4a6975aaa654432124cef49e0..ff559dec7ed85139394060ee647d260a830a3124 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -25,5 +25,6 @@ extern int cmd_count_objects(int argc, const char **argv, char **envp);
 extern int cmd_push(int argc, const char **argv, char **envp);
 extern int cmd_grep(int argc, const char **argv, char **envp);
 extern int cmd_rev_list(int argc, const char **argv, char **envp);
 extern int cmd_push(int argc, const char **argv, char **envp);
 extern int cmd_grep(int argc, const char **argv, char **envp);
 extern int cmd_rev_list(int argc, const char **argv, char **envp);

+extern int cmd_check_ref_format(int argc, const char **argv, char **envp);

 
 #endif
 
 #endif

diff --git a/check-ref-format.c b/check-ref-format.c
deleted file mode 100644 (file)
index a0adb3d..0000000
--- a/check-ref-format.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * GIT - The information manager from hell
- */
-
-#include "cache.h"
-#include "refs.h"
-
-#include <stdio.h>
-
-int main(int ac, char **av)
-{
-       if (ac != 2)
-               usage("git-check-ref-format refname");
-       if (check_ref_format(av[1]))
-               exit(1);
-       return 0;
-}

diff --git a/git.c b/git.c
index c94e3a531b3f80f79edb0f1c1d89b918ca909a9d..d0650bb4093ac5e9b872feee25119d1cbb7b0d22 100644 (file)
--- a/git.c
+++ b/git.c
@@ -51,6 +51,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "diff", cmd_diff },
                { "grep", cmd_grep },
                { "rev-list", cmd_rev_list },
                { "diff", cmd_diff },
                { "grep", cmd_grep },
                { "rev-list", cmd_rev_list },

+               { "check-ref-format", cmd_check_ref_format }

        };
        int i;
 
        };
        int i;