wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

patchinstall: Test for .git presence, regardless of its type.

Browse Source 
It's possible that .git is a file, for example when using multiple
worktrees, and in this case git apply will still work fine.
This commit is contained in:
Rémi Bernon 2019-12-19 14:20:00 +01:00 committed by Zebediah Figura
parent 915ed2cec1
commit 9dc9c57bbf
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/patchinstall.sh.in
View File

@ -267,7 +267,7 @@ fi
# subdirectory of a git tree, which has the effect that no patches
# are applied, but the exitcode is zero. To avoid broken builds we
# will workaround this issue or abort.
test ! -d ".git" && git rev-parse --git-dir >/dev/null 2>&1
test ! -e ".git" && git rev-parse --git-dir >/dev/null 2>&1
workaround_git_bug="$?"
# Apply the patches using gitapply.sh, a small wrapper around 'patch'