Merge branch 'ps/stash-in-c'

[thirdparty/git.git] / cache.h

diff --git a/cache.h b/cache.h
index ac92421f3a8bc814da3f01731f2d8d8a52dc8364..e3c2ab962822e784b934a2342584ca42a16a9439 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1379,6 +1379,7 @@ enum get_oid_result {
 };
 
 extern int get_oid(const char *str, struct object_id *oid);
+extern int get_oidf(struct object_id *oid, const char *fmt, ...);
 extern int get_oid_commit(const char *str, struct object_id *oid);
 extern int get_oid_committish(const char *str, struct object_id *oid);
 extern int get_oid_tree(const char *str, struct object_id *oid);
@@ -1552,6 +1553,10 @@ extern const char *git_sequence_editor(void);
 extern const char *git_pager(int stdout_is_tty);
 extern int is_terminal_dumb(void);
 extern int git_ident_config(const char *, const char *, void *);
+/*
+ * Prepare an ident to fall back on if the user didn't configure it.
+ */
+void prepare_fallback_ident(const char *name, const char *email);
 extern void reset_ident_date(void);
 
 struct ident_split {