{"thread":{"id":"24954","subject":"git instaweb for Debian squeeze (Re: Bug#592733: git instaweb broken)","startedAt":"2010-09-02T22:12:11Z","lastAt":"2010-09-04T02:19:30Z","messageCount":14,"participants":["Jonathan Nieder","Eric Wong","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"149727","messageId":"20100902221211.GA4789@burratino","threadId":"24954","inReplyTo":"20100812131152.2333.9604.reportbug@octopus.hi.pengutronix.de","subject":"git instaweb for Debian squeeze (Re: Bug#592733: git instaweb broken)","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-09-02T22:12:11Z","receivedAt":"2010-09-02T22:12:11Z","isPatch":false,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Hi again,\n\nUwe Kleine-König wrote:\n\n> when I start git instaweb on a git repository, I get a crippled view\n> (no style sheets, no images) that doesn't include the current project.\n\nOk, so the proper fix is v1.7.2-rc0~55^2~3, but that seems too dramatic\nto try at the moment for squeeze (for which the plan is to basically\ngo with gitweb and instaweb 1.7.1).  Does this workaround help?\n\nEric, do you think it is worth duplicating the logo and favicon within\npre-v1.7.2 instaweb?  The script already takes 252 KiB, so an extra\n10 KiB might not be such a big deal.\n\nSigned-off-by: Jonathan Nieder <jrnieder@gmail.com>\n---\ndiff --git a/git-instaweb.sh b/git-instaweb.sh\nindex 0c6e103..95d3d0a 100755\n--- a/git-instaweb.sh\n+++ b/git-instaweb.sh\n@@ -387,7 +387,11 @@ script='\n s#^(my|our) \\$projectroot =.*#$1 \\$projectroot = \"'$(dirname \"$fqgitdir\")'\";#;\n s#(my|our) \\$gitbin =.*#$1 \\$gitbin = \"'$GIT_EXEC_PATH'\";#;\n s#(my|our) \\$projects_list =.*#$1 \\$projects_list = \\$projectroot;#;\n-s#(my|our) \\$git_temp =.*#$1 \\$git_temp = \"'$fqgitdir/gitweb/tmp'\";#;'\n+s#(my|our) \\$git_temp =.*#$1 \\$git_temp = \"'$fqgitdir/gitweb/tmp'\";#;\n+s#(my|our) \\$logo =.*#$1 \\$logo = \"/usr/share/gitweb/git-logo.png\";#;\n+s#(my|our) \\$favicon =.*#$1 \\$favicon = \"/usr/share/gitweb/git-favicon.png\";#;\n+s#(my|our) \\$GITWEB_CONFIG_SYSTEM =.*#$1 \\$GITWEB_CONFIG_SYSTEM = \"\";#;'\n+\n \n gitweb_cgi () {\n \tcat > \"$1.tmp\" <<\\EOFGITWEB\n-- \n"},{"id":"149729","messageId":"20100902223624.GA9613@dcvr.yhbt.net","threadId":"24954","inReplyTo":"20100902221211.GA4789@burratino","subject":"Re: git instaweb for Debian squeeze (Re: Bug#592733: git instaweb broken)","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2010-09-02T22:36:24Z","receivedAt":"2010-09-02T22:36:24Z","isPatch":false,"sender":{"key":"e@80x24.org","avatar":null},"body":"Jonathan Nieder <jrnieder@gmail.com> wrote:\n> Uwe Kleine-König wrote:\n> > when I start git instaweb on a git repository, I get a crippled view\n> > (no style sheets, no images) that doesn't include the current project.\n\n> Eric, do you think it is worth duplicating the logo and favicon within\n> pre-v1.7.2 instaweb?  The script already takes 252 KiB, so an extra\n> 10 KiB might not be such a big deal.\n\nThe stylesheet is important and should be fixed.  I don't care about the\nlogo and favicon (warning: I've never been a fan of logos/icons,\nneedless noise IMHO), but if you're willing to help maintain it then\nit's fine by me.\n\n-- \nEric Wong\n"},{"id":"149737","messageId":"20100902235237.GA6466@burratino","threadId":"24954","inReplyTo":"20100902223624.GA9613@dcvr.yhbt.net","subject":"[PATCH/RFC maint-1.7.1 0/4] instaweb 1.7.1 fixes for Debian squeeze","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-09-02T23:52:37Z","receivedAt":"2010-09-02T23:52:37Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Eric Wong wrote:\n>> Uwe Kleine-König wrote:\n>>> when I start git instaweb on a git repository, I get a crippled view\n>>> (no style sheets, no images) that doesn't include the current project.\n[...]\n> The stylesheet is important and should be fixed.  I don't care about the\n> logo and favicon (warning: I've never been a fan of logos/icons,\n> needless noise IMHO), but if you're willing to help maintain it then\n> it's fine by me.\n\nThanks, Eric; that makes sense.  How about this?\n\nThe purpose of this series is the first patch, which allows\nold-fashioned instaweb to run even if /etc/gitweb.conf specifies some\nlayout it does not expect.\n\nI suspect this problem is already fixed in maint by v1.7.2-rc0~55^2~3\n(git-instaweb: Configure it to work with new gitweb structure,\n2010-05-28; thanks, Pavan!), but users that do not like gitweb version\nnumbers with a 2 in them will not be able to use that.\n\nPatches 2-4 fix some spurious 404 errors due to missing images,\nnoticed while debugging.\n\nPatches are against Junio's maint-1.7.1.\n\nJonathan Nieder (4):\n  instaweb: ignore GITWEB_CONFIG_SYSTEM\n  gitweb: skip logo in atom feed when there is none\n  gitweb: make logo optional\n  instaweb: disable logo and favicon by default\n\n git-instaweb.sh    |    6 +++++-\n gitweb/gitweb.perl |   12 +++++++-----\n 2 files changed, 12 insertions(+), 6 deletions(-)\n\n-- \n1.7.2.2\n"},{"id":"149738","messageId":"20100902235429.GB6466@burratino","threadId":"24954","inReplyTo":"20100902235237.GA6466@burratino","subject":"[PATCH 1/4] instaweb: ignore GITWEB_CONFIG_SYSTEM","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-09-02T23:54:29Z","receivedAt":"2010-09-02T23:54:29Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"The configuration in /etc/gitweb.conf might specify any old\nlayout; in particular, it is likely not to be identical to that\nwhich git instaweb sets up.  Noticed by Uwe Kleine-König.\n\nReported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>\nCc: Eric Wong <normalperson@yhbt.net>\nSigned-off-by: Jonathan Nieder <jrnieder@gmail.com>\n---\n git-instaweb.sh |    3 ++-\n 1 files changed, 2 insertions(+), 1 deletions(-)\n\ndiff --git a/git-instaweb.sh b/git-instaweb.sh\nindex f608014..6279f4d 100755\n--- a/git-instaweb.sh\n+++ b/git-instaweb.sh\n@@ -375,7 +375,8 @@ script='\n s#^(my|our) \\$projectroot =.*#$1 \\$projectroot = \"'$(dirname \"$fqgitdir\")'\";#;\n s#(my|our) \\$gitbin =.*#$1 \\$gitbin = \"'$GIT_EXEC_PATH'\";#;\n s#(my|our) \\$projects_list =.*#$1 \\$projects_list = \\$projectroot;#;\n-s#(my|our) \\$git_temp =.*#$1 \\$git_temp = \"'$fqgitdir/gitweb/tmp'\";#;'\n+s#(my|our) \\$git_temp =.*#$1 \\$git_temp = \"'$fqgitdir/gitweb/tmp'\";#;\n+s#(my|our) \\$GITWEB_CONFIG_SYSTEM =.*#$1 \\$GITWEB_CONFIG_SYSTEM = \"\";#;'\n \n gitweb_cgi () {\n \tcat > \"$1.tmp\" <<\\EOFGITWEB\n-- \n1.7.2.2\n"},{"id":"149739","messageId":"20100902235546.GC6466@burratino","threadId":"24954","inReplyTo":"20100902235237.GA6466@burratino","subject":"[PATCH 2/4] gitweb: skip logo in atom feed when there is none","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-09-02T23:55:47Z","receivedAt":"2010-09-02T23:55:47Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"With v1.5.0-rc0~169 (gitweb: Fix Atom feed <logo>: it is $logo,\nnot $logo_url, 2006-12-04), the logo URI to be written to Atom\nfeeds was corrected but the case of no logo forgotten.\n\nCc: Jakub Narebski <jnareb@gmail.com>\nCc: Eric Wong <normalperson@yhbt.net>\nSigned-off-by: Jonathan Nieder <jrnieder@gmail.com>\n---\nTheoretical, untested.\n\n gitweb/gitweb.perl |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl\nindex a97ce03..cc20e74 100755\n--- a/gitweb/gitweb.perl\n+++ b/gitweb/gitweb.perl\n@@ -6630,7 +6630,7 @@ XML\n \t\tif (defined $favicon) {\n \t\t\tprint \"<icon>\" . esc_url($favicon) . \"</icon>\\n\";\n \t\t}\n-\t\tif (defined $logo_url) {\n+\t\tif (defined $logo) {\n \t\t\t# not twice as wide as tall: 72 x 27 pixels\n \t\t\tprint \"<logo>\" . esc_url($logo) . \"</logo>\\n\";\n \t\t}\n-- \n1.7.2.2\n"},{"id":"149740","messageId":"20100902235623.GD6466@burratino","threadId":"24954","inReplyTo":"20100902235237.GA6466@burratino","subject":"[PATCH 3/4] gitweb: make logo optional","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-09-02T23:56:23Z","receivedAt":"2010-09-02T23:56:23Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Some sites may not want to have a logo at all.  In particular,\ngit instaweb can benefit from this.\n\nCc: Jakub Narebski <jnareb@gmail.com>\nCc: Eric Wong <normalperson@yhbt.net>\nSigned-off-by: Jonathan Nieder <jrnieder@gmail.com>\n---\n gitweb/gitweb.perl |   10 ++++++----\n 1 files changed, 6 insertions(+), 4 deletions(-)\n\ndiff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl\nindex cc20e74..9a72562 100755\n--- a/gitweb/gitweb.perl\n+++ b/gitweb/gitweb.perl\n@@ -3269,10 +3269,12 @@ EOF\n \t\tinsert_file($site_header);\n \t}\n \n-\tprint \"<div class=\\\"page_header\\\">\\n\" .\n-\t      $cgi->a({-href => esc_url($logo_url),\n-\t               -title => $logo_label},\n-\t              qq(<img src=\"$logo\" width=\"72\" height=\"27\" alt=\"git\" class=\"logo\"/>));\n+\tprint \"<div class=\\\"page_header\\\">\\n\";\n+\tif (defined $logo) {\n+\t\tprint $cgi->a({-href => esc_url($logo_url),\n+\t\t               -title => $logo_label},\n+\t\t              qq(<img src=\"$logo\" width=\"72\" height=\"27\" alt=\"git\" class=\"logo\"/>));\n+\t}\n \tprint $cgi->a({-href => esc_url($home_link)}, $home_link_str) . \" / \";\n \tif (defined $project) {\n \t\tprint $cgi->a({-href => href(action=>\"summary\")}, esc_html($project));\n-- \n1.7.2.2\n"},{"id":"149741","messageId":"20100902235722.GE6466@burratino","threadId":"24954","inReplyTo":"20100902235237.GA6466@burratino","subject":"[PATCH 4/4] instaweb: disable logo and favicon by default","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-09-02T23:57:22Z","receivedAt":"2010-09-02T23:57:22Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Avoid 404 errors due to the missing git logo and favicon.\n\nReported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>\nCc: Eric Wong <normalperson@yhbt.net>\nCc: Jakub Narebski <jnareb@gmail.com>\nSigned-off-by: Jonathan Nieder <jrnieder@gmail.com>\n---\nThanks for reading.\n\n git-instaweb.sh |    4 +++-\n 1 files changed, 3 insertions(+), 1 deletions(-)\n\ndiff --git a/git-instaweb.sh b/git-instaweb.sh\nindex 6279f4d..1128b31 100755\n--- a/git-instaweb.sh\n+++ b/git-instaweb.sh\n@@ -376,7 +376,9 @@ s#^(my|our) \\$projectroot =.*#$1 \\$projectroot = \"'$(dirname \"$fqgitdir\")'\";#;\n s#(my|our) \\$gitbin =.*#$1 \\$gitbin = \"'$GIT_EXEC_PATH'\";#;\n s#(my|our) \\$projects_list =.*#$1 \\$projects_list = \\$projectroot;#;\n s#(my|our) \\$git_temp =.*#$1 \\$git_temp = \"'$fqgitdir/gitweb/tmp'\";#;\n-s#(my|our) \\$GITWEB_CONFIG_SYSTEM =.*#$1 \\$GITWEB_CONFIG_SYSTEM = \"\";#;'\n+s#(my|our) \\$GITWEB_CONFIG_SYSTEM =.*#$1 \\$GITWEB_CONFIG_SYSTEM = \"\";#;\n+s#(my|our) \\$favicon =.*#$1 \\$favicon = undef;#;'\n+s#(my|our) \\$logo =.*#$1 \\$logo = undef;#;'\n \n gitweb_cgi () {\n \tcat > \"$1.tmp\" <<\\EOFGITWEB\n-- \n1.7.2.2\n"},{"id":"149744","messageId":"20100903010926.GA16089@dcvr.yhbt.net","threadId":"24954","inReplyTo":"20100902235237.GA6466@burratino","subject":"Re: [PATCH/RFC maint-1.7.1 0/4] instaweb 1.7.1 fixes for Debian squeeze","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2010-09-03T01:09:26Z","receivedAt":"2010-09-03T01:09:26Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Jonathan Nieder <jrnieder@gmail.com> wrote:\n> Eric Wong wrote:\n> >> Uwe Kleine-König wrote:\n> >>> when I start git instaweb on a git repository, I get a crippled view\n> >>> (no style sheets, no images) that doesn't include the current project.\n> [...]\n> > The stylesheet is important and should be fixed.  I don't care about the\n> > logo and favicon (warning: I've never been a fan of logos/icons,\n> > needless noise IMHO), but if you're willing to help maintain it then\n> > it's fine by me.\n> \n> Thanks, Eric; that makes sense.  How about this?\n\nUntested, but everything looks reasonable to me, thanks!\n\n-- \nEric Wong\n"},{"id":"149745","messageId":"20100903021951.GC29302@burratino","threadId":"24954","inReplyTo":"20100902235722.GE6466@burratino","subject":"[PATCH v2 4/4] instaweb: disable logo and favicon by default","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-09-03T02:19:51Z","receivedAt":"2010-09-03T02:19:51Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Avoid 404 errors due to the missing git logo and favicon.\n\nReported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>\nCc: Eric Wong <normalperson@yhbt.net>\nCc: Jakub Narebski <jnareb@gmail.com>\nSigned-off-by: Jonathan Nieder <jrnieder@gmail.com>\n---\nJonathan Nieder wrote:\n\n> --- a/git-instaweb.sh\n> +++ b/git-instaweb.sh\n> @@ -376,7 +376,9 @@ s#^(my|our) \\$projectroot =.*#$1 \\$projectroot = \"'$(dirname \"$fqgitdir\")'\";#;\n>  s#(my|our) \\$gitbin =.*#$1 \\$gitbin = \"'$GIT_EXEC_PATH'\";#;\n>  s#(my|our) \\$projects_list =.*#$1 \\$projects_list = \\$projectroot;#;\n>  s#(my|our) \\$git_temp =.*#$1 \\$git_temp = \"'$fqgitdir/gitweb/tmp'\";#;\n> -s#(my|our) \\$GITWEB_CONFIG_SYSTEM =.*#$1 \\$GITWEB_CONFIG_SYSTEM = \"\";#;'\n> +s#(my|our) \\$GITWEB_CONFIG_SYSTEM =.*#$1 \\$GITWEB_CONFIG_SYSTEM = \"\";#;\n> +s#(my|our) \\$favicon =.*#$1 \\$favicon = undef;#;'\n> +s#(my|our) \\$logo =.*#$1 \\$logo = undef;#;'\n\nStray apostrophe; sorry about that.  Here's a replacement.\n\n git-instaweb.sh |    4 +++-\n 1 files changed, 3 insertions(+), 1 deletions(-)\n\ndiff --git a/git-instaweb.sh b/git-instaweb.sh\nindex 6279f4d..0725596 100755\n--- a/git-instaweb.sh\n+++ b/git-instaweb.sh\n@@ -376,7 +376,9 @@ s#^(my|our) \\$projectroot =.*#$1 \\$projectroot = \"'$(dirname \"$fqgitdir\")'\";#;\n s#(my|our) \\$gitbin =.*#$1 \\$gitbin = \"'$GIT_EXEC_PATH'\";#;\n s#(my|our) \\$projects_list =.*#$1 \\$projects_list = \\$projectroot;#;\n s#(my|our) \\$git_temp =.*#$1 \\$git_temp = \"'$fqgitdir/gitweb/tmp'\";#;\n-s#(my|our) \\$GITWEB_CONFIG_SYSTEM =.*#$1 \\$GITWEB_CONFIG_SYSTEM = \"\";#;'\n+s#(my|our) \\$GITWEB_CONFIG_SYSTEM =.*#$1 \\$GITWEB_CONFIG_SYSTEM = \"\";#;\n+s#(my|our) \\$favicon =.*#$1 \\$favicon = undef;#;\n+s#(my|our) \\$logo =.*#$1 \\$logo = undef;#;'\n \n gitweb_cgi () {\n \tcat > \"$1.tmp\" <<\\EOFGITWEB\n-- \n1.7.2.2\n"},{"id":"149767","messageId":"7vfwxqzqoq.fsf@alter.siamese.dyndns.org","threadId":"24954","inReplyTo":"20100902235429.GB6466@burratino","subject":"Re: [PATCH 1/4] instaweb: ignore GITWEB_CONFIG_SYSTEM","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-09-03T17:23:49Z","receivedAt":"2010-09-03T17:23:49Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonathan Nieder <jrnieder@gmail.com> writes:\n\n> The configuration in /etc/gitweb.conf might specify any old\n> layout; in particular, it is likely not to be identical to that\n> which git instaweb sets up.  Noticed by Uwe Kleine-König.\n\nI am not sure if this is a reasonable change by reading the above.  In\nsome cases, the file may stale, but in other cases, it may specify what\nthe site administrator wants its users to be using, no?\n\n>\n> Reported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>\n> Cc: Eric Wong <normalperson@yhbt.net>\n> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>\n> ---\n>  git-instaweb.sh |    3 ++-\n>  1 files changed, 2 insertions(+), 1 deletions(-)\n>\n> diff --git a/git-instaweb.sh b/git-instaweb.sh\n> index f608014..6279f4d 100755\n> --- a/git-instaweb.sh\n> +++ b/git-instaweb.sh\n> @@ -375,7 +375,8 @@ script='\n>  s#^(my|our) \\$projectroot =.*#$1 \\$projectroot = \"'$(dirname \"$fqgitdir\")'\";#;\n>  s#(my|our) \\$gitbin =.*#$1 \\$gitbin = \"'$GIT_EXEC_PATH'\";#;\n>  s#(my|our) \\$projects_list =.*#$1 \\$projects_list = \\$projectroot;#;\n> -s#(my|our) \\$git_temp =.*#$1 \\$git_temp = \"'$fqgitdir/gitweb/tmp'\";#;'\n> +s#(my|our) \\$git_temp =.*#$1 \\$git_temp = \"'$fqgitdir/gitweb/tmp'\";#;\n> +s#(my|our) \\$GITWEB_CONFIG_SYSTEM =.*#$1 \\$GITWEB_CONFIG_SYSTEM = \"\";#;'\n\nPerhaps moving the last ' to its own line would help maintaining the\nscript in the longer term?\n\n>  \n>  gitweb_cgi () {\n>  \tcat > \"$1.tmp\" <<\\EOFGITWEB\n> -- \n> 1.7.2.2\n"},{"id":"149770","messageId":"20100903182042.GB2341@burratino","threadId":"24954","inReplyTo":"7vfwxqzqoq.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 1/4] instaweb: ignore GITWEB_CONFIG_SYSTEM","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-09-03T18:20:42Z","receivedAt":"2010-09-03T18:20:42Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Junio C Hamano wrote:\n> Jonathan Nieder <jrnieder@gmail.com> writes:\n\n>> The configuration in /etc/gitweb.conf might specify any old\n>> layout; in particular, it is likely not to be identical to that\n>> which git instaweb sets up.  Noticed by Uwe Kleine-König.\n>\n> I am not sure if this is a reasonable change by reading the above.  In\n> some cases, the file may stale, but in other cases, it may specify what\n> the site administrator wants its users to be using, no?\n\nYes, I should have mentioned this.\n\nBy analogy with .gitconfig, one might want \"git instaweb\" to check\nGITWEB_CONFIG_LOCAL, GITWEB_CONFIG_GLOBAL, and GITWEB_CONFIG_SYSTEM in\nthat order, taking values from all three.  A GITWEB_CONFIG envvar\ncould override them all.\n\nBut stepping back a moment, what would this accomplish?  The gitweb\nconfiguration specifies\n\n - what git version to use;\n - site branding;\n - what directory projects are relative to (*);\n - how deep to search for projects;\n - where the list of projects is (*);\n - how to demonstrate project consent to be shown (*);\n - whether to be a stickler about hiding secrets;\n - where gitweb.css, git-logo.png, git-favicon.png, and gitweb.js are (*);\n - base URI for relative paths used above (*);\n - what extra features (e.g. \"snapshot\") to enable;\n - MIME types, diff options, etc.\n\nThe items marked with a (*) are, in the regime used by git 1.7.1,\nspecific to the \"git instaweb\" instance, since it is all about showing\nthe current git repo and provides its own copies of gitweb.cgi instead\nof relying on copies in /usr/share/gitweb.\n\nThe items not marked with (*) might indeed benefit from some global\nsite defaults.  But unfortunately, that is already not what\n/etc/gitweb.conf is: it is rather used as a unit as a fallback when a\nseparate gitweb_config.perl is not present.\n\nIn git 1.7.2 and later, \"git instaweb\" provides the gitweb_config.perl\nand this discussion becomes academic.\n\n>> -s#(my|our) \\$git_temp =.*#$1 \\$git_temp = \"'$fqgitdir/gitweb/tmp'\";#;'\n>> +s#(my|our) \\$git_temp =.*#$1 \\$git_temp = \"'$fqgitdir/gitweb/tmp'\";#;\n>> +s#(my|our) \\$GITWEB_CONFIG_SYSTEM =.*#$1 \\$GITWEB_CONFIG_SYSTEM = \"\";#;'\n>\n> Perhaps moving the last ' to its own line would help maintaining the\n> script in the longer term?\n\nGood idea; thanks.\n"},{"id":"149802","messageId":"20100903235820.GC4471@burratino","threadId":"24954","inReplyTo":"7vfwxqzqoq.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 1/4] instaweb: ignore GITWEB_CONFIG_SYSTEM","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-09-03T23:58:20Z","receivedAt":"2010-09-03T23:58:20Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Junio C Hamano wrote:\n> Jonathan Nieder <jrnieder@gmail.com> writes:\n\n>> The configuration in /etc/gitweb.conf might specify any old\n>> layout; in particular, it is likely not to be identical to that\n>> which git instaweb sets up.  Noticed by Uwe Kleine-König.\n>\n> I am not sure if this is a reasonable change by reading the above.  In\n> some cases, the file may stale, but in other cases\n\nAh, I missed your point here.  By \"any old layout\", I meant \"an\narbitrary layout\"[1].  Sorry for the lack of clarity.\n\nJonathan\n\n[1] http://www.google.com/search?q=any+old\n"},{"id":"149809","messageId":"7vsk1qxpbp.fsf@alter.siamese.dyndns.org","threadId":"24954","inReplyTo":"20100903235820.GC4471@burratino","subject":"Re: [PATCH 1/4] instaweb: ignore GITWEB_CONFIG_SYSTEM","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-09-04T01:36:10Z","receivedAt":"2010-09-04T01:36:10Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonathan Nieder <jrnieder@gmail.com> writes:\n\n> Junio C Hamano wrote:\n>> Jonathan Nieder <jrnieder@gmail.com> writes:\n>\n>>> The configuration in /etc/gitweb.conf might specify any old\n>>> layout; in particular, it is likely not to be identical to that\n>>> which git instaweb sets up.  Noticed by Uwe Kleine-König.\n>> ...\n> Ah, I missed your point here.  By \"any old layout\", I meant \"an\n> arbitrary layout\"[1].  Sorry for the lack of clarity.\n\nAh, you mean \"instaweb wants to use a specific layout but whatever is\nspecified in /etc/gitweb.conf will interfere with it\"?\n"},{"id":"149812","messageId":"20100904021929.GB9467@burratino","threadId":"24954","inReplyTo":"7vsk1qxpbp.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 1/4] instaweb: ignore GITWEB_CONFIG_SYSTEM","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-09-04T02:19:30Z","receivedAt":"2010-09-04T02:19:30Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Junio C Hamano wrote:\n\n> Ah, you mean \"instaweb wants to use a specific layout but whatever is\n> specified in /etc/gitweb.conf will interfere with it\"?\n\nExactly.\n"}]}