diff options
| author | Orestis Floros <orestisflo@gmail.com> | 2020-02-02 13:12:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-02 13:12:20 +0100 |
| commit | b9b0774733b5e19d8925276987b8e41eee7e239e (patch) | |
| tree | 823d7884e7b06bb5905817c0f87553ea98a5ee05 | |
| parent | fc01ece3657e334d9067c40c0e7274ee955345e5 (diff) | |
| parent | 2edae71570f985746856d1513041803a5bd4860a (diff) | |
| download | i3-b9b0774733b5e19d8925276987b8e41eee7e239e.tar.gz i3-b9b0774733b5e19d8925276987b8e41eee7e239e.zip | |
Merge pull request #3926 from stapelberg/next
configure: deal with git worktree checkouts, where .git is a file
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 82f6fccd..0b99cf80 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ AS_VAR_IF([_cv_gnu_make_command], [""], [AC_MSG_ERROR([the i3 Makefile.am requir AX_EXTEND_SRCDIR -AS_IF([test -d ${srcdir}/.git], +AS_IF([test -e ${srcdir}/.git], [ VERSION="$(git -C ${srcdir} describe --tags --abbrev=0)" I3_VERSION="$(git -C ${srcdir} describe --tags --always) ($(git -C ${srcdir} rev-list --format=%cd --date=short -n1 $(git rev-parse HEAD) | tail -n1), branch \\\"$(git -C ${srcdir} describe --tags --always --all | sed s:heads/::)\\\")" |