mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blame and annotate: show localtime with timezone.

Browse Source 
Earlier they showed gmtime and timezone, which was inconsistent
with the way our commits and tags are pretty-printed.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2006-03-05 14:48:01 -08:00
parent a0fb95e319
commit cfea8e077b
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
blame.c
View File

@ -550,13 +550,22 @@ static void get_commit_info(struct commit* commit, struct commit_info* ret)
*tmp = 0; *tmp = 0;
} }
char* format_time(unsigned long time, const char* tz) static const char* format_time(unsigned long time, const char* tz_str)
{ {
static char time_buf[128]; static char time_buf[128];
time_t t = time; time_t t = time;
int minutes, tz;
struct tm *tm;
strftime(time_buf, sizeof(time_buf), "%Y-%m-%d %H:%M:%S ", gmtime(&t)); tz = atoi(tz_str);
strcat(time_buf, tz); minutes = tz < 0 ? -tz : tz;
minutes = (minutes / 100)*60 + (minutes % 100);
minutes = tz < 0 ? -minutes : minutes;
t = time + minutes * 60;
tm = gmtime(&t);
strftime(time_buf, sizeof(time_buf), "%Y-%m-%d %H:%M:%S ", tm);
strcat(time_buf, tz_str);
return time_buf; return time_buf;
} }

8
git-annotate.perl
View File

@ -418,7 +418,13 @@ sub format_date {
return $_[0]; return $_[0];
} }
my ($timestamp, $timezone) = split(' ', $_[0]); my ($timestamp, $timezone) = split(' ', $_[0]);
return strftime("%Y-%m-%d %H:%M:%S " . $timezone, gmtime($timestamp)); my $minutes = abs($timezone);
$minutes = int($minutes / 100) * 60 + ($minutes % 100);
if ($timezone < 0) {
$minutes = -$minutes;
}
my $t = $timestamp + $minutes * 60;
return strftime("%Y-%m-%d %H:%M:%S " . $timezone, gmtime($t));
} }
# Copied from git-send-email.perl - We need a Git.pm module.. # Copied from git-send-email.perl - We need a Git.pm module..