git/git-instaweb.sh, branch v2.6.2

git-instaweb: use @SHELL_PATH@ instead of /bin/sh

2015-03-10T22:10:35Z

If the user has configured a value for SHELL_PATH then be sure to use it for any generated scripts instead of hard-coding /bin/sh. The first line of the script is handled specially, but the embedded #!/bin/sh line in the here document will not be automatically updated unless it uses @SHELL_PATH@. Signed-off-by: Kyle J. McKay Signed-off-by: Junio C Hamano

git-instaweb: allow running in a working tree subdirectory

2015-03-10T22:10:33Z

Signed-off-by: Kyle J. McKay Signed-off-by: Junio C Hamano

git-instaweb: add support for Apache 2.4

2014-05-27T19:57:19Z

Detect available Apache MPMs and use first available according to following order of precedence: mpm_event mpm_prefork mpm_worker Add authz_core module if available to avoid HTTP Error 500 errors. Signed-off-by: Jonathan McCrohan Signed-off-by: Junio C Hamano

git-sh-setup.sh: add variable to use the stuck-long mode

2014-02-03T20:11:10Z

If the variable $OPTIONS_STUCKLONG is not empty, then rev-parse option parsing is done in --stuck-long mode. Signed-off-by: Nicolas Vigier Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

use @@PERL@@ in built scripts

2013-10-29T19:41:17Z

Several of the built shell commands invoke a bare "perl" to perform some one-liners. This will use the first perl in the PATH rather than the one specified by the user's SHELL_PATH. We are not asking these perl invocations to do anything exotic, so typically any old system perl will do; however, in some cases the system perl may have unexpected behavior (e.g., by handling line endings differently). We should err on the side of using the perl the user pointed us to. The downside of this is that on systems with a sane perl setup, we no longer find the perl at runtime, but instead point to a static perl (like /usr/bin/perl). That means we will not handle somebody moving perl without rebuilding git, whereas before we tracked it just fine. This is probably not a big deal, though, as the built perl scripts already suffered from this. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

git-instaweb: Check that correct config file exists for (re)start

2011-06-27T09:11:41Z

Currently start/restart does not generate any configuration files for spawning a new instance. This means that $ git instaweb --http= --start might pick up stale 'httpd.conf' file for a different web server (e.g. for default lighttpd when requesting apache2). This commit changes that, and makes git-instaweb generate web server config file and/or gitweb config file if don't exists. This required naming config files after the name of web server (alternate solution would be to somehow mark for which web server was config file generated). Note that web servers that embed configuration in server script file, namely webrick and plackup, and which delete "$conf" in their *_conf function, would have their config (server script) always regenerated. Note: this commit introduces a bit of code repetition (but only a few lines). Reported-by: Gurjeet Singh Signed-off-by: Jakub Narebski Acked-by: Eric Wong

git-instaweb: Move all actions at the end of script

2011-06-27T09:11:41Z

As a nice side-effect now the order of parameters does not matter: $ git instaweb --httpd=apache2 --start is now (after this patch) the same as $ git instaweb --start --httpd=apache2 Before this commit --start, --stop, --restart (and their subcommand versions start, stop, restart) exited immediately. This is preparatory work for making start/restart check that correct configuration is set up; this change was required to have access in start_httpd to requested web browser etc. Signed-off-by: Jakub Narebski Acked-by: Eric Wong

git-instaweb: Use $conf, not $fqgitdir/gitweb/httpd.conf

2011-06-27T09:11:41Z

Don't repeat yourself: use "$conf" instead of its [current] contents, namely "$fqgitdir/gitweb/httpd.conf". Signed-off-by: Jakub Narebski Acked-by: Eric Wong

git-instaweb: Extract configuring web server into configure_httpd

2011-06-27T09:11:41Z

This is preparatory work for making start/restart check that git-instaweb set up correct configuration, and generate it if it is missing. Pure refactoring, no functional changes. Signed-off-by: Jakub Narebski Acked-by: Eric Wong

git-instaweb: Change how gitweb.psgi is made runnable as standalone app

2011-02-28T06:02:31Z

According to blog post "FindBin, __FILE__, $0 and PSGI woes" http://bulknews.typepad.com/blog/2011/02/findbin-__file__-0-and-psgi-woes.html by Tatsuhiko Miyagawa, using 'if (__FILE__ eq $0)' in .psgi code (to check if script was run from command line), is not supposed to work since Plack 0.9971. Replace it with one of proposed solutions; while at it return $app explicitely, rather than implicitely by being a last expression. This affects 'plackup' web server. While at it cleanup whitespace. Signed-off-by: Jakub Narebski Acked-by: Eric Wong Signed-off-by: Junio C Hamano