From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 7 Nov 2009 14:35:36 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e?ds=sidebyside;hp=-c

Merge branch 'stable'
---

4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e
diff --combined ui-shared.c
index 6cb7edb,4049a2b..3a9e67b
--- a/ui-shared.c
+++ b/ui-shared.c
@@@ -20,7 -20,7 +20,7 @@@ static char *http_date(time_t t
  		{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
  	static char month[][4] =
  		{"Jan", "Feb", "Mar", "Apr", "May", "Jun",
- 		 "Jul", "Aug", "Sep", "Oct", "Now", "Dec"};
+ 		 "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
  	struct tm *tm = gmtime(&t);
  	return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],
  		   tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year,
@@@ -760,18 -760,13 +760,18 @@@ void cgit_print_snapshot_links(const ch
  			       const char *hex, int snapshots)
  {
  	const struct cgit_snapshot_format* f;
 +	char *prefix;
      	char *filename;
 +	unsigned char sha1[20];
  
 +	if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 &&
 +	    (hex[0] == 'v' || hex[0] == 'V') && isdigit(hex[1]))
 +		hex++;
 +	prefix = xstrdup(fmt("%s-%s", cgit_repobasename(repo), hex));
  	for (f = cgit_snapshot_formats; f->suffix; f++) {
  		if (!(snapshots & f->bit))
  			continue;
 -		filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
 -			       f->suffix);
 +		filename = fmt("%s%s", prefix, f->suffix);
  		cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);
  		html("<br/>");
  	}