From: Jim Meyering <jim@meyering.net>
Date: Fri, 20 Oct 2006 10:08:05 +0000 (+0000)
Subject: * bootstrap: Add names to each .gitignore file (if it exists)
X-Git-Tag: COREUTILS-6_4~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d8af1248d16cdddae65e74a1ebf181e38aa2be1;p=thirdparty%2Fcoreutils.git

* bootstrap: Add names to each .gitignore file (if it exists)
as well as to .cvsignore.
---

diff --git a/ChangeLog b/ChangeLog
index 8c53ca0c1e..6a759e233a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-10-19  Jim Meyering  <jim@meyering.net>
 
+	* bootstrap: Add names to each .gitignore file (if it exists)
+	as well as to .cvsignore.
+
 	* Makefile.maint (po-check): This rule didn't detect the new use
 	of "gettext" (as opposed to the use of "_" everywhere else) in
 	lib/xstrtol.h.  Adjust the grep regexp so that now it does.
diff --git a/bootstrap b/bootstrap
index 07f2460a94..a5065aaa46 100755
--- a/bootstrap
+++ b/bootstrap
@@ -389,11 +389,13 @@ slurp() {
       fi || exit
     done
 
-    ig=$dir/.cvsignore
-    if test -n "$copied" && test -f $ig; then
-      echo "$copied" | sort -u - $ig | cmp -s - $ig ||
-      echo "$copied" | sort -u - $ig -o $ig || exit
-    fi
+    for dot_ig in .cvsignore .gitignore; do
+      ig=$dir/$dot_ig
+      if test -n "$copied" && test -f $ig; then
+	echo "$copied" | sort -u - $ig | cmp -s - $ig ||
+	echo "$copied" | sort -u - $ig -o $ig || exit
+      fi
+    done
   done
 }