development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jk/reflog-date'

Browse source 
* jk/reflog-date:
  improve reflog date/number heuristic
This commit is contained in:
Junio C Hamano 2009-10-09 16:26:11 -07:00
parent 170a4814d3 f4ea32f0b4
commit 302e99b79a
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
log-tree.c
View file

@ -390,7 +390,9 @@ void show_log(struct rev_info *opt)
*/
show_reflog_message(opt->reflog_info,
opt->commit_format == CMIT_FMT_ONELINE,
opt->date_mode);
opt->date_mode_explicit ?
opt->date_mode :
DATE_NORMAL);
if (opt->commit_format == CMIT_FMT_ONELINE)
return;
}

2
revision.c
View file

@ -1159,8 +1159,10 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
revs->simplify_history = 0;
} else if (!strcmp(arg, "--relative-date")) {
revs->date_mode = DATE_RELATIVE;
revs->date_mode_explicit = 1;
} else if (!strncmp(arg, "--date=", 7)) {
revs->date_mode = parse_date_format(arg + 7);
revs->date_mode_explicit = 1;
} else if (!strcmp(arg, "--log-size")) {
revs->show_log_size = 1;
}

3
revision.h
View file

@ -81,7 +81,8 @@ struct rev_info {
show_merge:1,
abbrev_commit:1,
use_terminator:1,
missing_newline:1;
missing_newline:1,
date_mode_explicit:1;
enum date_mode date_mode;
unsigned int abbrev;