From a9f87fb62cd756b2016092a53e0fe27919ae9561 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 30 Jun 2008 01:44:56 +0200 Subject: [PATCH] Put gnulib-comp.m4 into .cvsignore or .gitignore. --- ChangeLog | 6 ++++++ gnulib-tool | 2 ++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6fd7c07ed1..7a8b2dd862 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-06-29 Bruno Haible + + * gnulib-tool (func_import): Put gnulib-comp.m4 into .cvsignore or + .gitignore. + Reported by Sylvain Beucler . + 2008-06-29 Bruno Haible * doc/gnulib-tool.texi (VCS Issues): Mention --no-vc-files option. diff --git a/gnulib-tool b/gnulib-tool index 989869d07e..9798eaa19f 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -3248,6 +3248,8 @@ func_import () # Update the .cvsignore and .gitignore files. { echo "$added_files" | sed -e '/^$/d' -e 's,\([^/]*\)$,|A|\1,' echo "$removed_files" | sed -e '/^$/d' -e 's,\([^/]*\)$,|R|\1,' + # Treat gnulib-comp.m4 like an added file, even if it already existed. + echo "$m4base/|A|gnulib-comp.m4" } | LC_ALL=C sort -t'|' -k1,1 > "$tmp"/fileset-changes { # Rearrange file descriptors. Needed because "while ... done < ..." # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh. -- 2.30.2