diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-01 09:22:29 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-01 09:22:29 +0100 |
| commit | 5effa4e0f98b317fe4607b1a6548811017c3325d (patch) | |
| tree | d62ab19ccca3b0c6409595074b637eeb3d4371dc /pkgs/development/python-modules/GitPython/hardcode-git-path.patch | |
| parent | ca2edf79f75ad2a43a5af5c1283db9f0f843680a (diff) | |
| parent | 8f58e00226e3192994050b12aa9ed119be0220f3 (diff) | |
Merge branch 'master' into staging-next
Comments on conflicts:
- llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is
to build all targets, so we should be fine
- some pypi hashes: they were equivalent, just base16 vs. base32
Diffstat (limited to 'pkgs/development/python-modules/GitPython/hardcode-git-path.patch')
| -rw-r--r-- | pkgs/development/python-modules/GitPython/hardcode-git-path.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/GitPython/hardcode-git-path.patch b/pkgs/development/python-modules/GitPython/hardcode-git-path.patch new file mode 100644 index 000000000000..937479959926 --- /dev/null +++ b/pkgs/development/python-modules/GitPython/hardcode-git-path.patch @@ -0,0 +1,13 @@ +diff --git a/git/cmd.py b/git/cmd.py +index a4faefe..51ad442 100644 +--- a/git/cmd.py ++++ b/git/cmd.py +@@ -175,7 +175,7 @@ class Git(LazyMixin): + + # CONFIGURATION + +- git_exec_name = "git" # default that should work on linux and windows ++ git_exec_name = "@git@/bin/git" + + # Enables debugging of GitPython's git commands + GIT_PYTHON_TRACE = os.environ.get("GIT_PYTHON_TRACE", False) |