Skip to contentSkip to conversation

configure: Enable werror for git worktrees

PATCH Applied Alexey Kardashevskiy 6 participants 7 messages Feb 28, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 configure: Enable werror for git worktrees

The configure script checks multiple times whether it works in a git repository and it does this by "test -e "${source_path}/.git" in 4 cases but in one case where it tries to enable werror "-d" is used there which fails on git worktrees as .git is a file then and not a directory.

This changes the test to "-e" as other occurrences.

---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configure +1 -1
index 05d72f1..f481ff9 100755
@@ -1835,7 +1835,7 @@ fi
 # Consult white-list to determine whether to enable werror
 # by default.  Only enable by default for git builds
 if test -z "$werror" ; then
-    if test -d "$source_path/.git" && \
+    if test -e "$source_path/.git" && \
         { test "$linux" = "yes" || test "$mingw32" = "yes"; }; then
         werror="yes"
     else
Signature · 1 line
2.17.1
#1 lore raw
Quoted 8 lines · Alexey Kardashevskiy

The configure script checks multiple times whether it works in a git repository and it does this by "test -e "${source_path}/.git" in 4 cases but in one case where it tries to enable werror "-d" is used there which fails on git worktrees as .git is a file then and not a directory.

This changes the test to "-e" as other occurrences.

CCing a few likely candidates based on get_maintainer -f

Quoted 17 lines
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configure +1 -1
index 05d72f1..f481ff9 100755
@@ -1835,7 +1835,7 @@ fi
 # Consult white-list to determine whether to enable werror
 # by default.  Only enable by default for git builds
 if test -z "$werror" ; then
-    if test -d "$source_path/.git" && \
+    if test -e "$source_path/.git" && \
         { test "$linux" = "yes" || test "$mingw32" = "yes"; }; then
         werror="yes"
     else
Signature · 4 lines
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson
#2 lore raw
Quoted 5 lines · David Gibson
Quoted 4 lines · Alexey Kardashevskiy

The configure script checks multiple times whether it works in a git repository and it does this by "test -e "${source_path}/.git" in 4 cases but in one case where it tries to enable werror "-d" is used there which fails on git worktrees as .git is a file then and not a directory.

That confused me. What is a "git worktree" where .git is a file? So far .git was always a directory here...?

Thomas

Quoted 24 lines
Quoted 3 lines

This changes the test to "-e" as other occurrences.

CCing a few likely candidates based on get_maintainer -f

Quoted 17 lines
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configure +1 -1
index 05d72f1..f481ff9 100755
@@ -1835,7 +1835,7 @@ fi
 # Consult white-list to determine whether to enable werror
 # by default.  Only enable by default for git builds
 if test -z "$werror" ; then
-    if test -d "$source_path/.git" && \
+    if test -e "$source_path/.git" && \
         { test "$linux" = "yes" || test "$mingw32" = "yes"; }; then
         werror="yes"
     else
#3 lore raw
Quoted 9 lines · Thomas Huth
Quoted 5 lines · David Gibson
Quoted 4 lines · Alexey Kardashevskiy

The configure script checks multiple times whether it works in a git repository and it does this by "test -e "${source_path}/.git" in 4 cases but in one case where it tries to enable werror "-d" is used there which fails on git worktrees as .git is a file then and not a directory.

That confused me. What is a "git worktree" where .git is a file? So far .git was always a directory here...?

git worktree --help

A worktree is basically a clone, but instead of copying over the git repo it is simply referenced.

That is not the only possible case where .git is a file not a directory. In newer versions "git submodule" stores the repo in .git/modules/$submodule and $submodule/.git is just a file with a reference:

kraxel@sirius ~/projects/qemu# cat roms/seabios/.git
gitdir: ../../.git/modules/roms/seabios

So, yes, the patch makes sense.

cheers,
Gerd

#4 lore raw
Quoted 8 lines · Gerd Hoffmann
Quoted 7 lines · Thomas Huth
Quoted 5 lines · David Gibson
Quoted 4 lines · Alexey Kardashevskiy

The configure script checks multiple times whether it works in a git repository and it does this by "test -e "${source_path}/.git" in 4 cases but in one case where it tries to enable werror "-d" is used there which fails on git worktrees as .git is a file then and not a directory.

Quoted 4 lines
Quoted 2 lines

That confused me. What is a "git worktree" where .git is a file? So far .git was always a directory here...?

git worktree --help

Thanks a lot for the explanation, now it makes sense, indeed.

Anyway, my local git from RHEL7 is obviously too old for that:

$ git worktree --help
No manual entry for gitworktree
$ git worktree
git: 'worktree' is not a git command. See 'git --help'.
$ git --version
git version 1.8.3.1

Thomas

#5 lore raw
In reply to Gerd Hoffmann
Quoted 21 lines · Gerd Hoffmann
Quoted 9 lines · Thomas Huth
Quoted 5 lines · David Gibson
Quoted 4 lines · Alexey Kardashevskiy

The configure script checks multiple times whether it works in a git repository and it does this by "test -e "${source_path}/.git" in 4 cases but in one case where it tries to enable werror "-d" is used there which fails on git worktrees as .git is a file then and not a directory.

That confused me. What is a "git worktree" where .git is a file? So far .git was always a directory here...?

git worktree --help

A worktree is basically a clone, but instead of copying over the git repo it is simply referenced.

That is not the only possible case where .git is a file not a directory. In newer versions "git submodule" stores the repo in .git/modules/$submodule and $submodule/.git is just a file with a reference:

Quoted 8 lines

kraxel@sirius ~/projects/qemu# cat roms/seabios/.git
gitdir: ../../.git/modules/roms/seabios

So, yes, the patch makes sense.

cheers,
Gerd

Queued, thanks.

Paolo

#6 lore raw
In reply to Alexey Kardashevskiy
Quoted 6 lines · Alexey Kardashevskiy

The configure script checks multiple times whether it works in a git repository and it does this by "test -e "${source_path}/.git" in 4 cases but in one case where it tries to enable werror "-d" is used there which fails on git worktrees as .git is a file then and not a directory.

Quoted 6 lines

This changes the test to "-e" as other occurrences.

---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Given that there is this non-obvious pitfall in trying to hand-code the "are we running from git?" check and that we do it in five places in configure, that suggests that we should abstract this out:

sources_in_git() {
# Note that -d will give the wrong answer for git worktrees test -e "$source_path/.git"
}

and then use wherever we're currently checking by hand:

    if sources_in_git && ...

(warning: code not tested at all)

Defining a sources_in_git variable which we set at the start of the script would work too; no strong preference.

thanks
-- PMM