From d289d13625ffa568c3007c3620eaafeb521ac06d Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Thu, 14 Jul 2005 18:50:33 -0600 Subject: [PATCH] [PATCH] Move git_author_info and git_commiter_info to ident.c Moving these functions allows all of the logic for figuring out what these values are to be shared between programs. Signed-off-by: Linus Torvalds --- cache.h | 2 ++ commit-tree.c | 10 ---------- ident.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/cache.h b/cache.h index 35e0ad7e0..73e05dcd8 100644 --- a/cache.h +++ b/cache.h @@ -224,6 +224,8 @@ void datestamp(char *buf, int bufsize); extern int setup_ident(void); extern char *get_ident(const char *name, const char *email, const char *date_str); +extern char *git_author_info(void); +extern char *git_committer_info(void); static inline void *xmalloc(size_t size) { diff --git a/commit-tree.c b/commit-tree.c index 8f3b96c26..d545f62aa 100644 --- a/commit-tree.c +++ b/commit-tree.c @@ -79,16 +79,6 @@ static int new_parent(int idx) return 1; } -static char *git_author_info(void) -{ - return get_ident(gitenv("GIT_AUTHOR_NAME"), gitenv("GIT_AUTHOR_EMAIL"), gitenv("GIT_AUTHOR_DATE")); -} - -static char *git_committer_info(void) -{ - return get_ident(gitenv("GIT_COMMITTER_NAME"), gitenv("GIT_COMMITTER_EMAIL"), gitenv("GIT_COMMITTER_DATE")); -} - int main(int argc, char **argv) { int i; diff --git a/ident.c b/ident.c index faff44175..8da5609cb 100644 --- a/ident.c +++ b/ident.c @@ -136,3 +136,13 @@ char *get_ident(const char *name, const char *email, const char *date_str) buffer[i] = 0; return buffer; } + +char *git_author_info(void) +{ + return get_ident(gitenv("GIT_AUTHOR_NAME"), gitenv("GIT_AUTHOR_EMAIL"), gitenv("GIT_AUTHOR_DATE")); +} + +char *git_committer_info(void) +{ + return get_ident(gitenv("GIT_COMMITTER_NAME"), gitenv("GIT_COMMITTER_EMAIL"), gitenv("GIT_COMMITTER_DATE")); +} -- 2.26.2