mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mc/cred-helper-ignore-unknown'

Browse Source 
Most credential helpers ignored unknown entries in a credential
description, but a few died upon seeing them.  The latter were
taught to ignore them, too

* mc/cred-helper-ignore-unknown:
  osxkeychain: clarify that we ignore unknown lines
  netrc: ignore unknown lines (do not die)
  wincred: ignore unknown lines (do not die)
This commit is contained in:
Junio C Hamano
2022-10-10 10:08:40 -07:00
parent 20a5dd670c 630a6429a7
commit dc6dd55f70
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/credential/netrc/git-credential-netrc.perl
View File

@ -356,7 +356,10 @@ sub read_credential_data_from_stdin {
next unless m/^([^=]+)=(.+)/; next unless m/^([^=]+)=(.+)/;
my ($token, $value) = ($1, $2); my ($token, $value) = ($1, $2);
die "Unknown search token $token" unless exists $q{$token};
# skip any unknown tokens
next unless exists $q{$token};
$q{$token} = $value; $q{$token} = $value;
log_debug("We were given search token $token and value $value"); log_debug("We were given search token $token and value $value");
} }

5
contrib/credential/osxkeychain/git-credential-osxkeychain.c
View File

@ -159,6 +159,11 @@ static void read_credential(void)
username = xstrdup(v); username = xstrdup(v);
else if (!strcmp(buf, "password")) else if (!strcmp(buf, "password"))
password = xstrdup(v); password = xstrdup(v);
/*
* Ignore other lines; we don't know what they mean, but
* this future-proofs us when later versions of git do
* learn new lines, and the helpers are updated to match.
*/
} }
} }

7
contrib/credential/wincred/git-credential-wincred.c
View File

@ -278,8 +278,11 @@ static void read_credential(void)
wusername = utf8_to_utf16_dup(v); wusername = utf8_to_utf16_dup(v);
} else if (!strcmp(buf, "password")) } else if (!strcmp(buf, "password"))
password = utf8_to_utf16_dup(v); password = utf8_to_utf16_dup(v);
else /*
die("unrecognized input"); * Ignore other lines; we don't know what they mean, but
* this future-proofs us when later versions of git do
* learn new lines, and the helpers are updated to match.
*/
} }
} }