Given the recent commit to describe how to use a moderate approach, where some, but not all, gnulib files are checked into version control, I was inspired to re-read the section about the minimalistic approach. Any objections to this patch? Should I add more details on git commands used for creating an initial gnulib submodule, as well as ideas on how to update the submodule to newer gnulib commits?
-- Eric Blake ebl...@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
From 38d0aba0f3a4bea3534ac91cc740f55e3542fb0d Mon Sep 17 00:00:00 2001
From: Eric Blake <ebl...@redhat.com>
Date: Mon, 8 Mar 2010 14:26:11 -0700
Subject: [PATCH] gnulib-tool.texi: mention possibility of git submodule
* doc/gnulib-tool.texi (VCS Issues): Add paragraph about using git
submodules.
Signed-off-by: Eric Blake <ebl...@redhat.com>
---
ChangeLog | 6 ++++++
doc/gnulib-tool.texi | 9 ++++++++-
2 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 25a771a..a81fb36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-08 Eric Blake <ebl...@redhat.com>
+
+ gnulib-tool.texi: mention possibility of git submodule
+ * doc/gnulib-tool.texi (VCS Issues): Add paragraph about using git
+ submodules.
+
2010-03-08 Karl Berry <k...@gnu.org>
* doc/gnulib-tool.texi (VCS Issues): Mention third option
diff --git a/doc/gnulib-tool.texi b/doc/gnulib-tool.texi
index 1c39659..5d3d5db 100644
--- a/doc/gnulib-tool.texi
+++ b/doc/gnulib-tool.texi
@@ -578,7 +578,7 @@ VCS Issues
are added into the VCS. The only file that must be added to the VCS
is @file{gnulib-cache.m4} in the M4 macros directory. Also, the
script for restoring files not in the VCS, customarily called
-...@file{autogen.sh} or @file{bootstrap.sh}, will typically contain the
+...@file{autogen.sh} or @file{bootstrap}, will typically contain the
statement for restoring the omitted files:
@smallexample
@@ -590,6 +590,13 @@ VCS Issues
Also it does not report in the ChangeLogs the files that it had to add
because they were missing.
+Gnulib includes the file @file{build-aux/bootstrap} to aid a developer
+in using this setup. Furthermore, in projects that use git for
+version control, it is possible to use a git submodule containing the
+precise commit of the gnulib repository, so that each developer
+running @file{bootstrap} will get the same version of all
+gnulib-provided files.
+
@item
Some projects take a ``middle road'': they do commit Gnulib source
files as in the first approach, but they do not commit other derived
--
1.6.6.1
signature.asc
Description: OpenPGP digital signature
