[Ping] [PATCH] Support relative command name for git-merge-changelog program.

[Stefano Lattarini]

On 06/03/2013 05:58 PM, Stefano Lattarini wrote:
> Otherwise, even after correctly setting the git configuration entry
> 'merge.merge-changelog.driver' to "git-merge-changelog %O %A %B"
> (which is perfectly valid), the 'import-gnulib.sh' script aborts
> with the following spurious error:
> ERROR: Merge driver git-merge-changelog is not executable.
> ERROR: Please fix .git/config or install git-merge-changelog
> 
> * import-gnulib.sh (check_merge_driver): Adjust to check that the
> given driver is runnable as a command, rather than that it is
> executable as a path.
> 
> Signed-off-by: Stefano Lattarini <address@hidden>
> ---
>  ChangeLog        | 13 +++++++++++++
>  import-gnulib.sh |  2 +-
>  2 files changed, 14 insertions(+), 1 deletion(-)
> 
> diff --git a/ChangeLog b/ChangeLog
> index d15ec2f..9a1fbe9 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,16 @@
> +2013-06-03  Stefano Lattarini  <address@hidden> (trivial change)
> +
> +     Support relative command name for git-merge-changelog program.
> +     Otherwise, even after correctly setting the git configuration entry
> +     'merge.merge-changelog.driver' to "git-merge-changelog %O %A %B"
> +     (which is perfectly valid), the 'import-gnulib.sh' script aborts
> +     with the following spurious error:
> +     ERROR: Merge driver git-merge-changelog is not executable.
> +     ERROR: Please fix .git/config or install git-merge-changelog
> +     * import-gnulib.sh (check_merge_driver): Adjust to check that the
> +     given driver is runnable as a command, rather than that it is
> +     executable as a path.
> +
>  2013-06-02  James Youngman  <address@hidden>
>  
>       Add unlinkat moduile.
> diff --git a/import-gnulib.sh b/import-gnulib.sh
> index ff9c330..33b05c1 100755
> --- a/import-gnulib.sh
> +++ b/import-gnulib.sh
> @@ -272,7 +272,7 @@ Example:
>          driver="$(git config --get merge.merge-changelog.driver |
>                    sed -e 's/[   ].*//')"
>       if [ $? -eq 0 ]; then
> -         if ! [ -x "$driver" ]; then
> +         if ! "$driver" --help >/dev/null; then
>               echo "ERROR: Merge driver $driver is not executable." >&2
>               echo "ERROR: Please fix $config_file or install $driver" >&2
>               # Always fatal - if configured, the merge driver should work.
> 
Ping on this?  The issue has bitten me again today, while I was testing the
latest Automake development version (soon to become Automake 1.14) on the
findutils git repository.

Regards,
  Stefano