From: Petr Baudis <pasky@suse.cz>
Date: Sat, 24 Jun 2006 02:34:36 +0000 (+0200)
Subject: Git.pm: Implement Git::version()
X-Git-Tag: v1.4.3-rc1~2^2~50
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=63df97ae7baeedc3ce04995139fa0f6bc5eea76c;p=git.git

Git.pm: Implement Git::version()

Git::version() returns the Git version string.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/Makefile b/Makefile
index 730b38a96..dda9b9dd7 100644
--- a/Makefile
+++ b/Makefile
@@ -610,7 +610,10 @@ $(XDIFF_LIB): $(XDIFF_OBJS)
 
 
 perl/Makefile:	perl/Git.pm perl/Makefile.PL
-	(cd perl && $(PERL_PATH) Makefile.PL PREFIX="$(prefix)" DEFINE="$(ALL_CFLAGS)" LIBS="$(LIBS)")
+	(cd perl && $(PERL_PATH) Makefile.PL \
+		PREFIX="$(prefix)" \
+		DEFINE="$(ALL_CFLAGS) -DGIT_VERSION=\\\"$(GIT_VERSION)\\\"" \
+		LIBS="$(LIBS)")
 
 doc:
 	$(MAKE) -C Documentation all
diff --git a/perl/Git.pm b/perl/Git.pm
index 212337ee5..dcd769b4d 100644
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -48,7 +48,7 @@ require Exporter;
 
 # Methods which can be called as standalone functions as well:
 @EXPORT_OK = qw(command command_oneline command_pipe command_noisy
-                exec_path hash_object);
+                version exec_path hash_object);
 
 
 =head1 DESCRIPTION
@@ -285,6 +285,18 @@ sub command_noisy {
 }
 
 
+=item version ()
+
+Return the Git version in use.
+
+Implementation of this function is very fast; no external command calls
+are involved.
+
+=cut
+
+# Implemented in Git.xs.
+
+
 =item exec_path ()
 
 Return path to the git sub-command executables (the same as
diff --git a/perl/Git.xs b/perl/Git.xs
index 6478f9c77..d4608eb1c 100644
--- a/perl/Git.xs
+++ b/perl/Git.xs
@@ -23,6 +23,16 @@ PROTOTYPES: DISABLE
 # /* TODO: xs_call_gate(). See Git.pm. */
 
 
+const char *
+xs_version()
+CODE:
+{
+	RETVAL = GIT_VERSION;
+}
+OUTPUT:
+	RETVAL
+
+
 const char *
 xs_exec_path()
 CODE: