bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] Put "/" at end of .gitignore directory names


From: Paul Eggert
Subject: [PATCH] Put "/" at end of .gitignore directory names
Date: Tue, 6 Jun 2023 14:24:47 -0700

* build-aux/bootstrap: Regenerate.
* top/bootstrap-funclib.sh (symlink_to_dir, autogen):
Put slashes after .gitignore entries that name directories.
---
 ChangeLog                | 7 +++++++
 build-aux/bootstrap      | 8 ++++----
 top/bootstrap-funclib.sh | 6 +++---
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cb885ba9a2..2aa6726537 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-06-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Put "/" at end of .gitignore directory names
+       * build-aux/bootstrap: Regenerate.
+       * top/bootstrap-funclib.sh (symlink_to_dir, autogen):
+       Put slashes after .gitignore entries that name directories.
+
 2023-06-06  Jose E. Marchesi  <jemarch@gnu.org>
 
        maintainer-makefile: Enforce the GNU Coding Standards in the README.
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 4645ffe04c..8c68e96d43 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -37,7 +37,7 @@ medir=`dirname "$me"`
 
 # A library of shell functions for autopull.sh, autogen.sh, and bootstrap.
 
-scriptlibversion=2023-03-09.17; # UTC
+scriptlibversion=2023-06-06.21; # UTC
 
 # Copyright (C) 2003-2023 Free Software Foundation, Inc.
 #
@@ -340,7 +340,7 @@ check_versions() {
     # Handle the still-experimental Automake-NG programs specially.
     # They remain named as the mainstream Automake programs ("automake",
     # and "aclocal") to avoid gratuitous incompatibilities with
-    # preexisting uses (by, say, autoreconf, or custom autogen.sh
+    # pre-existing usages (by, say, autoreconf, or custom autogen.sh
     # scripts), but correctly identify themselves (as being part of
     # "GNU automake-ng") when asked their version.
     case $app in
@@ -978,7 +978,7 @@ symlink_to_dir()
       for dot_ig in x $vc_ignore; do
         test $dot_ig = x && continue
         ig=$parent/$dot_ig
-        insert_vc_ignore $ig "${dst_dir##*/}"
+        insert_vc_ignore $ig "${dst_dir##*/}/"
       done
     fi
 
@@ -1104,7 +1104,7 @@ autogen()
     mkdir $build_aux
     for dot_ig in x $vc_ignore; do
       test $dot_ig = x && continue
-      insert_vc_ignore $dot_ig $build_aux
+      insert_vc_ignore $dot_ig $build_aux/
     done
   fi
 
diff --git a/top/bootstrap-funclib.sh b/top/bootstrap-funclib.sh
index 640f0e2ecc..1d22eed7cc 100644
--- a/top/bootstrap-funclib.sh
+++ b/top/bootstrap-funclib.sh
@@ -1,6 +1,6 @@
 # A library of shell functions for autopull.sh, autogen.sh, and bootstrap.
 
-scriptlibversion=2023-03-09.17; # UTC
+scriptlibversion=2023-06-06.21; # UTC
 
 # Copyright (C) 2003-2023 Free Software Foundation, Inc.
 #
@@ -941,7 +941,7 @@ symlink_to_dir()
       for dot_ig in x $vc_ignore; do
         test $dot_ig = x && continue
         ig=$parent/$dot_ig
-        insert_vc_ignore $ig "${dst_dir##*/}"
+        insert_vc_ignore $ig "${dst_dir##*/}/"
       done
     fi
 
@@ -1067,7 +1067,7 @@ autogen()
     mkdir $build_aux
     for dot_ig in x $vc_ignore; do
       test $dot_ig = x && continue
-      insert_vc_ignore $dot_ig $build_aux
+      insert_vc_ignore $dot_ig $build_aux/
     done
   fi
 
-- 
2.40.1




reply via email to

[Prev in Thread] Current Thread [Next in Thread]