Murmele/Gittyup
1
1
Fork 0
mirror of https://github.com/Murmele/Gittyup.git synced 2024-09-11 02:35:41 +03:00
Code Issues Projects Releases Wiki Activity

Update libgit2 to tip of master

Browse Source
This commit is contained in:
Jason Haslam 2020-07-13 13:41:00 -06:00
parent 09d797f3d7
commit d235c8970d
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dep/libgit2/libgit2

@ -1 +1 @@
Subproject commit f9fcda3c3489e0f2c9557d0bbfcf62f0d6600f19
Subproject commit 90af68bbe2690998f015f18b7c890f5868bcd3ee

16
src/git/Remote.cpp
View File

@ -247,7 +247,7 @@ int Remote::Callbacks::sideband(
}
int Remote::Callbacks::credentials(
git_cred **out,
git_credential **out,
const char *url,
const char *name,
unsigned int types,
@ -260,7 +260,7 @@ int Remote::Callbacks::credentials(
return -1;
Remote::Callbacks *cbs = reinterpret_cast<Remote::Callbacks *>(payload);
if (types & GIT_CREDTYPE_SSH_KEY) {
if (types & GIT_CREDENTIAL_SSH_KEY) {
// First try to get key from agent.
if (!cbs->mAgentNames.contains(name)) {
log(QString("agent: %1").arg(name));
@ -278,7 +278,7 @@ int Remote::Callbacks::credentials(
libssh2_agent_free(agent);
libssh2_session_free(session);
if (error == LIBSSH2_ERROR_NONE)
return git_cred_ssh_key_from_agent(out, name);
return git_credential_ssh_key_from_agent(out, name);
} else if (error) {
log(error->message);
@ -337,7 +337,7 @@ int Remote::Callbacks::credentials(
if (!line.startsWith("Proc-Type:") || !line.endsWith("ENCRYPTED")) {
QByteArray base64 = QByteArray::fromBase64(line.toLocal8Bit());
if (!base64.contains("aes256-ctr") || !base64.contains("bcrypt"))
return git_cred_ssh_key_new(out, name,
return git_credential_ssh_key_new(out, name,
!pub.isEmpty() ? pub.toLocal8Bit().constData() : nullptr,
key.toLocal8Bit(), nullptr);
}
@ -348,17 +348,17 @@ int Remote::Callbacks::credentials(
if (!cbs->credentials(url, username, passphrase))
return -1;
return git_cred_ssh_key_new(out, username.toUtf8(),
return git_credential_ssh_key_new(out, username.toUtf8(),
!pub.isEmpty() ? pub.toLocal8Bit().constData() : nullptr,
key.toLocal8Bit(), passphrase.toUtf8());
} else if (types & GIT_CREDTYPE_USERPASS_PLAINTEXT) {
} else if (types & GIT_CREDENTIAL_USERPASS_PLAINTEXT) {
QString password;
QString username = QUrl::fromPercentEncoding(name);
if (!cbs->credentials(url, username, password))
return -1;
return git_cred_userpass_plaintext_new(
return git_credential_userpass_plaintext_new(
out, username.toUtf8(), password.toUtf8());
}
@ -505,7 +505,7 @@ void Remote::setName(const QString &name)
return;
// FIXME: Report problems?
git_strarray_free(&problems);
git_strarray_dispose(&problems);
}
QString Remote::url() const

2
src/git/Remote.h
View File

@ -141,7 +141,7 @@ public:
void *payload);
static int credentials(
git_cred **out,
git_credential **out,
const char *url,
const char *name,
unsigned int types,

2
src/git/Repository.cpp
View File

@ -730,7 +730,7 @@ QList<Remote> Repository::remotes() const
remotes.append(remote);
}
git_strarray_free(&names);
git_strarray_dispose(&names);
return remotes;
}