Skip to content

Commit cab0c7c

Browse files
committed
default to git username for LFS username
default LFS locking on
1 parent 6e0e4ac commit cab0c7c

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

Source/GitSourceControl/Private/GitSourceControlSettings.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class FGitSourceControlSettings
4242
FString BinaryPath;
4343

4444
/** Tells if using the Git LFS file Locking workflow */
45-
bool bUsingGitLfsLocking;
45+
bool bUsingGitLfsLocking = true;
4646

4747
/** Username used by the Git LFS 2 File Locks server */
4848
FString LfsUserName;

Source/GitSourceControl/Private/SGitSourceControlSettings.cpp

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -903,8 +903,20 @@ void SGitSourceControlSettings::OnLfsUserNameCommited(const FText& InText, EText
903903

904904
FText SGitSourceControlSettings::GetLfsUserName() const
905905
{
906-
const FGitSourceControlModule& GitSourceControl = FGitSourceControlModule::Get();
907-
return FText::FromString(GitSourceControl.AccessSettings().GetLfsUserName());
906+
FGitSourceControlModule& GitSourceControl = FGitSourceControlModule::Get();
907+
const FString LFSUserName = GitSourceControl.AccessSettings().GetLfsUserName();
908+
if (LFSUserName.IsEmpty())
909+
{
910+
const FString& UserName = GetUserName().ToString();
911+
GitSourceControl.AccessSettings().SetLfsUserName(UserName);
912+
GitSourceControl.AccessSettings().SaveSettings();
913+
GitSourceControl.GetProvider().UpdateSettings();
914+
return FText::FromString(UserName);
915+
}
916+
else
917+
{
918+
return FText::FromString(LFSUserName);
919+
}
908920
}
909921

910922
void SGitSourceControlSettings::OnCheckedInitialCommit(ECheckBoxState NewCheckedState)

0 commit comments

Comments
 (0)