From: Paul Eggert Date: Tue, 6 Jun 2023 21:23:39 +0000 (-0700) Subject: Put "/" at end of .gitignore directory names X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=f93e3e14a688c814ad60aa9dcd1234ebea943263;p=gnulib.git 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. --- diff --git a/ChangeLog b/ChangeLog index 131b441e82..df796ee9ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2023-06-06 Paul Eggert + + 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-05 Bruno Haible posix_spawn-internal: Fix a warning (regression 2022-11-20). diff --git a/build-aux/bootstrap b/build-aux/bootstrap index 6d1d22c675..8068d048e6 100755 --- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -3,7 +3,7 @@ # Bootstrap this package from checked-out sources. -scriptversion=2022-12-27.07; # UTC +scriptversion=2023-06-06.21; # UTC # Copyright (C) 2003-2023 Free Software Foundation, Inc. # @@ -976,7 +976,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 @@ -1102,7 +1102,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 9e47e0d861..325ca7ed39 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=2022-12-27.16; # UTC +scriptlibversion=2023-06-06.21; # UTC # Copyright (C) 2003-2023 Free Software Foundation, Inc. # @@ -939,7 +939,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 @@ -1065,7 +1065,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