Skip to content

Commit 1d1cd23

Browse files
authored
Merge pull request #61 from ChrisJStone/develop
Re apply pr Support Git Environment Credentials #412
2 parents f7ae4ba + 2b5a61a commit 1d1cd23

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

git-flow-init

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ file= use given config file
116116
fi
117117

118118
if git_config_bool_exists "user.useconfigonly"; then
119-
user_email=$(git config --get user.email)
120-
user_name=$(git config --get user.name)
119+
user_email=$(git config --get user.email || echo $GIT_AUTHOR_EMAIL)
120+
user_name=$(git config --get user.name || echo $GIT_AUTHOR_NAME)
121121
if [ -z "${user_email}" ] || [ -z "${user_name}" ]; then
122122
die "Configuration useconfigonly is set but no name and/or email was set"
123123
fi

0 commit comments

Comments
 (0)