Commit 1aebe991 authored by Paul Eggert's avatar Paul Eggert

Do not require that .git be a directory

Problem reportyed by Phillip Lord.
* admin/update_autogen, autogen.sh, build-aux/gitlog-to-emacslog:
* configure.ac, make-dist:
Do not require that .git be a directory, as 'git worktree' makes
it a file and not a directory.
parent 7d835d8e
......@@ -49,7 +49,7 @@ cd ../
if [ -d .bzr ]; then
vcs=bzr
elif [ -d .git ]; then
elif [ -e .git ]; then
vcs=git
else
die "Cannot determine vcs"
......
......@@ -330,7 +330,7 @@ fi
if test ! -f configure; then
echo "You can now run '$0 autoconf'."
elif test -d .git && test $git_was_ok = false && test $do_git = false; then
elif test -e .git && test $git_was_ok = false && test $do_git = false; then
echo "You can now run '$0 git'."
elif test ! -f config.status ||
test -n "`find src/stamp-h.in -newer config.status`"; then
......
......@@ -68,7 +68,7 @@ if [ -f "$output" ]; then
fi
# If this is not a Git repository, just generate an empty ChangeLog.
test -d .git || {
test -e .git || {
>"$output"
exit
}
......
......@@ -874,11 +874,11 @@ AC_ARG_ENABLE([gcc-warnings],
gl_gcc_warnings=$enableval],
[# By default, use 'warn-only' if it looks like the invoker of 'configure'
# is a developer as opposed to a builder. This is most likely true
# if GCC is recent enough and there is a .git subdirectory;
# if GCC is recent enough and there is a .git directory or file;
# however, if there is also a .tarball-version file it is probably
# just a release imported into Git for patch management.
gl_gcc_warnings=no
test -d "$srcdir"/.git && test ! -f "$srcdir"/.tarball-version &&
test -e "$srcdir"/.git && test ! -f "$srcdir"/.tarball-version &&
gl_GCC_VERSION_IFELSE([5], [3], [gl_gcc_warnings=warn-only])]
)
......
......@@ -284,7 +284,7 @@ echo "Creating top directory: '${tempdir}'"
mkdir ${tempdir}
if [ "$changelog" = yes ]; then
if test -d .git; then
if test -e .git; then
echo "Making top-level ChangeLog"
make ChangeLog CHANGELOG=${tempdir}/ChangeLog || \
{ x=$?; echo "make ChangeLog FAILED (try --no-changelog?)" >&2; exit $x; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment