Builtin git-rev-parse.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Makefile b/Makefile
index b6fce394e9905af9a137f13fc5af6b300f7f2b7a..004c2169c97c167ada9c8da68aad3998b61501ea 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -154,8 +154,7 @@ PROGRAMS = \
        git-hash-object$X git-index-pack$X git-local-fetch$X \
        git-mailinfo$X git-merge-base$X \
        git-merge-index$X git-mktag$X git-mktree$X git-pack-objects$X git-patch-id$X \
-       git-peek-remote$X git-prune-packed$X \
-       git-receive-pack$X git-rev-parse$X \
+       git-peek-remote$X git-prune-packed$X git-receive-pack$X \
        git-send-pack$X git-shell$X \
        git-show-index$X git-ssh-fetch$X \
        git-ssh-upload$X git-unpack-file$X \
@@ -168,7 +167,7 @@ PROGRAMS = \
 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-add$X git-rm$X git-rev-list$X \
-       git-check-ref-format$X \
+       git-check-ref-format$X git-rev-parse$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-read-tree$X git-commit-tree$X \
@@ -222,7 +221,7 @@ LIB_OBJS = \
 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-rm.o builtin-init-db.o builtin-rev-parse.o \
        builtin-tar-tree.o builtin-upload-tar.o \
        builtin-ls-files.o builtin-ls-tree.o \
        builtin-read-tree.o builtin-commit-tree.o \

diff --git a/rev-parse.c b/builtin-rev-parse.c
similarity index 98%
rename from rev-parse.c
rename to builtin-rev-parse.c
index 4e2d9fbdf6f86e5d2ff28984861d443ca4cdc656..c353a481b0c8590689c38b46525dc3217b15efbe 100644 (file)
--- a/rev-parse.c
+++ b/builtin-rev-parse.c
@@ -7,6 +7,7 @@
 #include "commit.h"
 #include "refs.h"
 #include "quote.h"
+#include "builtin.h"
 
 #define DO_REVS                1
 #define DO_NOREV       2
@@ -163,7 +164,7 @@ static int show_file(const char *arg)
        return 0;
 }
 
-int main(int argc, char **argv)
+int cmd_rev_parse(int argc, const char **argv, char **envp)
 {
        int i, as_is = 0, verify = 0;
        unsigned char sha1[20];

diff --git a/builtin.h b/builtin.h
index 738ec3d9453886b1b011b5e01e9ac71b25d8f06f..ffa9340c37702e2fdc9e1484290ee0751b8e5922 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -43,5 +43,6 @@ extern int cmd_diff_index(int argc, const char **argv, char **envp);
 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);
 
 #endif

diff --git a/git.c b/git.c
index 10ea934bcf3271797e7087e909978d1b4d3a0ea5..bc463c98eac42125c68a380614ec1779e5e81b93 100644 (file)
--- a/git.c
+++ b/git.c
@@ -69,7 +69,8 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "diff-index", cmd_diff_index },
                { "diff-stages", cmd_diff_stages },
                { "diff-tree", cmd_diff_tree },
-               { "cat-file", cmd_cat_file }
+               { "cat-file", cmd_cat_file },
+               { "rev-parse", cmd_rev_parse }
        };
        int i;