When gnulib-tool updates a .gitignore or .cvsignore file, it only added
file names so far, never removed file names as it should have. This should
fix it:


2012-08-19  Bruno Haible  <[email protected]>

        gnulib-tool: Remove old file names from .cvsignore, .gitignore.
        * gnulib-tool (func_update_ignorelist): Don't use 'join -v 1' command
        on the list of removed files.

--- gnulib-tool.orig    Sun Aug 19 14:01:41 2012
+++ gnulib-tool Sun Aug 19 14:01:37 2012
@@ -5375,7 +5375,7 @@
             (echo "$dir_added" | sed -e '/^$/d' | LC_ALL=C sort -u \
                | LC_ALL=C join -v 1 - "$tmp"/ignore > "$tmp"/ignore-added
              echo "$dir_removed" | sed -e '/^$/d' | LC_ALL=C sort -u \
-               | LC_ALL=C join -v 1 - "$tmp"/ignore > "$tmp"/ignore-removed
+               > "$tmp"/ignore-removed
             )
             if test -s "$tmp"/ignore-added || test -s "$tmp"/ignore-removed; 
then
               if $doit; then


Reply via email to