{"thread":{"id":"27691","subject":"Having some problem with instaweb","startedAt":"2011-06-23T01:06:41Z","lastAt":"2011-06-28T03:22:20Z","messageCount":10,"participants":["Gurjeet Singh","Jakub Narebski","Eric Wong"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"170484","messageId":"BANLkTim6gLg_-UdG36TXWS0Mfj3MOAQ_3w@mail.gmail.com","threadId":"27691","inReplyTo":null,"subject":"Having some problem with instaweb","fromName":"Gurjeet Singh","fromEmail":"singh.gurjeet@gmail.com","sentAt":"2011-06-23T01:06:41Z","receivedAt":"2011-06-23T01:06:41Z","isPatch":false,"sender":{"key":"singh.gurjeet@gmail.com","avatar":null},"body":"I am on Linux Mint 10 and I tried the following command:\n\n$ git instaweb -d apache2 -p 1234 --start\nSyntax error on line 1 of /mnt/storage/gurjeet/.git/gitweb/httpd.conf:\nInvalid command 'server.document-root', perhaps misspelled or defined\nby a module not included in the server configuration\nCould not execute http daemon apache2 -f.\n\n\n/mnt/storage/gurjeet/ is my $HOME.\n\nI have tried commenting out that first line, but then the error\ncomplains about line 2 'server.port = 1234'\n\nAny help appreciated.\n\nThanks in advance.\n\nPS: I am told that no subscription is required on this mailing list,\nsince people usually do reply-all; so relying on that.\n--\nGurjeet Singh\nEnterpriseDB Corporation\nThe Enterprise PostgreSQL Company\n"},{"id":"170492","messageId":"m3iprx554t.fsf@localhost.localdomain","threadId":"27691","inReplyTo":"BANLkTim6gLg_-UdG36TXWS0Mfj3MOAQ_3w@mail.gmail.com","subject":"Re: Having some problem with instaweb","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2011-06-23T08:23:05Z","receivedAt":"2011-06-23T08:23:05Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"CC-ing Eric Wong, author of git-instaweb.\n\nGurjeet Singh <singh.gurjeet@gmail.com> writes:\n\n> I am on Linux Mint 10 and I tried the following command:\n> \n> $ git instaweb -d apache2 -p 1234 --start\n> Syntax error on line 1 of /mnt/storage/gurjeet/.git/gitweb/httpd.conf:\n> Invalid command 'server.document-root', perhaps misspelled or defined\n> by a module not included in the server configuration\n> Could not execute http daemon apache2 -f.\n\nHmmm... it looks like starts apache2, but generates config file\n(httpd.conf) for lighttpd instead.\n\nAhh... actually you started apache2, but didn't generate configuration\nfile for it, so git-instaweb re-uses previous config file... which by\ndefault is lighttpd:\n\n  start, --start\n      Start the httpd instance and exit. This does not generate any of the\n      configuration files for spawning a new instance.\n\nTry using\n\n  $ git instaweb -d apache2 -p 1234 -b lynx\n \nthen exiting web browser.\n\n\nBTW. I think that git-instaweb should be more helpful here... will\ninvestigate.\n\n> /mnt/storage/gurjeet/ is my $HOME.\n\nNb. it doesn't mater where $HOME is, but where is git repository you\nwere in when calling git-instaweb.\n\n\nBTW. in the future it would be good idea to tell what git version are\nyou using.\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"},{"id":"170494","messageId":"BANLkTinvSt9xGNSRKLGucsRKoChMfs_b9w@mail.gmail.com","threadId":"27691","inReplyTo":"m3iprx554t.fsf@localhost.localdomain","subject":"Re: Having some problem with instaweb","fromName":"Gurjeet Singh","fromEmail":"singh.gurjeet@gmail.com","sentAt":"2011-06-23T11:48:11Z","receivedAt":"2011-06-23T11:48:11Z","isPatch":false,"sender":{"key":"singh.gurjeet@gmail.com","avatar":null},"body":"On Thu, Jun 23, 2011 at 4:23 AM, Jakub Narebski <jnareb@gmail.com> wrote:\n> CC-ing Eric Wong, author of git-instaweb.\n>\n> Gurjeet Singh <singh.gurjeet@gmail.com> writes:\n>\n>> I am on Linux Mint 10 and I tried the following command:\n>>\n>> $ git instaweb -d apache2 -p 1234 --start\n>> Syntax error on line 1 of /mnt/storage/gurjeet/.git/gitweb/httpd.conf:\n>> Invalid command 'server.document-root', perhaps misspelled or defined\n>> by a module not included in the server configuration\n>> Could not execute http daemon apache2 -f.\n>\n> Hmmm... it looks like starts apache2, but generates config file\n> (httpd.conf) for lighttpd instead.\n>\n> Ahh... actually you started apache2, but didn't generate configuration\n> file for it, so git-instaweb re-uses previous config file... which by\n> default is lighttpd:\n>\n>  start, --start\n>      Start the httpd instance and exit. This does not generate any of the\n>      configuration files for spawning a new instance.\n\nNow that's very unintuitive.... I am the impatient kind, and didn't\nread the whole paragraph. I assumed --start would just start the\nwebserver (maybe run in daemon mode).\n\n>\n> Try using\n>\n>  $ git instaweb -d apache2 -p 1234 -b lynx\n\nThat worked.. I do not have lynx, but it did start apache2 and I was\nable to browse the repo.\n\n>\n> then exiting web browser.\n>\n>\n> BTW. I think that git-instaweb should be more helpful here... will\n> investigate.\n>\n>> /mnt/storage/gurjeet/ is my $HOME.\n>\n> Nb. it doesn't mater where $HOME is, but where is git repository you\n> were in when calling git-instaweb.\n\nGot it. I have some files of my home directory in a Git repository, so\n$HOME is where the repository is.\n\nI have quite a few development related Git repositories under\n$HOME/dev/ and instaweb shows all of them on the first page (with\ndescription etc). IOW, is it supposed to recurse down all directories\nto look for .git/ directories?\n\n.git\ndev/EDB-ADVISORS/.git\ndev/EDBAS/.git\ndev/PCS/.git\ndev/PEM/.git\ndev/PGAGENT/.git\ndev/POSTGRES/.git\ndev/SERVICESTOOLS/.git\ndev/SLONY/.git\n\nIs this expected?\n\n>\n>\n> BTW. in the future it would be good idea to tell what git version are\n> you using.\n\nI am at 1.7.1\n\n\nThanks for the help, and thanks to everyone around Git for a great\npiece of software.\n-- \nGurjeet Singh\nEnterpriseDB Corporation\nThe Enterprise PostgreSQL Company\n"},{"id":"170512","messageId":"201106232129.22137.jnareb@gmail.com","threadId":"27691","inReplyTo":"BANLkTinvSt9xGNSRKLGucsRKoChMfs_b9w@mail.gmail.com","subject":"Re: Having some problem with instaweb","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2011-06-23T19:29:21Z","receivedAt":"2011-06-23T19:29:21Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"On Thu, 23 Jun 2011, Gurjeet Singh wrote:\n> On Thu, Jun 23, 2011 at 4:23 AM, Jakub Narebski <jnareb@gmail.com> wrote:\n>> Gurjeet Singh <singh.gurjeet@gmail.com> writes:\n>>\n>>> I am on Linux Mint 10 and I tried the following command:\n>>>\n>>> $ git instaweb -d apache2 -p 1234 --start\n>>> Syntax error on line 1 of /mnt/storage/gurjeet/.git/gitweb/httpd.conf:\n>>> Invalid command 'server.document-root', perhaps misspelled or defined\n>>> by a module not included in the server configuration\n>>> Could not execute http daemon apache2 -f.\n>>\n>> Hmmm... it looks like starts apache2, but generates config file\n>> (httpd.conf) for lighttpd instead.\n>>\n>> Ahh... actually you started apache2, but didn't generate configuration\n>> file for it, so git-instaweb re-uses previous config file... which by\n>> default is lighttpd:\n>>\n>>  start, --start\n>>      Start the httpd instance and exit. This does not generate any of the\n>>      configuration files for spawning a new instance.\n> \n> Now that's very unintuitive.... I am the impatient kind, and didn't\n> read the whole paragraph. I assumed --start would just start the\n> webserver (maybe run in daemon mode).\n\nI'm working on it... actually the patch series is ready to send; it will\nbe sent as a reply to this email.\n\nI just hope that it wouldn't be lost being deeper in thread...\n \n>>> /mnt/storage/gurjeet/ is my $HOME.\n>>\n>> Nb. it doesn't mater where $HOME is, but where is git repository you\n>> were in when calling git-instaweb.\n> \n> Got it. I have some files of my home directory in a Git repository, so\n> $HOME is where the repository is.\n> \n> I have quite a few development related Git repositories under\n> $HOME/dev/ and instaweb shows all of them on the first page (with\n> description etc). IOW, is it supposed to recurse down all directories\n> to look for .git/ directories?\n> \n> .git\n> dev/EDB-ADVISORS/.git\n> dev/EDBAS/.git\n> dev/PCS/.git\n> dev/PEM/.git\n> dev/PGAGENT/.git\n> dev/POSTGRES/.git\n> dev/SERVICESTOOLS/.git\n> dev/SLONY/.git\n> \n> Is this expected?\n\nIt is expected behavior.\n\n\nIt is consequence of the fact that the default gitweb mode is to search\nfor repositories recursively starting from given root; git-instaweb set\nthis $projectsroot to the one directory up from $GIT_DIR.  Alternate\nsolution would be for git-instaweb to generate projects list file for\ngitweb with only single repository listed...\n\nNevertheless usually you don't have repositories inside of working\ndirectory of other repositories. There was even idea floated to deprecate\nsuch support, but it didn't gained traction.\n\nOne expected exception is when you use _submodules_; in this case you\nwould probably want to see both supermodule and submodules (subrepositories).\n\nThat is why I think that current git-instaweb behavior has sense.\n\n-- \nJakub Narebski\nPoland\n"},{"id":"170513","messageId":"20110623194624.18265.82482.stgit@localhost.localdomain","threadId":"27691","inReplyTo":"201106232129.22137.jnareb@gmail.com","subject":"[PATCH 0/4] git-instaweb: Improving handling of --start/--restart","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2011-06-23T19:50:55Z","receivedAt":"2011-06-23T19:50:55Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"This series fixes the issue reported by Gurheet Singh in \"Having some\nproblem with instaweb\", in that --start/--restart doesn't generate\nconfiguration, which is documented:\n\n  start, --start\n      Start the httpd instance and exit. This does not generate any of the\n      configuration files for spawning a new instance.\n\nbut unexpected.\n\nThe first three patches are independent refactoring to make final\nchange smaller and easier to review, thoug they have merit even taken\nstandalone.\n\n---\nJakub Narebski (4):\n      git-instaweb: Check that correct config file exists for (re)start\n      git-instaweb: Move all actions at the end of script\n      git-instaweb: Use $conf, not $fqgitdir/gitweb/httpd.conf\n      git-instaweb: Extract web server configuration into configure_httpd\n\n Documentation/git-instaweb.txt |    8 ++--\n git-instaweb.sh                |   84 ++++++++++++++++++++++++++--------------\n 2 files changed, 58 insertions(+), 34 deletions(-)\n\n-- \nJakub Narebski\nShadeHawk on #git\nPoland\n"},{"id":"170514","messageId":"20110623195111.18265.77040.stgit@localhost.localdomain","threadId":"27691","inReplyTo":"20110623194624.18265.82482.stgit@localhost.localdomain","subject":"[PATCH 1/4] git-instaweb: Extract configuring web server into configure_httpd","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2011-06-23T19:55:00Z","receivedAt":"2011-06-23T19:55:00Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"This is preparatory work for making start/restart check that\ngit-instaweb set up correct configuration, and generate it if it is\nmissing.\n\nPure refactoring, no functional changes. \n\nSigned-off-by: Jakub Narebski <jnareb@gmail.com>\n---\nAs usual, you can check this change with\n\n  $ git blame -w --date=short -C -C HEAD^.. -- git-instaweb.sh |\n    grep -C 3 -e '^[^^]' | less -S\n\nassuming that it is checked out (HEAD == this commit).\n\nThanks Junio for the tip!\n\n\nNb. it would be nice to have an option to 'git diff' which would\nfunction like '-w' but ignore code movement...\n\n git-instaweb.sh |   46 +++++++++++++++++++++++++---------------------\n 1 files changed, 25 insertions(+), 21 deletions(-)\n\ndiff --git a/git-instaweb.sh b/git-instaweb.sh\nindex 8bfa8a0..49bab7b 100755\n--- a/git-instaweb.sh\n+++ b/git-instaweb.sh\n@@ -587,32 +587,36 @@ our \\$projects_list = \\$projectroot;\n EOF\n }\n \n+configure_httpd() {\n+\tcase \"$httpd\" in\n+\t*lighttpd*)\n+\t\tlighttpd_conf\n+\t\t;;\n+\t*apache2*|*httpd*)\n+\t\tapache2_conf\n+\t\t;;\n+\twebrick)\n+\t\twebrick_conf\n+\t\t;;\n+\t*mongoose*)\n+\t\tmongoose_conf\n+\t\t;;\n+\t*plackup*)\n+\t\tplackup_conf\n+\t\t;;\n+\t*)\n+\t\techo \"Unknown httpd specified: $httpd\"\n+\t\texit 1\n+\t\t;;\n+\tesac\n+}\n+\n gitweb_conf\n \n resolve_full_httpd\n mkdir -p \"$fqgitdir/gitweb/$httpd_only\"\n \n-case \"$httpd\" in\n-*lighttpd*)\n-\tlighttpd_conf\n-\t;;\n-*apache2*|*httpd*)\n-\tapache2_conf\n-\t;;\n-webrick)\n-\twebrick_conf\n-\t;;\n-*mongoose*)\n-\tmongoose_conf\n-\t;;\n-*plackup*)\n-\tplackup_conf\n-\t;;\n-*)\n-\techo \"Unknown httpd specified: $httpd\"\n-\texit 1\n-\t;;\n-esac\n+configure_httpd\n \n start_httpd\n url=http://127.0.0.1:$port\n"},{"id":"170515","messageId":"20110623195516.18265.825.stgit@localhost.localdomain","threadId":"27691","inReplyTo":"20110623194624.18265.82482.stgit@localhost.localdomain","subject":"[PATCH 2/4] git-instaweb: Use $conf, not $fqgitdir/gitweb/httpd.conf","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2011-06-23T19:56:37Z","receivedAt":"2011-06-23T19:56:37Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Don't repeat yourself: use \"$conf\" instead of its [current] contents,\nnamely \"$fqgitdir/gitweb/httpd.conf\".\n\nSigned-off-by: Jakub Narebski <jnareb@gmail.com>\n---\nStraighforward improvement.  Note that currently $conf is constant,\nand doesn't change its value.\n\n git-instaweb.sh |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/git-instaweb.sh b/git-instaweb.sh\nindex 49bab7b..2be22a0 100755\n--- a/git-instaweb.sh\n+++ b/git-instaweb.sh\n@@ -103,7 +103,7 @@ start_httpd () {\n \tcase \"$httpd\" in\n \t*mongoose*|*plackup*)\n \t\t#These servers don't have a daemon mode so we'll have to fork it\n-\t\t$full_httpd \"$fqgitdir/gitweb/httpd.conf\" &\n+\t\t$full_httpd \"$conf\" &\n \t\t#Save the pid before doing anything else (we'll print it later)\n \t\tpid=$!\n \n@@ -117,7 +117,7 @@ $pid\n EOF\n \t\t;;\n \t*)\n-\t\t$full_httpd \"$fqgitdir/gitweb/httpd.conf\"\n+\t\t$full_httpd \"$conf\"\n \t\tif test $? != 0; then\n \t\t\techo \"Could not execute http daemon $httpd.\"\n \t\t\texit 1\n"},{"id":"170517","messageId":"20110623195652.18265.50516.stgit@localhost.localdomain","threadId":"27691","inReplyTo":"20110623194624.18265.82482.stgit@localhost.localdomain","subject":"[PATCH 3/4] git-instaweb: Move all actions at the end of script","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2011-06-23T20:59:26Z","receivedAt":"2011-06-23T20:59:26Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"As a nice side-effect now the order of parameters does not matter:\n\n  $ git instaweb --httpd=apache2 --start\n\nis now (after this patch) the same as\n\n  $ git instaweb --start --httpd=apache2\n\nBefore this commit --start, --stop, --restart (and their subcommand\nversions start, stop, restart) exited immediately.\n\n\nThis is preparatory work for making start/restart check that correct\nconfiguration is set up; this change was required to have access in\nstart_httpd to requested web browser etc.\n\nSigned-off-by: Jakub Narebski <jnareb@gmail.com>\n---\nUnfortunately there are no tests for git-instaweb, so I couldn't test\nif it is really no much of a functional change.\n\nBTW. if you thought of a better subject for this commit, please speak\nup.\n\n git-instaweb.sh |   27 ++++++++++++++++++++-------\n 1 files changed, 20 insertions(+), 7 deletions(-)\n\ndiff --git a/git-instaweb.sh b/git-instaweb.sh\nindex 2be22a0..9a2f20f 100755\n--- a/git-instaweb.sh\n+++ b/git-instaweb.sh\n@@ -27,6 +27,7 @@ httpd=\"$(git config --get instaweb.httpd)\"\n root=\"$(git config --get instaweb.gitwebdir)\"\n port=$(git config --get instaweb.port)\n module_path=\"$(git config --get instaweb.modulepath)\"\n+action=\"browse\"\n \n conf=\"$GIT_DIR/gitweb/httpd.conf\"\n \n@@ -148,17 +149,13 @@ while test $# != 0\n do\n \tcase \"$1\" in\n \t--stop|stop)\n-\t\tstop_httpd\n-\t\texit 0\n+\t\taction=\"stop\"\n \t\t;;\n \t--start|start)\n-\t\tstart_httpd\n-\t\texit 0\n+\t\taction=\"start\"\n \t\t;;\n \t--restart|restart)\n-\t\tstop_httpd\n-\t\tstart_httpd\n-\t\texit 0\n+\t\taction=\"restart\"\n \t\t;;\n \t-l|--local)\n \t\tlocal=true\n@@ -611,6 +608,22 @@ configure_httpd() {\n \tesac\n }\n \n+case \"$action\" in\n+stop)\n+\tstop_httpd\n+\texit 0\n+\t;;\n+start)\n+\tstart_httpd\n+\texit 0\n+\t;;\n+restart)\n+\tstop_httpd\n+\tstart_httpd\n+\texit 0\n+\t;;\n+esac\n+\n gitweb_conf\n \n resolve_full_httpd\n"},{"id":"170518","messageId":"20110623205942.18265.5903.stgit@localhost.localdomain","threadId":"27691","inReplyTo":"20110623194624.18265.82482.stgit@localhost.localdomain","subject":"[PATCH 4/4] git-instaweb: Check that correct config file exists for (re)start","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2011-06-23T21:01:03Z","receivedAt":"2011-06-23T21:01:03Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Currently start/restart does not generate any configuration files for\nspawning a new instance.  This means that\n\n  $ git instaweb --http=<server> --start\n\nmight pick up stale 'httpd.conf' file for a different web server\n(e.g. for default lighttpd when requesting apache2).\n\nThis commit changes that, and makes git-instaweb generate web server\nconfig file and/or gitweb config file if don't exists.\n\nThis required naming config files after the name of web server\n(alternate solution would be to somehow mark for which web server was\nconfig file generated).\n\nNote that web servers that embed configuration in server script file,\nnamely webrick and plackup, and which delete \"$conf\" in their *_conf\nfunction, would have their config (server script) always regenerated.\n\n\nNote: this commit introduces a bit of code repetition (but only a few\nlines).\n\nReported-by: Gurjeet Singh <singh.gurjeet@gmail.com>\nSigned-off-by: Jakub Narebski <jnareb@gmail.com>\n---\nThis is an actual fix.\n\nThough I haven't checked if git-instaweb behaves sanely if you switch\nbetween web servers with --start...\n\n Documentation/git-instaweb.txt |    8 ++++----\n git-instaweb.sh                |    7 +++++++\n 2 files changed, 11 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-instaweb.txt b/Documentation/git-instaweb.txt\nindex 08f85ba..ea95c90 100644\n--- a/Documentation/git-instaweb.txt\n+++ b/Documentation/git-instaweb.txt\n@@ -51,8 +51,8 @@ OPTIONS\n \n start::\n --start::\n-\tStart the httpd instance and exit.  This does not generate\n-\tany of the configuration files for spawning a new instance.\n+\tStart the httpd instance and exit.  Regenerate configuration files\n+\tas necessary for spawning a new instance.\n \n stop::\n --stop::\n@@ -62,8 +62,8 @@ stop::\n \n restart::\n --restart::\n-\tRestart the httpd instance and exit.  This does not generate\n-\tany of the configuration files for spawning a new instance.\n+\tRestart the httpd instance and exit.  Regenerate configuration files\n+\tas necessary for spawning a new instance.\n \n CONFIGURATION\n -------------\ndiff --git a/git-instaweb.sh b/git-instaweb.sh\nindex 9a2f20f..01a1b05 100755\n--- a/git-instaweb.sh\n+++ b/git-instaweb.sh\n@@ -99,6 +99,12 @@ start_httpd () {\n \n \t# here $httpd should have a meaningful value\n \tresolve_full_httpd\n+\tmkdir -p \"$fqgitdir/gitweb/$httpd_only\"\n+\tconf=\"$fqgitdir/gitweb/$httpd_only.conf\"\n+\n+\t# generate correct config file if it doesn't exist\n+\ttest -f \"$conf\" || configure_httpd\n+\ttest -f \"$fqgitdir/gitweb/gitweb_config.perl\" || gitweb_conf\n \n \t# don't quote $full_httpd, there can be arguments to it (-f)\n \tcase \"$httpd\" in\n@@ -628,6 +634,7 @@ gitweb_conf\n \n resolve_full_httpd\n mkdir -p \"$fqgitdir/gitweb/$httpd_only\"\n+conf=\"$fqgitdir/gitweb/$httpd_only.conf\"\n \n configure_httpd\n \n"},{"id":"170603","messageId":"20110628032220.GA32199@dcvr.yhbt.net","threadId":"27691","inReplyTo":"20110623194624.18265.82482.stgit@localhost.localdomain","subject":"Re: [PATCH 0/4] git-instaweb: Improving handling of --start/--restart","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2011-06-28T03:22:20Z","receivedAt":"2011-06-28T03:22:20Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Jakub Narebski <jnareb@gmail.com> wrote:\n> This series fixes the issue reported by Gurheet Singh in \"Having some\n> problem with instaweb\", in that --start/--restart doesn't generate\n> configuration, which is documented:\n\nEverything looks reasonable, thanks!  Acked and pushed to \"instaweb\"\nbranch on git://bogomips.org/git-svn.git\n\n-- \nEric Wong\n"}]}