From 9370bae2cef351617272aa142fbe4ce039833d13 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Lukas=20Sandstr=C3=B6m?= <lukass@etek.chalmers.se>
Date: Thu, 18 May 2006 14:15:55 +0200
Subject: [PATCH] Make git-check-format-ref a builtin.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 Makefile                   |  6 +++---
 builtin-check-ref-format.c | 14 ++++++++++++++
 builtin.h                  |  1 +
 check-ref-format.c         | 17 -----------------
 git.c                      |  1 +
 5 files changed, 19 insertions(+), 20 deletions(-)
 create mode 100644 builtin-check-ref-format.c
 delete mode 100644 check-ref-format.c

diff --git a/Makefile b/Makefile
index 6efc8e027..2149fb8ce 100644
--- 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-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-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)
@@ -218,7 +218,7 @@ LIB_OBJS = \
 
 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
diff --git a/builtin-check-ref-format.c b/builtin-check-ref-format.c
new file mode 100644
index 000000000..4a23936af
--- /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 7dff12152..ff559dec7 100644
--- 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_check_ref_format(int argc, const char **argv, char **envp);
 
 #endif
diff --git a/check-ref-format.c b/check-ref-format.c
deleted file mode 100644
index a0adb3dcb..000000000
--- 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 c94e3a531..d0650bb40 100644
--- 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 },
+		{ "check-ref-format", cmd_check_ref_format }
 	};
 	int i;
 
-- 
2.30.2