]> git.ipfire.org Git - thirdparty/git.git/commit
ident: don't require calling prepare_fallback_ident first
authorThomas Gummerer <t.gummerer@gmail.com>
Wed, 6 Mar 2019 22:09:11 +0000 (22:09 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 7 Mar 2019 00:41:40 +0000 (09:41 +0900)
commit0640897dc5ff1f75308d3ebb45e152aed40bb9a3
tree821aef5beab5ca9ddc446fa2dacf935c97eb3097
parentfd5a58477c62ddb6ec16cf7b5b2da7597f0fa398
ident: don't require calling prepare_fallback_ident first

In fd5a58477c ("ident: add the ability to provide a "fallback
identity"", 2019-02-25) I made it a requirement to call
prepare_fallback_ident as the first function in the ident API.
However in stash we didn't actually end up following that.

This leads to a BUG if user.email and user.name are set.  It was not
caught in the test suite because we only rely on environment variables
for setting the user name and email instead of the config.

Instead of making it a bug to call other functions in the ident API
first, just return silently if the identity of a user was already set
up.

Reported-by: Denton Liu <liu.denton@gmail.com>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
cache.h
ident.c
t/t3903-stash.sh