[vlc-devel] [PATCH] Fix compilation from a git worktree

[Thomas Guillem]

LGTM

On Wed, May 29, 2019, at 11:29, Romain Vimont wrote:
> From within a git worktree, "git describe" failed due to the explicit
> --git-dir option:
> 
>       GEN      stamp-revision
>     fatal: not a git repository: '../../.git/'
> 
> Let git find the actual git dir by just providing the path (-C) from
> which we want to execute the git command.
> ---
>  src/Makefile.am | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/Makefile.am b/src/Makefile.am
> index bc6694586f..79f5ad3e58 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -633,7 +633,7 @@ $(srcdir)/revision.txt:
>  stamp-revision:
>  	$(AM_V_at)rm -f -- revision.tmp
>  	$(AM_V_GEN)if ! git \
> -			--git-dir="$(top_srcdir)/.git" describe \
> +			-C "$(top_srcdir)" describe \
>  			--tags --long --match '?.*.*' --always; then \
>  		cat $(srcdir)/revision.txt ; \
>  	fi > revision.tmp
> -- 
> 2.20.1
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel