diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | Util/mkdisttree.sh | 2 | ||||
| -rwxr-xr-x | Util/preconfig | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 9ab97333e..672b9d818 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-06-01 Wayne Davison <wayned@users.sourceforge.net> + + * Util/mkdisttree.sh, Util/preconfig: Tweak find to prune a .git dir. + This allows a .git/cvs dir to exist with a cvs checkout in it. + 2009-06-01 Peter Stephenson <pws@csr.com> * Config/versio.mk: release 4.3.10. @@ -11799,5 +11804,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.4705 $ +* $Revision: 1.4706 $ ***************************************************** diff --git a/Util/mkdisttree.sh b/Util/mkdisttree.sh index 92ded2f18..17b936ed7 100755 --- a/Util/mkdisttree.sh +++ b/Util/mkdisttree.sh @@ -46,7 +46,7 @@ filelist=filelist$$ trap 'rm -f $filelist; rm -rf $disttree; exit 1' 1 2 15 ( cd $sdir_top - find . -name '?*.*' -prune -o -name .distfiles -print + find . -name .git -prune -o -name '?*.*' -prune -o -name .distfiles -print ) > $filelist ( while read dfn; do subdir=`echo $dfn | sed 's,/\.distfiles$,,'` diff --git a/Util/preconfig b/Util/preconfig index 2ad6ed2f3..aa4c93e71 100755 --- a/Util/preconfig +++ b/Util/preconfig @@ -1,6 +1,6 @@ #! /bin/sh -find . -name '?*.*' -prune -o -name .preconfig -print | ( +find . -name .git -prune -o -name '?*.*' -prune -o -name .preconfig -print | ( while read pre; do cmd=`echo $pre | sed 's,^,cd ,;s,/\([^/]*\)$, \&\& ./\1,'` echo >&2 "$cmd" |