Re: Bug report - bootstrap script not compatible with git submodules

[Aaron Sowry]

Sorry - wrong list. Please ignore.

On Mon, Sep 01, 2014 at 01:30:32PM +0200, Aaron Sowry wrote:
> Hi,
> 
> I've noticed that if the gnulib git tree is used as a submodule for a 
> different
> project, the git detection in the bootstrap script will not work properly. 
> This
> is because it checks for the existence of a .git directory, whereas for
> submodules .git will be a file.
> 
> The fix is trivial, patch attached.
> 
> /Aaron

> diff --git a/bootstrap b/bootstrap
> index 2b2c044..3d2c8ef 100755
> --- a/bootstrap
> +++ b/bootstrap
> @@ -221,7 +221,7 @@ func_update ()
>  ## ---------------- ##
>  
>  # See if we can use gnulib's git-merge-changelog merge driver.
> -if test -d .git && (git --version) >/dev/null 2>/dev/null ; then
> +if test -e .git && (git --version) >/dev/null 2>/dev/null ; then
>    if git config merge.merge-changelog.driver >/dev/null ; then
>      :
>    elif (git-merge-changelog --version) >/dev/null 2>/dev/null ; then
> @@ -243,7 +243,7 @@ fi
>  ## Update the gnulib module tree. ##
>  ## ------------------------------ ##
>  
> -if test -d .git && (git --version) >/dev/null 2>/dev/null ; then
> +if test -e .git && (git --version) >/dev/null 2>/dev/null ; then
>    if test -f gnulib/gnulib-tool ; then
>      func_echo "updating gnulib submodule"
>      git submodule update \