[PATCH v12 04/26] ident: add the ability to provide a "fallback identity"
From: Paul-Sebastian Ungureanu <hidden>
Date: 2018-12-20 19:44:57
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2018-12-28 · Re: [PATCH v12 04/26] ident: add the ability to provide a "fallback identity" · Junio C Hamano <hidden>
- 2018-12-27 · Re: [PATCH v12 04/26] ident: add the ability to provide a "fallback identity" · Johannes Schindelin <hidden>
- 2018-12-26 · Re: [PATCH v12 04/26] ident: add the ability to provide a "fallback identity" · Junio C Hamano <hidden>
From: Johannes Schindelin <redacted> In 3bc2111fc2e9 (stash: tolerate missing user identity, 2018-11-18), `git stash` learned to provide a fallback identity for the case that no proper name/email was given (and `git stash` does not really care about a correct identity anyway, but it does want to create a commit object). In preparation for the same functionality in the upcoming built-in version of `git stash`, let's offer the same functionality as an API function. Signed-off-by: Johannes Schindelin <redacted> --- cache.h | 1 + ident.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+)
diff --git a/cache.h b/cache.h
index 28ccc97e10..dd2154bcd3 100644
--- a/cache.h
+++ b/cache.h@@ -1493,6 +1493,7 @@ 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 *); +void prepare_fallback_ident(const char *name, const char *email); extern void reset_ident_date(void); struct ident_split {
diff --git a/ident.c b/ident.c
index 33bcf40644..bce20e8652 100644
--- a/ident.c
+++ b/ident.c@@ -505,6 +505,26 @@ int git_ident_config(const char *var, const char *value, void *data) return 0; } +static void set_env_if(const char *key, const char *value, int *given, int bit) +{ + if ((*given & bit) || getenv(key)) + return; /* nothing to do */ + setenv(key, value, 0); + *given |= bit; +} + +void prepare_fallback_ident(const char *name, const char *email) +{ + set_env_if("GIT_AUTHOR_NAME", name, + &author_ident_explicitly_given, IDENT_NAME_GIVEN); + set_env_if("GIT_AUTHOR_EMAIL", email, + &author_ident_explicitly_given, IDENT_MAIL_GIVEN); + set_env_if("GIT_COMMITTER_NAME", name, + &committer_ident_explicitly_given, IDENT_NAME_GIVEN); + set_env_if("GIT_COMMITTER_EMAIL", email, + &committer_ident_explicitly_given, IDENT_MAIL_GIVEN); +} + static int buf_cmp(const char *a_begin, const char *a_end, const char *b_begin, const char *b_end) {
--
2.20.1.441.g764a526393