git-instaweb overwrites gitweb_config.perl

[David Decotigny]

Patch against 1:1.7.7.3-1 attached.

Description: If I edit the .git/gitweb/gitweb_config.perl file and then restart a git-instaweb instance, my modifications to the config file will be overwritten by the default config. This is because there is a call to gitweb_conf() without checking pre-existence of a gitweb config file. Furthermore, this call is not needed, for a correct call (guarded by existence of config file) is already there in start_httpd.

Tested on lucid (1.7.7.3 rebuilt from sources). Should address bug on precise as well.

[Ubuntu Foundations Team Bug Bot (crichton)]

The attachment "on top of 1:1.7.7.3-1 for precise" of this bug report has been identified as being a patch. The ubuntu-reviewers team has been subscribed to the bug report so that they can review the patch. In the event that this is in fact not a patch you can resolve this situation by removing the tag 'patch' from the bug report and editing the attachment so that it is not flagged as a patch. Additionally, if you are member of the ubuntu-reviewers team please also unsubscribe the team from this bug report.

[This is an automated message performed by a Launchpad user owned by Brian Murray. Please contact him regarding any issues with the action taken in this bug report.]

[Anders Kaseorg (andersk)]

Hi David, thanks for your patch. Can you please submit it upstream by following the directions in Documentation/SubmittingPatches? Then the fix will make its way into Ubuntu after upstream releases a new version.

(It would be inconvenient for Ubuntu to take the patch directly because we would stop getting automatic updates from Debian, and manual work would be required to merge each new version.)