diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-10-15 04:48:00 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-15 04:48:00 (GMT) |
| commit | 6d5291be450594d453759650f466174f39953c4f (patch) | |
| tree | bc8f0616f6748e59e43105c78f5c4505565ab76d /builtin | |
| parent | ccc289915af00b44346cbf007f4f82ec2131f1a1 (diff) | |
| parent | 46689317ac009ef4ae91235354b6df7bf6d11d17 (diff) | |
| download | git-6d5291be450594d453759650f466174f39953c4f.zip git-6d5291be450594d453759650f466174f39953c4f.tar.gz git-6d5291be450594d453759650f466174f39953c4f.tar.bz2 | |
Merge branch 'js/azure-pipelines-msvc'
CI updates.
* js/azure-pipelines-msvc:
ci: also build and test with MS Visual Studio on Azure Pipelines
ci: really use shallow clones on Azure Pipelines
tests: let --immediate and --write-junit-xml play well together
test-tool run-command: learn to run (parts of) the testsuite
vcxproj: include more generated files
vcxproj: only copy `git-remote-http.exe` once it was built
msvc: work around a bug in GetEnvironmentVariable()
msvc: handle DEVELOPER=1
msvc: ignore some libraries when linking
compat/win32/path-utils.h: add #include guards
winansi: use FLEX_ARRAY to avoid compiler warning
msvc: avoid using minus operator on unsigned types
push: do not pretend to return `int` from `die_push_simple()`
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/push.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/push.c b/builtin/push.c index 3742daf..8729b03 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -143,8 +143,8 @@ static int push_url_of_remote(struct remote *remote, const char ***url_p) return remote->url_nr; } -static NORETURN int die_push_simple(struct branch *branch, - struct remote *remote) +static NORETURN void die_push_simple(struct branch *branch, + struct remote *remote) { /* * There's no point in using shorten_unambiguous_ref here, |