Hugo Beauzée-Luyssen pushed to branch 3.0.x at VideoLAN / VLC
Commits: e0014cff by Pierre Lamot at 2021-10-11T11:24:42+00:00 src: Fix revision.txt generation in a worktree Signed-off-by: Hugo Beauzée-Luyssen <[email protected]> Cherry-picked from commit b6111311259abf87ed72035f0c0abe5c5d442217. Signed-off-by: Alexandre Janniaux <[email protected]> - - - - - 456116c5 by Romain Vimont at 2021-10-11T11:24:42+00:00 Fix compilation from a git worktree >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. Signed-off-by: Steve Lhomme <[email protected]> Cherry-picked from commit d5a705346df950c5f860879b9bd095c1c45c41b6. Signed-off-by: Alexandre Janniaux <[email protected]> - - - - - 1 changed file: - src/Makefile.am Changes: ===================================== src/Makefile.am ===================================== @@ -560,7 +560,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 View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/f8cf2ff05834abfc9167b5e92badcb43dd00e69a...456116c583c709404134e510892e238e584c7c84 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/f8cf2ff05834abfc9167b5e92badcb43dd00e69a...456116c583c709404134e510892e238e584c7c84 You're receiving this email because of your account on code.videolan.org.
_______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
