Re: use git-version-gen (was: Re: bison.1 in version control?)

[Joel E. Denny]

On Sun, 20 Jul 2008, Joel E. Denny wrote:

> > > > I had to hack bootstrap to remove the "GNUmakefile" entry that gnulib 
> > > > adds 
> > > > to .gitignore.  It would be better to patch gnulib to add 
> > > > "/GNUmakefile" 
> > > > instead.
> > 
> > Personally, I don't bother with anchored .gitignore entries.  But if you 
> > really 
> > want all of bison's entries to be anchored, I'd raise the issue with Bruno; 
> > he's pretty good about patching gnulib-tool to meet user demands.
> 
> I'll do that.

He fixed it, so I pushed the following.  Thanks.

>From 445b74704f530a8ce77efe7ced935f0189480041 Mon Sep 17 00:00:00 2001
From: Joel E. Denny <address@hidden>
Date: Sat, 2 Aug 2008 15:18:21 -0400
Subject: [PATCH] Update for recent .gitignore fix in Gnulib.

* bootstrap: Back out 2008-07-18 hack now that gnulib-tool creates
anchored .gitignore entries.

diff --git a/bootstrap b/bootstrap
index c3c7748..f92d1cc 100755
--- a/bootstrap
+++ b/bootstrap
@@ -614,12 +614,6 @@ if test -f $mam_template; then
   done
 fi
 
-# FIXME: Gnulib should be patched to add "/" in front of .gitignore entries
-# instead.  Anyway, this hack must be done before invoking autoconf so that
-# build-aux/git-version-gen doesn't think the version is dirty because
-# .gitignore isn't committed.
-grep -v '^GNUmakefile$' .gitignore > .gitignore~ && mv .gitignore~ .gitignore
-
 # Reconfigure, getting other files.
 
 for command in \
-- 
1.5.4.3