Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade users to Git Credential Manager Core #305

Merged
merged 5 commits into from
Sep 30, 2020
Merged

Upgrade users to Git Credential Manager Core #305

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
807c2c5
installer: automatically upgrade existing GCM(W) users to GCM Core
dscho Sep 28, 2020
4be77b0
git-credential-helper-selector: favor GCM Core
dscho Sep 28, 2020
a9cc943
portable: use GCM Core by default (if helper-selector is unavailable)
dscho Sep 28, 2020
0823480
installer: reorder the credential helpers by preference
dscho Sep 30, 2020
1db0a79
installer: fix cut-off description of GCM(W)
dscho Sep 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion git-extra/git-credential-helper-selector.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ static int discover_helpers(void)
selected_helper = 0;

if (!previously_selected_helper)
previously_selected_helper = L"manager";
previously_selected_helper = L"manager-core";

for (p = env; *p; ) {
WCHAR *q = wcschr(p, L';');
Expand Down
9 changes: 7 additions & 2 deletions installer/install.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2042,7 +2042,7 @@ begin
RdbGitCredentialManager[GCM_None]:=CreateRadioButton(GitCredentialManagerPage,'None','Do not use a credential helper.',TabOrder,Top,Left);

// 2nd choice
RdbGitCredentialManager[GCM_Classic]:=CreateRadioButton(GitCredentialManagerPage,'Git Credential Manager','The <A HREF=https://github.com/Microsoft/Git-Credential-Manager-for-Windows>Git Credential Manager for Windows</A> handles credentials e.g. for Azure'+#13+'DevOps and GitHub (requires .NET framework v4.5.1 or later).',TabOrder,Top,Left);
RdbGitCredentialManager[GCM_Classic]:=CreateRadioButton(GitCredentialManagerPage,'Git Credential Manager','(DEPRECATED) The <A HREF=https://github.com/Microsoft/Git-Credential-Manager-for-Windows>Git Credential Manager for Windows</A> handles credentials e.g. for Azure'+#13+'DevOps and GitHub (requires .NET framework v4.5.1 or later).',TabOrder,Top,Left);

// 3rd choice
RdbGitCredentialManager[GCM_Core]:=CreateRadioButton(GitCredentialManagerPage,'Git Credential Manager Core','<RED>(NEW!)</RED> Use the new, <A HREF=https://github.com/microsoft/Git-Credential-Manager-Core>cross-platform version of the Git Credential Manager</A>.'+#13+'See more information about the future of Git Credential Manager <A HREF=https://github.com/microsoft/Git-Credential-Manager-Core/blob/master/docs/faq.md#about-the-project>here</A>.',TabOrder,Top,Left);
Expand All @@ -2055,13 +2055,18 @@ begin
RdbGitCredentialManager[GCM_Core].Checked:=False;
RdbGitCredentialManager[GCM_Core].Enabled:=False;
end else begin
case ReplayChoice('Use Credential Manager','Enabled') of
case ReplayChoice('Use Credential Manager','Core') of
'Disabled': RdbGitCredentialManager[GCM_None].Checked:=True;
'Enabled': RdbGitCredentialManager[GCM_Classic].Checked:=True;
'Core': RdbGitCredentialManager[GCM_Core].Checked:=True;
else
RdbGitCredentialManager[GCM_Classic].Checked:=True;
end;
// Auto-upgrade GCM to GCM Core in version v2.29.0
if RdbGitCredentialManager[GCM_Classic].Checked and (PreviousGitForWindowsVersion<>'') and IsDowngrade(PreviousGitForWindowsVersion,'2.29.0') then begin
RdbGitCredentialManager[GCM_Core].Checked:=True;
AddToSet(CustomPagesWithUnseenOptions,GitCredentialManagerPage);
end;
end;

(*
Expand Down
2 changes: 1 addition & 1 deletion portable/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ die "Could not generate file list"
mkdir -p "$SCRIPT_PATH/root/${etc_gitconfig%/*}" &&
cp /"$etc_gitconfig" "$SCRIPT_PATH/root/$etc_gitconfig" &&
git config -f "$SCRIPT_PATH/root/$etc_gitconfig" \
credential.helper manager ||
credential.helper manager-core ||
die "Could not configure Git-Credential-Manager as default"
test 64 != $BITNESS ||
git config -f "$SCRIPT_PATH/root/$etc_gitconfig" --unset pack.packSizeLimit
Expand Down