From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 Aug 2009 03:42:38 +0000 (-0700)
Subject: Merge branch 'maint-1.6.2' into maint-1.6.3
X-Git-Tag: v1.6.4.2~4^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5e64650d938d7a23b73532b4a68bc6bd08cfd041?ds=inline;hp=-c

Merge branch 'maint-1.6.2' into maint-1.6.3

* maint-1.6.2:
Fix overridable written with an extra 'e'
Documentation: git-archive: mark --format as optional in summary
Round-down years in "years+months" relative date view

Conflicts:
Documentation/git-archive.txt
---

5e64650d938d7a23b73532b4a68bc6bd08cfd041
diff --combined Documentation/git-archive.txt
index bc132c87e1,105a31a088..92444ddf10
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@@ -9,8 -9,7 +9,8 @@@ git-archive - Create an archive of file
  SYNOPSIS
  --------
  [verse]
- 'git archive' --format=<fmt> [--list] [--prefix=<prefix>/] [<extra>]
+ 'git archive' [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]
 +	      [--output=<file>] [--worktree-attributes]
  	      [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>
  	      [path...]
  
@@@ -48,12 -47,6 +48,12 @@@ OPTION
  --prefix=<prefix>/::
  	Prepend <prefix>/ to each filename in the archive.
  
 +--output=<file>::
 +	Write the archive to <file> instead of stdout.
 +
 +--worktree-attributes::
 +	Look for attributes in .gitattributes in working directory too.
 +
  <extra>::
  	This can be any options that the archiver backend understands.
  	See next section.
diff --combined gitweb/gitweb.perl
index 3f99361ed0,43fa791de0..6f355d8069
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@@ -376,7 -376,7 +376,7 @@@ sub gitweb_get_feature 
  		@{$feature{$name}{'default'}});
  	if (!$override) { return @defaults; }
  	if (!defined $sub) {
- 		warn "feature $name is not overrideable";
+ 		warn "feature $name is not overridable";
  		return @defaults;
  	}
  	return $sub->(@defaults);
@@@ -688,10 -688,10 +688,10 @@@ sub evaluate_path_info 
  		# extensions. Allowed extensions are both the defined suffix
  		# (which includes the initial dot already) and the snapshot
  		# format key itself, with a prepended dot
 -		while (my ($fmt, %opt) = each %known_snapshot_formats) {
 +		while (my ($fmt, $opt) = each %known_snapshot_formats) {
  			my $hash = $refname;
  			my $sfx;
 -			$hash =~ s/(\Q$opt{'suffix'}\E|\Q.$fmt\E)$//;
 +			$hash =~ s/(\Q$opt->{'suffix'}\E|\Q.$fmt\E)$//;
  			next unless $sfx = $1;
  			# a valid suffix was found, so set the snapshot format
  			# and reset the hash parameter