stash: optionally use the scripted version again

diff --git a/ident.c b/ident.c
index f30bd623f0afd1c373d47bf035b767f1cd0a8056..bce20e8652ee4959cfd1c576a90a322dfd6ef44d 100644 (file)
--- a/ident.c
+++ b/ident.c
@@ -507,9 +507,7 @@ int git_ident_config(const char *var, const char *value, void *data)
 
 static void set_env_if(const char *key, const char *value, int *given, int bit)
 {
-       if (*given & bit)
-               BUG("%s was checked before prepare_fallback got called", key);
-       if (getenv(key))
+       if ((*given & bit) || getenv(key))
                return; /* nothing to do */
        setenv(key, value, 0);
        *given |= bit;