Package: ikiwiki
Version: 1.40
Severity: normal
Tags: patch
The GIT backend works only when using the default branches "master" and
"origin".
Using other branches wrecks havoc, as the working branch is force-overloaded
with stuff from the
possibly largely different branches.
The attached patch fixes this (or at least worked for me...).
Keep up the great work on this excellent tool, Joey!
- Jonas
-- System Information:
Debian Release: 4.0
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: powerpc (ppc)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-3-powerpc
Locale: LANG=da_DK.UTF-8, LC_CTYPE=da_DK.UTF-8 (charmap=UTF-8)
Versions of packages ikiwiki depends on:
ii gcc [c-compiler] 4:4.1.1-15 The GNU C compiler
ii gcc-4.1 [c-compiler] 4.1.1-21 The GNU C compiler
ii libc6-dev [libc-dev] 2.3.6.ds1-10 GNU C Library: Development Librari
ii libcgi-formbuilder-perl 3.05-1 Easily generate and process statef
ii libcgi-session-perl 4.20-1 Persistent session data in CGI app
ii libhtml-parser-perl 3.56-1 A collection of modules that parse
ii libhtml-scrubber-perl 0.08-3 Perl extension for scrubbing/sanit
ii libhtml-template-perl 2.8-1 HTML::Template : A module for usin
ii libmail-sendmail-perl 0.79-4 Send email from a perl script
ii libtime-duration-perl 1.02-1 Time::Duration -- rounded or exact
ii libtimedate-perl 1.1600-5 Time and date functions for Perl
ii liburi-perl 1.35-2 Manipulates and accesses URI strin
ii libxml-simple-perl 2.14-5 Perl module for reading and writin
ii markdown 1.0.1-6 Text-to-HTML conversion tool
ii perl 5.8.8-7 Larry Wall's Practical Extraction
Versions of packages ikiwiki recommends:
ii git-core 1:1.4.4.4-1 content addressable filesystem
ii hyperestraier 1.4.9-1.1 a full-text search system for comm
ii mercurial 0.9.3-2 Scalable distributed version contr
ii subversion 1.4.2dfsg1-2 Advanced version control system
-- no debconf information
--- git.pm.orig 2006-11-26 21:06:47.000000000 +0100
+++ git.pm 2007-01-27 10:45:45.000000000 +0100
@@ -8,8 +8,9 @@
package IkiWiki;
-my $origin_branch = 'origin'; # Git ref for main repository
-my $master_branch = 'master'; # working branch
+# Git ref for main repository (origin) and working branch (master)
+my $origin_branch = defined($config{origin_branch}) ?
$config{origin_branch} : 'origin';
+my $master_branch = defined($config{master_branch}) ?
$config{master_branch} : 'master';
my $sha1_pattern = qr/[0-9a-fA-F]{40}/; # pattern to validate Git sha1sums
my $dummy_commit_msg = 'dummy commit'; # message to skip in recent changes
