summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-10-17 15:55:18 -0700
committerJunio C Hamano <gitster@pobox.com>2013-10-17 15:55:18 -0700
commit046180ad9dd36f739f22b1d05b17b23b8c96ce49 (patch)
tree9dd69596ad88648dc3f5332650011eb2784c09cc /cache.h
parentd6a58b7773d142ab6da47eca94f83b9c8e6dad5e (diff)
parent662cc30cd048f2ccd7ba8d1540e0768ae264c0dd (diff)
downloadgit-046180ad9dd36f739f22b1d05b17b23b8c96ce49.tar.gz
Merge branch 'jk/format-patch-from'
"format-patch --from=<whom>" forgot to omit unnecessary in-body from line, i.e. when <whom> is the same as the real author. * jk/format-patch-from: format-patch: print in-body "From" only when needed
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index 2d86b695a9..5e3fc72fd4 100644
--- a/cache.h
+++ b/cache.h
@@ -957,6 +957,15 @@ struct ident_split {
*/
extern int split_ident_line(struct ident_split *, const char *, int);
+/*
+ * Compare split idents for equality or strict ordering. Note that we
+ * compare only the ident part of the line, ignoring any timestamp.
+ *
+ * Because there are two fields, we must choose one as the primary key; we
+ * currently arbitrarily pick the email.
+ */
+extern int ident_cmp(const struct ident_split *, const struct ident_split *);
+
struct checkout {
const char *base_dir;
int base_dir_len;