summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2009-09-24 08:28:15 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2009-09-29 17:06:49 (GMT)
commitf4ea32f0b48bc300afcb7c980c5a294deba31daa (patch)
tree74df0bb631868cd5483b62f301ba0e854969bd55 /revision.c
parent1be224ba6e99f0ab34c998d7fa8023b76a15c8b6 (diff)
downloadgit-f4ea32f0b48bc300afcb7c980c5a294deba31daa.zip
git-f4ea32f0b48bc300afcb7c980c5a294deba31daa.tar.gz
git-f4ea32f0b48bc300afcb7c980c5a294deba31daa.tar.bz2
improve reflog date/number heuristic
When we show a reflog, we have two ways of naming the entry: by sequence number (e.g., HEAD@{0}) or by date (e.g., HEAD@{10 minutes ago}). There is no explicit option to set one or the other, but we guess based on whether or not the user has provided us with a date format, showing them the date version if they have done so, and the sequence number otherwise. This usually made sense if the use did something like "git log -g --date=relative". However, it didn't make much sense if the user set the date format using the log.date config variable; in that case, all of their reflogs would end up as dates. This patch records the source of the date format and only triggers the date-based view if --date= was given on the command line. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'revision.c')
-rw-r--r--revision.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/revision.c b/revision.c
index 35eca4a..9fc4e8d 100644
--- a/revision.c
+++ b/revision.c
@@ -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;
}