Bruno/all, would you accept a change for an option to avoid updating of
.cvsignore/.gitignore in gnulib-tool?
For purposes of clarity (I hope, anyway), below I merely add the if...fi
with the wrong indentation. In an actual change all the intervening
code would be "changed" since it would all be indented two more spaces.
I'd put something into the doc too.
Thanks,
Karl
2008-03-16 Karl Berry <[EMAIL PROTECTED]>
* gnulib-tool: --no-ignore-files: new option.
(do_ignore_files): new variable, true by default.
(func_import): conditionalize updating of .cvsignore/.gitignore.
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -186,6 +186,7 @@ Options for --import and --update:
for files from the local override directory.
-S, --more-symlinks Make symbolic links instead of copying files, and
don't replace copyright notices.
+ --no-ignore-files Do not update .cvsignore/.gitignore files.
Report bugs to <[email protected]>."
}
@@ -715,6 +716,7 @@ fi
symbolic=
lsymbolic=
do_copyrights=true
+ do_ignore_files=:
supplied_opts="$@"
@@ -919,6 +921,9 @@ fi
symbolic=true
do_copyrights=
shift ;;
+ --no-ignore-files )
+ do_ignore_files=false
+ shift ;;
--help | --hel | --he | --h )
func_usage
func_exit $? ;;
@@ -3145,6 +3150,7 @@ func_import ()
fi
fi
+ if $do_ignore_files; then
# 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,'
@@ -3227,6 +3233,7 @@ func_import ()
func_done_dir "$last_dir" "$last_dir_added" "$last_dir_removed"
exec 0<&5 5<&-
}
+ fi
echo "Finished."
echo
