summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-03 19:06:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-06-03 19:06:46 (GMT)
commite1857af92389f47e9365b4f8a718831fa6f96db0 (patch)
tree344e40e32dca647d8bc269b233fb671954f218f0 /cache.h
parent6753d8a85d543253d95184ec2faad6dc197f2486 (diff)
parent14ac2864dcd566a025e449ab9db6b5dc57744a32 (diff)
downloadgit-e1857af92389f47e9365b4f8a718831fa6f96db0.zip
git-e1857af92389f47e9365b4f8a718831fa6f96db0.tar.gz
git-e1857af92389f47e9365b4f8a718831fa6f96db0.tar.bz2
Merge branch 'jk/commit-date-approxidate'
* jk/commit-date-approxidate: commit: accept more date formats for "--date" commit: print "Date" line when the user has set date pretty: make show_ident_date public commit: use split_ident_line to compare author/committer
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index 557bd6a..62a4d39 100644
--- a/cache.h
+++ b/cache.h
@@ -1062,6 +1062,13 @@ struct ident_split {
extern int split_ident_line(struct ident_split *, const char *, int);
/*
+ * Like show_date, but pull the timestamp and tz parameters from
+ * the ident_split. It will also sanity-check the values and produce
+ * a well-known sentinel date if they appear bogus.
+ */
+const char *show_ident_date(const struct ident_split *id, enum date_mode mode);
+
+/*
* Compare split idents for equality or strict ordering. Note that we
* compare only the ident part of the line, ignoring any timestamp.
*