Skip to content

Commit 86b31c8

Browse files
authored
Merge pull request #10 from intersystems/config-user-git-call
User information set at every git call
2 parents 0e9f28a + dc246aa commit 86b31c8

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

cls/SourceControl/Git/Utils.cls

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,7 @@ ClassMethod Commit(InternalName As %String, Message As %String = "example commit
274274
set username = ..GitUserName()
275275
set email = ..GitUserEmail()
276276
set author = username_" <"_email_">"
277-
do ..RunGitWithArgs(.errStream, .outStream,
278-
"-c", "user.name="_username, "-c", "user.email="_email,
279-
"commit", "--author", author, "-m", Message, filename)
277+
do ..RunGitWithArgs(.errStream, .outStream, "commit", "--author", author, "-m", Message, filename)
280278
write !
281279
do outStream.OutputToDevice()
282280
write !
@@ -1094,7 +1092,17 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O
10941092
{
10951093
set newArgs($i(newArgs)) = "-C"
10961094
set newArgs($i(newArgs)) = ..TempFolder()
1095+
1096+
set username = ..GitUserName()
1097+
set email = ..GitUserEmail()
1098+
1099+
set newArgs($i(newArgs)) = "-c"
1100+
set newArgs($i(newArgs)) = "user.name="_username
1101+
set newArgs($i(newArgs)) = "-c"
1102+
set newArgs($i(newArgs)) = "user.email="_email
1103+
10971104
set newArgs($i(newArgs)) = command
1105+
10981106
for i=1:1:$g(args)
10991107
{
11001108
set newArgs($i(newArgs)) = args(i)
@@ -1294,4 +1302,3 @@ ClassMethod NameToInternalName(Name, IgnorePercent = 1, IgnoreNonexistent = 1) A
12941302
}
12951303

12961304
}
1297-

0 commit comments

Comments
 (0)