diff options
| author | Michael Gmelin <grembo@FreeBSD.org> | 2020-05-19 15:24:21 +0000 |
|---|---|---|
| committer | Michael Gmelin <grembo@FreeBSD.org> | 2020-05-19 15:24:21 +0000 |
| commit | cd507151b29100b63cca093a80dd116c0870dbc5 (patch) | |
| tree | 6cf1dbd9921a94df4ce3af318b44673b5b12c058 /devel/phabricator/files/patch-scripts_celerity_install__merge.sh | |
| parent | Update to version 2.32; (diff) | |
Patch paths to php executable, so things like ssh-auth work again
without workarounds.
Diffstat (limited to 'devel/phabricator/files/patch-scripts_celerity_install__merge.sh')
| -rw-r--r-- | devel/phabricator/files/patch-scripts_celerity_install__merge.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/devel/phabricator/files/patch-scripts_celerity_install__merge.sh b/devel/phabricator/files/patch-scripts_celerity_install__merge.sh new file mode 100644 index 000000000000..2d0644e038f9 --- /dev/null +++ b/devel/phabricator/files/patch-scripts_celerity_install__merge.sh @@ -0,0 +1,8 @@ +--- scripts/celerity/install_merge.sh.orig 2020-05-19 10:53:29 UTC ++++ scripts/celerity/install_merge.sh +@@ -6,4 +6,4 @@ echo "resources/celerity/map.php merge=celerity" \ + git config merge.celerity.name "Celerity Mapper" + + git config merge.celerity.driver \ +- 'php $GIT_DIR/../bin/celerity map' ++ '%%PHP_CMD%% $GIT_DIR/../bin/celerity map' |