Murmele/Gittyup
1
1
Fork 0
mirror of https://github.com/Murmele/Gittyup.git synced 2024-10-26 02:29:36 +03:00
Code Issues Projects Releases Wiki Activity

Fix formatting

Browse Source
This commit is contained in:
kas 2023-04-12 18:07:21 +02:00
parent 54ae13b6ac
commit 2fb8b7798c
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -15,7 +15,7 @@ set(GITTYUP_VERSION
string(TIMESTAMP CURR_YEAR "%Y")
add_compile_definitions(CURR_YEAR=${CURR_YEAR})
configure_file(${CMAKE_SOURCE_DIR}/LICENSE.md.in ${CMAKE_SOURCE_DIR}/LICENSE.md
@ONLY NEWLINE_STYLE UNIX)
@ONLY NEWLINE_STYLE UNIX)
# Write version to file so it can be used also from external, for example in the
# github manifest

5
dep/git/CMakeLists.txt
View File

@ -4,8 +4,9 @@ if(NOT USE_SYSTEM_GIT)
macro(add_helper NAME)
set(TARGET git-credential-${NAME})
add_executable(${TARGET} ${PATH}/${NAME}/${TARGET}.c)
set_target_properties(${TARGET} PROPERTIES RUNTIME_OUTPUT_DIRECTORY
$<TARGET_FILE_DIR:gittyup>/credential-helpers)
set_target_properties(
${TARGET} PROPERTIES RUNTIME_OUTPUT_DIRECTORY
$<TARGET_FILE_DIR:gittyup>/credential-helpers)
if(${ARGC} GREATER 1)
target_link_libraries(${TARGET} ${ARGV1})

3
src/cred/CredentialHelper.cpp
View File

@ -44,8 +44,7 @@ CredentialHelper *CredentialHelper::instance() {
auto path =
QString::fromLocal8Bit(qgetenv("HOME") + "/.git-credentials");
instance = new Store(path);
}
else {
} else {
instance = new GitCredential(helperName);
}
}

3
src/cred/GitCredential.cpp
View File

@ -98,7 +98,8 @@ QString GitCredential::command() const {
appDir.cd("credential-helpers");
// Prefer credential helpers directly installed into Gittyup's app dir
QString candidate = QStandardPaths::findExecutable(name, QStringList(appDir.path()));
QString candidate =
QStandardPaths::findExecutable(name, QStringList(appDir.path()));
if (!candidate.isEmpty()) {
return candidate;
}