Your message dated Mon, 21 Jul 2008 15:47:03 +0000
with message-id <[EMAIL PROTECTED]>
and subject line Bug#451023: fixed in ikiwiki 2.54
has caused the Debian Bug report #451023,
regarding ikiwiki: Put username and email adress into git's author field
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [EMAIL PROTECTED]
immediately.)
--
451023: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=451023
Debian Bug Tracking System
Contact [EMAIL PROTECTED] with problems
--- Begin Message ---
Package: ikiwiki
Version: 2.9
Severity: wishlist
Tags: patch
This is the second part of my "submit changes from fd.org that might be
suitable for upstream" quest.
The following patch is currently being used on cairographics.org.
See also http://ikiwiki.info/todo/git_attribution/ .
>From: Carl Worth <[EMAIL PROTECTED]>
Date: Tue, 3 Jul 2007 15:32:45 -0700
Subject: [PATCH] Put username and email address into git's author field instead
of the commit message
---
Rcs/git.pm | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/Rcs/git.pm b/Rcs/git.pm
index 7f33148..fb4e2da 100644
--- a/Rcs/git.pm
+++ b/Rcs/git.pm
@@ -304,15 +304,6 @@ sub rcs_commit ($$$;$$) { #{{{
my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
- if (defined $user) {
- $message = "web commit by $user" .
- (length $message ? ": $message" : "");
- }
- elsif (defined $ipaddr) {
- $message = "web commit from $ipaddr" .
- (length $message ? ": $message" : "");
- }
-
# XXX: Wiki directory is in the unlocked state when starting this
# action. But it takes time for a Git process to finish its job
# (especially if a merge required), so we must re-lock to prevent
@@ -330,10 +321,12 @@ sub rcs_commit ($$$;$$) { #{{{
return $conflict if defined $conflict;
}
+ my $author = "$user <" . userinfo_get($user, "email") . ">";
+
# git-commit(1) returns non-zero if file has not been really changed.
# so we should ignore its exit status (hence run_or_non).
$message = possibly_foolish_untaint($message);
- if (run_or_non('git-commit', '-m', $message, '-i', $file)) {
+ if (run_or_non('git-commit', "--author='$author'", '-m', $message,
'-i', $file)) {
unlockwiki();
run_or_cry('git-push', $config{gitorigin_branch});
}
--- End Message ---
--- Begin Message ---
Source: ikiwiki
Source-Version: 2.54
We believe that the bug you reported is fixed in the latest version of
ikiwiki, which is due to be installed in the Debian FTP archive:
ikiwiki_2.54.dsc
to pool/main/i/ikiwiki/ikiwiki_2.54.dsc
ikiwiki_2.54.tar.gz
to pool/main/i/ikiwiki/ikiwiki_2.54.tar.gz
ikiwiki_2.54_all.deb
to pool/main/i/ikiwiki/ikiwiki_2.54_all.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Joey Hess <[EMAIL PROTECTED]> (supplier of updated ikiwiki package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Mon, 21 Jul 2008 10:10:52 -0400
Source: ikiwiki
Binary: ikiwiki
Architecture: source all
Version: 2.54
Distribution: unstable
Urgency: low
Maintainer: Joey Hess <[EMAIL PROTECTED]>
Changed-By: Joey Hess <[EMAIL PROTECTED]>
Description:
ikiwiki - a wiki compiler
Closes: 451023
Changes:
ikiwiki (2.54) unstable; urgency=low
.
[ Joey Hess ]
* Make it possible to load setup files w/o running them. Code
needing to do so can call IkiWiki::Setup::load, which will return
a hash of values.
.
[ Josh Triplett ]
* ikiwiki-transition: Fix command-line processing so the prefix_directives
transition works again.
.
[ Joey Hess ]
* template: Add support for a BASENAME variable.
* Fixes creation of pages when clicking on WikiLinks starting with "/".
* Change deb dependencies to list Text::Markdown before markdown, since
the former, while slower, has a much better html parser that avoids
numerous bugs.
* Move yesno function out of inline and into IkiWiki core, not exported.
* Error handling improvement for preprocess hooks. It's now safe to call
error() from such hooks; it will cause a nicely formatted error message
to be inserted into the page.
* Cut the size of the binary package in half by excluding pages for bugs
and todo items from the html shipped in it.
* parentlinks: New plugin, split out of ikiwiki core and enabled by default,
and several new fields added to allow for advanced styling. (intrigeri)
* smileys: Some fixes for escaped smileys.
* smileys: Note that smileys need to be double-escaped for the escaping to
work. Markdown removes one level of escaping.
* Add a postscan hook.
* search: Use postscan hook, avoid updating index when previewing.
* git: Put web committer name/openid/address in the git author field.
The committer's email address is not used (because leaking email addresses
is not liked by many users). Closes: #451023
* git: Fix parsing of git logs with no commit messages at all.
* search: Fixes for title stemming, and use better term for tags.
(Gabriel McManus)
(Rebuilding the wiki on upgrade to this version is recommended if you
use the search plugin.)
.
[ Simon McVittie ]
* meta, inline: Support guid options, to allow forcing a particular url or
uuid in feeds.
* meta: fix title() PageSpec
* Some footer style changes.
* aggregate: Add an `aggregateinternal` option, which allows storing
aggregated data to internal-use files, rather than wiki pages. This
can save disk space, and be faster.
* ikiwiki-transition: Add a `aggregateinternal` transition to rename
the aggregated files.
Checksums-Sha1:
3a4e5d5214c00701a6a6226357925b198ac30fc3 1099 ikiwiki_2.54.dsc
87e997187a4ae60b36105c070e2879d2c757bcdd 876160 ikiwiki_2.54.tar.gz
d499bb03c37a0270e209ae7659c7153a394addfa 750326 ikiwiki_2.54_all.deb
Checksums-Sha256:
293f261021fd59c08b829476e767cb50945d061ca0b2a5f23deff6e13ebfe3c1 1099
ikiwiki_2.54.dsc
7908ca3216e0c01770f8d86ba834d38ccf42c100b464f66316b6cc6f1a1abb8d 876160
ikiwiki_2.54.tar.gz
562f3a9b714789977a26958e9fd0f9e7232eb9de3846b427a479771069071357 750326
ikiwiki_2.54_all.deb
Files:
169278aaf0b42fdf2e38ec563313b321 1099 web optional ikiwiki_2.54.dsc
fc48464008cc84eb15481da4870ce3cf 876160 web optional ikiwiki_2.54.tar.gz
83c03aa2a1eb11c30d66fbb8666ad010 750326 web optional ikiwiki_2.54_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iD8DBQFIhKjk2tp5zXiKP0wRAroqAKDRk8hsaB6ghBh/nmPx7JcsWPLCVgCfdLh+
wtSltB1XGD0d9OeD+/A27h0=
=bWDs
-----END PGP SIGNATURE-----
--- End Message ---
