Skip to content

Update ready-for-upstream #1936

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

Merged
merged 26 commits into from
Nov 20, 2018
Merged

Update ready-for-upstream #1936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
b8591e0
fixup! do_git_config_sequence(): fall back to git_dir if commondir is…
dscho Nov 19, 2018
0154b9c
squash! do_git_config_sequence(): fall back to git_dir if commondir i…
dscho Jul 13, 2017
17719e6
fixup! http: when using Secure Channel, ignore sslCAInfo by default
dscho Nov 19, 2018
a36e5dc
fixup! http: add support for disabling SSL revocation checks in cURL
dscho Nov 19, 2018
69eadfb
fixup! http: add support for selecting SSL backends at runtime
dscho Nov 19, 2018
18dab43
squash! http: add support for selecting SSL backends at runtime
dscho Aug 2, 2017
a67fd95
squash! http: add support for disabling SSL revocation checks in cURL
shiftkey Jan 23, 2018
850406a
squash! http: when using Secure Channel, ignore sslCAInfo by default
dscho Jun 14, 2018
07100ba
fixup! Remove old code and macro-ize implementation
dscho Nov 19, 2018
dba23ff
fixup! Format to 80 cols
dscho Nov 19, 2018
f7ca946
fixup! Implement pthread_cond_t with Win32 CONDITION_VARIABLE
dscho Nov 19, 2018
a0505d0
squash! Implement pthread_cond_t with Win32 CONDITION_VARIABLE
rongjiecomputer Jun 22, 2017
2fb1d8b
fixup! tests: explicitly use `git.exe` on Windows
dscho Nov 19, 2018
1f438ff
fixup! tests: do not require Git to be built when testing an installe…
dscho Nov 19, 2018
c1f55c4
fixup! t/lib-gettext: test installed git-sh-i18n if GIT_TEST_INSTALLE…
dscho Nov 19, 2018
69d262d
fixup! tests: respect GIT_TEST_INSTALLED when initializing repositories
dscho Nov 19, 2018
d64d6de
fixup! tests: fix GIT_TEST_INSTALLED's PATH to include t/helper/
dscho Nov 19, 2018
7801f03
squash! tests: fix GIT_TEST_INSTALLED's PATH to include t/helper/
dscho Jul 21, 2017
faa7ccc
squash! tests: respect GIT_TEST_INSTALLED when initializing repositories
dscho Jul 19, 2017
fe37aea
squash! t/lib-gettext: test installed git-sh-i18n if GIT_TEST_INSTALL…
dscho Jul 18, 2017
ce7b0f2
squash! tests: do not require Git to be built when testing an install…
dscho Aug 4, 2017
b094daa
squash! tests: explicitly use `git.exe` on Windows
dscho Nov 3, 2016
5113fc3
Merge 'bw/config-h-v2'
dscho Nov 19, 2018
dade23f
Merge 'http-ssl-backend-v2'
dscho Nov 19, 2018
88837b6
Merge 'mingw-modernize-pthread_cond_t-v1'
dscho Nov 19, 2018
cb5118b
Merge 'test-git-installed-v2'
dscho Nov 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions compat/win32/pthread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,6 @@ typedef int pthread_mutexattr_t;

#define pthread_cond_t CONDITION_VARIABLE

WINBASEAPI VOID WINAPI
InitializeConditionVariable(PCONDITION_VARIABLE ConditionVariable);
WINBASEAPI VOID WINAPI
WakeConditionVariable(PCONDITION_VARIABLE ConditionVariable);
WINBASEAPI VOID WINAPI
WakeAllConditionVariable(PCONDITION_VARIABLE ConditionVariable);
WINBASEAPI BOOL WINAPI
SleepConditionVariableCS(PCONDITION_VARIABLE ConditionVariable,
PCRITICAL_SECTION CriticalSection,
DWORD dwMilliseconds);

#define pthread_cond_init(a,b) InitializeConditionVariable((a))
#define pthread_cond_destroy(a) do {} while (0)
#define pthread_cond_wait(a,b) return_0(SleepConditionVariableCS((a), (b), INFINITE))
Expand Down
2 changes: 1 addition & 1 deletion config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1669,7 +1669,7 @@ static int do_git_config_sequence(const struct config_options *opts,
if (opts->commondir)
repo_config = mkpathdup("%s/config", opts->commondir);
else if (opts->git_dir)
repo_config = mkpathdup("%s/config", opts->git_dir);
BUG("git_dir without commondir");
else
repo_config = NULL;

Expand Down
2 changes: 1 addition & 1 deletion http.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,7 +835,7 @@ static CURL *get_curl_handle(void)
curl_easy_setopt(result, CURLOPT_SSL_OPTIONS, CURLSSLOPT_NO_REVOKE);
#else
warning("CURLSSLOPT_NO_REVOKE not applied to curl SSL options because\n"
"your curl version is too old (>= 7.44.0)");
"your curl version is too old (< 7.44.0)");
#endif
}

Expand Down
9 changes: 7 additions & 2 deletions t/test-lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,15 @@ export PERL_PATH SHELL_PATH

################################################################
# It appears that people try to run tests without building...
test -n "$GIT_TEST_INSTALLED" || "$GIT_BUILD_DIR/git$X" >/dev/null ||
"${GIT_TEST_INSTALLED:-$GIT_BUILD_DIR}/git$X" >/dev/null
if test $? != 1
then
echo >&2 'error: you do not seem to have built git yet.'
if test -n "$GIT_TEST_INSTALLED"
then
echo >&2 "error: there is no working Git at '$GIT_TEST_INSTALLED'"
else
echo >&2 'error: you do not seem to have built git yet.'
fi
exit 1
fi

Expand Down