]> git.proxmox.com Git - libgit2.git/log
libgit2.git
8 years agorefspec: check buffer with GITERR_CHECK_ALLOC_BUF
Patrick Steinhardt [Tue, 23 Feb 2016 09:09:03 +0000 (10:09 +0100)]
refspec: check buffer with GITERR_CHECK_ALLOC_BUF

8 years agorevwalk: use GITERR_CHECK_ALLOC_BUF
Patrick Steinhardt [Tue, 23 Feb 2016 10:48:30 +0000 (11:48 +0100)]
revwalk: use GITERR_CHECK_ALLOC_BUF

8 years agosmart_pkt: check buffer with GITERR_CHECK_ALLOC_BUF
Patrick Steinhardt [Tue, 23 Feb 2016 10:45:43 +0000 (11:45 +0100)]
smart_pkt: check buffer with GITERR_CHECK_ALLOC_BUF

8 years agopath: use GITERR_CHECK_ALLOC_BUF to verify passed in buffer
Patrick Steinhardt [Tue, 23 Feb 2016 09:02:44 +0000 (10:02 +0100)]
path: use GITERR_CHECK_ALLOC_BUF to verify passed in buffer

8 years agocommon: introduce GITERR_CHECK_ALLOC_BUF
Patrick Steinhardt [Tue, 23 Feb 2016 08:54:26 +0000 (09:54 +0100)]
common: introduce GITERR_CHECK_ALLOC_BUF

We commonly have to check if a git_buf has been allocated
correctly or if we ran out of memory. Introduce a new macro
similar to `GITERR_CHECK_ALLOC` which checks if we ran OOM and if
so returns an error. Provide a `#nodef` for Coverity to mark the
error case as an abort path.

8 years agocoverity: hint git_vector_foreach does not deref NULL contents
Patrick Steinhardt [Mon, 22 Feb 2016 13:43:28 +0000 (14:43 +0100)]
coverity: hint git_vector_foreach does not deref NULL contents

Coverity does not comprehend the connection between a vector's
size and the contents pointer, that is that the vector's pointer
is non-NULL when its size is positive. As the vector code should
be reasonably well tested and users are expected to not manually
modify a vector's contents it seems save to assume that the
macros will never dereference a NULL pointer.

Fix Coverity warnings by overriding the foreach macros with
macros that explicitly aborting when (v)->contents is NULL.

8 years agoMerge pull request #3629 from ethomson/set_user_agent_doc
Vicent Marti [Tue, 23 Feb 2016 07:16:12 +0000 (08:16 +0100)]
Merge pull request #3629 from ethomson/set_user_agent_doc

git_libgit2_opts: minor documentation & usage fixes

8 years agogit_libgit2_opts: validate key
Edward Thomson [Tue, 23 Feb 2016 04:04:40 +0000 (23:04 -0500)]
git_libgit2_opts: validate key

8 years agogit_libgit2_opts: document GIT_OPT_SET_USER_AGENT
Edward Thomson [Tue, 23 Feb 2016 03:26:01 +0000 (22:26 -0500)]
git_libgit2_opts: document GIT_OPT_SET_USER_AGENT

8 years agoMerge pull request #3627 from libgit2/cmn/typo
Edward Thomson [Mon, 22 Feb 2016 15:16:49 +0000 (10:16 -0500)]
Merge pull request #3627 from libgit2/cmn/typo

Fix a few checkout -> rebase typos

8 years agoFix a few checkout -> rebase typos
Carlos Martín Nieto [Mon, 22 Feb 2016 14:41:01 +0000 (15:41 +0100)]
Fix a few checkout -> rebase typos

8 years agoopenssl: re-export the last-resort locking function
Carlos Martín Nieto [Fri, 19 Feb 2016 15:23:14 +0000 (16:23 +0100)]
openssl: re-export the last-resort locking function

We need to include the header where we define the function. Otherwise it
won't be available on the DLL.

8 years agoCHANGELOG: add a few missing changes
Carlos Martín Nieto [Fri, 19 Feb 2016 12:52:04 +0000 (13:52 +0100)]
CHANGELOG: add a few missing changes

8 years agoopenssl: free the context even if we don't connect
Carlos Martín Nieto [Fri, 19 Feb 2016 12:31:54 +0000 (13:31 +0100)]
openssl: free the context even if we don't connect

8 years agoglobal: remove an unused variable
Carlos Martín Nieto [Fri, 19 Feb 2016 12:24:41 +0000 (13:24 +0100)]
global: remove an unused variable

8 years agoMerge pull request #3597 from ethomson/filter_registration
Carlos Martín Nieto [Fri, 19 Feb 2016 12:06:51 +0000 (13:06 +0100)]
Merge pull request #3597 from ethomson/filter_registration

Filter registration

8 years agoMerge pull request #3614 from pks-t/pks/coverity-fixes
Carlos Martín Nieto [Fri, 19 Feb 2016 09:21:37 +0000 (10:21 +0100)]
Merge pull request #3614 from pks-t/pks/coverity-fixes

Coverity fixes

8 years agonetops: fix memory leak when an error occurs
Patrick Steinhardt [Mon, 15 Feb 2016 10:28:33 +0000 (11:28 +0100)]
netops: fix memory leak when an error occurs

8 years agotransports: smart_pkt: fix memory leaks
Patrick Steinhardt [Mon, 15 Feb 2016 10:46:10 +0000 (11:46 +0100)]
transports: smart_pkt: fix memory leaks

8 years agotransports: smart: fix memory leak on OOM path
Patrick Steinhardt [Mon, 15 Feb 2016 10:37:48 +0000 (11:37 +0100)]
transports: smart: fix memory leak on OOM path

8 years agosignature: use GITERR_CHECK_ALLOC to check for OOM situation
Patrick Steinhardt [Mon, 15 Feb 2016 10:30:48 +0000 (11:30 +0100)]
signature: use GITERR_CHECK_ALLOC to check for OOM situation

When checking for out of memory situations we usually use the
GITERR_CHECK_ALLOC macro. Besides conforming to our current code
base it adds the benefit of silencing errors in Coverity due to
Coverity handling the macro's error path as abort.

8 years agocoverity: hint that string length is at least 2
Patrick Steinhardt [Mon, 15 Feb 2016 09:58:52 +0000 (10:58 +0100)]
coverity: hint that string length is at least 2

When checking if a string is prefixed by a drive letter (e.g.
"C:") we verify this by inspecting the first and second character
of the string. Coverity thinks this is a defect as we do not
check the string's length first, but in fact we only check the
second character if the first character is part of the alphabet,
that is it cannot be '\0'.

Fix this by overriding the macro and explicitly checking the
string's length.

8 years agocoverity: add nodefs for abort macros
Patrick Steinhardt [Mon, 15 Feb 2016 08:41:08 +0000 (09:41 +0100)]
coverity: add nodefs for abort macros

Add nodefs for macros that abort the current flow due to errors.
This includes macros that trigger on integer overflows and for
the version check macro. This aids Coverity as we point out that
these paths will cause a fatal error.

8 years agoMerge pull request #3604 from ethomson/nsec_xplat
Carlos Martín Nieto [Thu, 18 Feb 2016 14:11:31 +0000 (15:11 +0100)]
Merge pull request #3604 from ethomson/nsec_xplat

Handle `USE_NSECS`

8 years agoMerge pull request #3606 from ethomson/drop_xp
Carlos Martín Nieto [Thu, 18 Feb 2016 14:11:02 +0000 (15:11 +0100)]
Merge pull request #3606 from ethomson/drop_xp

win32: drop xp support in WideCharToMultiByte

8 years agoMerge pull request #3613 from ethomson/fixups
Carlos Martín Nieto [Thu, 18 Feb 2016 11:31:56 +0000 (12:31 +0100)]
Merge pull request #3613 from ethomson/fixups

Remove most of the silly warnings

8 years agoMerge pull request #3619 from ethomson/win32_forbidden
Carlos Martín Nieto [Thu, 18 Feb 2016 11:28:06 +0000 (12:28 +0100)]
Merge pull request #3619 from ethomson/win32_forbidden

win32: allow us to read indexes with forbidden paths on win32

8 years agoMerge pull request #3621 from pra85/patch-1
Carlos Martín Nieto [Thu, 18 Feb 2016 10:44:04 +0000 (11:44 +0100)]
Merge pull request #3621 from pra85/patch-1

Fix a typo

8 years agoPROJECTS: remove a few things we do have
Carlos Martín Nieto [Thu, 18 Feb 2016 10:39:55 +0000 (11:39 +0100)]
PROJECTS: remove a few things we do have

8 years agoFix a typo
Prayag Verma [Thu, 18 Feb 2016 07:56:08 +0000 (13:26 +0530)]
Fix a typo

`compatability` → `compatibility`

8 years agoindex: allow read of index w/ illegal entries
Edward Thomson [Tue, 16 Feb 2016 17:11:46 +0000 (17:11 +0000)]
index: allow read of index w/ illegal entries

Allow `git_index_read` to handle reading existing indexes with
illegal entries.  Allow the low-level `git_index_add` to add
properly formed `git_index_entry`s even if they contain paths
that would be illegal for the current filesystem (eg, `AUX`).
Continue to disallow `git_index_add_bypath` from adding entries
that are illegal universally illegal (eg, `.git`, `foo/../bar`).

8 years agoiterator: assert tree_iterator has a frame
Edward Thomson [Tue, 16 Feb 2016 13:08:55 +0000 (13:08 +0000)]
iterator: assert tree_iterator has a frame

Although a `tree_iterator` that failed to be properly created
does not have a frame, all other `tree_iterator`s should.  Do not
call `pop` in the failure case, but assert that in all other
cases there is a frame.

8 years agoValidate pointer before access the member.
Colin Xu [Fri, 22 Jan 2016 08:03:37 +0000 (16:03 +0800)]
Validate pointer before access the member.

When Git repository at network locations, sometimes git_iterator_for_tree
fails at iterator__update_ignore_case so it goes to git_iterator_free.
Null pointer will crash the process if not check.

Signed-off-by: Colin Xu <colin.xu@gmail.com>
8 years agowin32: tests around handling forbidden paths
Edward Thomson [Tue, 16 Feb 2016 18:50:08 +0000 (18:50 +0000)]
win32: tests around handling forbidden paths

Introduce a repository that contains some paths that were illegal
on PC-DOS circa 1981 (like `aux`, `con`, `com1`) and that in a
bizarre fit of retrocomputing, remain illegal on some "modern"
computers, despite being "new technology".

Introduce some aspirational tests that suggest that we should be
able to cope with trees and indexes that contain paths that
would be illegal on the filesystem, so that we can at least diff
them.  Further ensure that checkout will not write a repository
with forbidden paths.

8 years agoMerge pull request #3617 from libgit2/cmn/extract-sig-errors
Carlos Martín Nieto [Tue, 16 Feb 2016 13:45:32 +0000 (14:45 +0100)]
Merge pull request #3617 from libgit2/cmn/extract-sig-errors

commit: expose the different kinds of errors

8 years agocommit: expose the different kinds of errors
Carlos Martín Nieto [Tue, 16 Feb 2016 13:06:48 +0000 (14:06 +0100)]
commit: expose the different kinds of errors

We should be checking whether the object we're looking up is a commit,
and we should let the caller know whether the not-found return code
comes from a bad object type or just a missing signature.

8 years agowinhttp: use an unsigned iterator
Edward Thomson [Fri, 12 Feb 2016 18:27:05 +0000 (10:27 -0800)]
winhttp: use an unsigned iterator

8 years agosubmodule: explicitly cast to the teensy time value
Edward Thomson [Fri, 12 Feb 2016 18:25:50 +0000 (10:25 -0800)]
submodule: explicitly cast to the teensy time value

8 years agoindex: explicitly cast the teeny index entry members
Edward Thomson [Fri, 12 Feb 2016 18:22:54 +0000 (10:22 -0800)]
index: explicitly cast the teeny index entry members

8 years agoindex: don't use `seek` return as an error code
Edward Thomson [Fri, 12 Feb 2016 18:11:32 +0000 (10:11 -0800)]
index: don't use `seek` return as an error code

8 years agoindex: explicitly cast new hash size to an int
Edward Thomson [Fri, 12 Feb 2016 18:03:29 +0000 (10:03 -0800)]
index: explicitly cast new hash size to an int

8 years agowin32: drop incorrect `const`ness
Edward Thomson [Fri, 12 Feb 2016 18:02:18 +0000 (10:02 -0800)]
win32: drop incorrect `const`ness

8 years agofstat: use our custom `stat`
Edward Thomson [Thu, 11 Feb 2016 23:41:07 +0000 (15:41 -0800)]
fstat: use our custom `stat`

8 years agotree: zap warnings around `size_t` vs `uint16_t`
Edward Thomson [Thu, 11 Feb 2016 22:28:31 +0000 (14:28 -0800)]
tree: zap warnings around `size_t` vs `uint16_t`

8 years agoMerge pull request #3615 from ethomson/rebase_bare
Carlos Martín Nieto [Tue, 16 Feb 2016 07:54:43 +0000 (08:54 +0100)]
Merge pull request #3615 from ethomson/rebase_bare

rebase: persist a single in-memory index

8 years agorebase: persist a single in-memory index
Edward Thomson [Mon, 15 Feb 2016 17:16:00 +0000 (17:16 +0000)]
rebase: persist a single in-memory index

When performing an in-memory rebase, keep a single index for the
duration, so that callers have the expected index lifecycle and
do not hold on to an index that is free'd out from under them.

8 years agowin32: introduce p_timeval that isn't stupid
Edward Thomson [Thu, 11 Feb 2016 20:24:21 +0000 (12:24 -0800)]
win32: introduce p_timeval that isn't stupid

Windows defines `timeval` with `long`, which we cannot
sanely cope with.  Instead, use a custom timeval struct.

8 years agoMerge pull request #3610 from ethomson/rebase_bare
Carlos Martín Nieto [Thu, 11 Feb 2016 23:55:20 +0000 (00:55 +0100)]
Merge pull request #3610 from ethomson/rebase_bare

rebase: introduce bare rebasing

8 years agoMerge pull request #3612 from arthurschreiber/arthur/fix-3173
Edward Thomson [Thu, 11 Feb 2016 23:47:01 +0000 (15:47 -0800)]
Merge pull request #3612 from arthurschreiber/arthur/fix-3173

Horrible fix for #3173.

8 years agoHorrible fix for #3173.
Arthur Schreiber [Thu, 11 Feb 2016 22:37:52 +0000 (23:37 +0100)]
Horrible fix for #3173.

8 years agocommit: don't forget the last header field
Carlos Martín Nieto [Thu, 11 Feb 2016 21:19:20 +0000 (22:19 +0100)]
commit: don't forget the last header field

When we moved the logic to handle the first one, wrong loop logic was
kept in place which meant we still finished early. But we now notice it
because we're not reading past the last LF we find.

This was not noticed before as the last field in the tested commit was
multi-line which does not trigger the early break.

8 years agoMerge pull request #3607 from pks-t/pks/coverity-improvements
Carlos Martín Nieto [Thu, 11 Feb 2016 21:16:34 +0000 (22:16 +0100)]
Merge pull request #3607 from pks-t/pks/coverity-improvements

Coverity improvements for GITERR_CHECK_ALLOC

8 years agomerge tests: correct casts
Edward Thomson [Thu, 11 Feb 2016 19:41:23 +0000 (11:41 -0800)]
merge tests: correct casts

8 years agoreset test: fix initialization warning
Edward Thomson [Thu, 11 Feb 2016 19:26:42 +0000 (11:26 -0800)]
reset test: fix initialization warning

8 years agorebase: allow custom merge_options
Edward Thomson [Thu, 11 Feb 2016 18:11:21 +0000 (10:11 -0800)]
rebase: allow custom merge_options

Allow callers of rebase to specify custom merge options.  This may
allow custom conflict resolution, or failing fast when conflicts
are detected.

8 years agorebase: introduce inmemory rebasing
Edward Thomson [Thu, 11 Feb 2016 18:48:48 +0000 (10:48 -0800)]
rebase: introduce inmemory rebasing

Introduce the ability to rebase in-memory or in a bare repository.

When `rebase_options.inmemory` is specified, the resultant `git_rebase`
session will not be persisted to disk.  Callers may still analyze
the rebase operations, resolve any conflicts against the in-memory
index and create the commits.  Neither `HEAD` nor the working
directory will be updated during this process.

8 years agocoverity: use https URL for posting build
Patrick Steinhardt [Wed, 10 Feb 2016 10:06:23 +0000 (11:06 +0100)]
coverity: use https URL for posting build

When posting our instrumented build results to Coverity we have
to include sensitive information, in particular our authorization
token. Currently we use an unencrypted channel to post this
information, leading to the token being transferred in plain.

Fix this by using a secured connection instead.

8 years agocoverity: provide nodef for GITERR_CHECK_ALLOC
Patrick Steinhardt [Wed, 10 Feb 2016 09:59:14 +0000 (10:59 +0100)]
coverity: provide nodef for GITERR_CHECK_ALLOC

Coverity currently lists a lot of errors with regard to
GITERR_CHECK_ALLOC causing resource leaks. We know this macro is
only invoked when we want to abort because we are out of memory.

Coverity allows for overriding the default model where we know
that certain functions guarantee a desired behavior. The
user_nodefs.h is used to override the behavior of macros.
Re-define GITERR_CHECK_ALLOC inside of it to specify its abort
nature.

8 years agofilter: clean up documentation around custom filters
Edward Thomson [Sun, 7 Feb 2016 21:35:16 +0000 (13:35 -0800)]
filter: clean up documentation around custom filters

8 years agowin32: drop xp support in WideCharToMultiByte
Edward Thomson [Wed, 10 Feb 2016 01:44:59 +0000 (17:44 -0800)]
win32: drop xp support in WideCharToMultiByte

8 years agoxplat: use st_mtimespec everywhere on mac
Edward Thomson [Tue, 9 Feb 2016 18:40:33 +0000 (10:40 -0800)]
xplat: use st_mtimespec everywhere on mac

8 years agoMerge pull request #3599 from libgit2/gpgsign
Vicent Marti [Tue, 9 Feb 2016 15:26:58 +0000 (16:26 +0100)]
Merge pull request #3599 from libgit2/gpgsign

Introduce git_commit_extract_signature

8 years agoMerge pull request #3603 from pks-t/pks/coverity-fixes
Carlos Martín Nieto [Tue, 9 Feb 2016 15:10:43 +0000 (16:10 +0100)]
Merge pull request #3603 from pks-t/pks/coverity-fixes

Coverity fixes

8 years agoIntroduce git_commit_extract_signature
Carlos Martín Nieto [Mon, 8 Feb 2016 17:51:13 +0000 (18:51 +0100)]
Introduce git_commit_extract_signature

This returns the GPG signature for a commit and its contents without the
signature block, allowing for the verification of the commit's
signature.

8 years agoMerge pull request #3602 from libgit2/cmn/header-field-2
Carlos Martín Nieto [Tue, 9 Feb 2016 13:53:10 +0000 (14:53 +0100)]
Merge pull request #3602 from libgit2/cmn/header-field-2

commit: also match the first header field when searching

8 years agoattr_file: fix resource leak
Patrick Steinhardt [Tue, 9 Feb 2016 10:11:38 +0000 (11:11 +0100)]
attr_file: fix resource leak

8 years agocheckout: fix resource leak
Patrick Steinhardt [Tue, 9 Feb 2016 10:07:50 +0000 (11:07 +0100)]
checkout: fix resource leak

8 years agopack-objects: fix memory leak in packbuilder_config
Patrick Steinhardt [Tue, 9 Feb 2016 09:53:30 +0000 (10:53 +0100)]
pack-objects: fix memory leak in packbuilder_config

8 years agopack-objects: fix memory leak in compute_write_order
Patrick Steinhardt [Tue, 9 Feb 2016 09:43:28 +0000 (10:43 +0100)]
pack-objects: fix memory leak in compute_write_order

8 years agopack: do not free passed in poiter on error
Patrick Steinhardt [Tue, 9 Feb 2016 08:58:56 +0000 (09:58 +0100)]
pack: do not free passed in poiter on error

The function `git_packfile_stream_open` tries to free the passed
in stream when an error occurs. The only call site is
`git_indexer_append`, though, which passes in the address of a
stream struct which has not been allocated on the heap.

Fix the issue by simply removing the call to free. In case of an
error we did not allocate any memory yet and otherwise it should
be the caller's responsibility to manage it's object's lifetime.

8 years agocommit: also match the first header field when searching
Carlos Martín Nieto [Tue, 9 Feb 2016 06:17:26 +0000 (07:17 +0100)]
commit: also match the first header field when searching

We were searching only past the first header field, which meant we were
unable to find e.g. `tree` which is the first field.

While here, make sure to set an error message in case we cannot find the
field.

8 years agoMerge pull request #3598 from pks-t/pks/coverity-fixes
Carlos Martín Nieto [Tue, 9 Feb 2016 05:41:02 +0000 (06:41 +0100)]
Merge pull request #3598 from pks-t/pks/coverity-fixes

Coverity fixes

8 years agoMerge pull request #3601 from ethomson/merge_doc
Carlos Martín Nieto [Tue, 9 Feb 2016 05:26:21 +0000 (06:26 +0100)]
Merge pull request #3601 from ethomson/merge_doc

Better document `git_merge_commits` redux

8 years agoBetter document `git_merge_commits` redux
Edward Thomson [Tue, 9 Feb 2016 01:55:22 +0000 (17:55 -0800)]
Better document `git_merge_commits` redux

`git_merge_commits` and `git_merge` now *do* handle recursive base
building for criss-cross merges.  Remove the documentation that says
that they do not.

This reverts commit 5e44d9bcb6d5b20922f49b1913723186f8ced8b5.

8 years agoMerge pull request #3600 from ethomson/mailmap
Edward Thomson [Tue, 9 Feb 2016 01:14:43 +0000 (17:14 -0800)]
Merge pull request #3600 from ethomson/mailmap

mailmap: add ethomson@github.com

8 years agomailmap: add ethomson@github.com
Edward Thomson [Tue, 2 Feb 2016 22:50:35 +0000 (14:50 -0800)]
mailmap: add ethomson@github.com

8 years agofilter: avoid races during filter registration
Edward Thomson [Sun, 7 Feb 2016 21:16:30 +0000 (13:16 -0800)]
filter: avoid races during filter registration

Previously we would set the global filter registry structure before
adding filters to the structure, without a lock, which is quite racy.
Now, register default filters during global registration and use an
rwlock to read and write the filter registry (as appopriate).

8 years agomingw: use gcc-like memory barrier
Edward Thomson [Sun, 7 Feb 2016 22:10:38 +0000 (14:10 -0800)]
mingw: use gcc-like memory barrier

Use the gcc-like memory barrier (__sync_synchronize) on mingw.

8 years agoglobal: make openssl registration like the rest
Edward Thomson [Tue, 9 Feb 2016 00:14:03 +0000 (16:14 -0800)]
global: make openssl registration like the rest

8 years agoglobal: refactor setup and cleanup
Edward Thomson [Sat, 6 Feb 2016 19:25:47 +0000 (11:25 -0800)]
global: refactor setup and cleanup

Move the common initialization and cleanup methods to reduce
unnecessary duplication.

8 years agocurl_stream: fix unused cert infos
Patrick Steinhardt [Mon, 8 Feb 2016 16:05:57 +0000 (17:05 +0100)]
curl_stream: fix unused cert infos

When copying contents of the cURL certiinfo we duplicate the
data but forget to actually put it into the vector.

8 years agomerge: fix memory leak
Patrick Steinhardt [Mon, 8 Feb 2016 15:58:08 +0000 (16:58 +0100)]
merge: fix memory leak

8 years agoMerge pull request #3592 from ethomson/code_of_conduct
Carlos Martín Nieto [Sun, 7 Feb 2016 00:41:59 +0000 (16:41 -0800)]
Merge pull request #3592 from ethomson/code_of_conduct

Introduce Contributor Covenant

8 years agoMerge pull request #3578 from bubaflub/fix_small_memory_leak
Carlos Martín Nieto [Fri, 5 Feb 2016 23:19:24 +0000 (15:19 -0800)]
Merge pull request #3578 from bubaflub/fix_small_memory_leak

Free allocated pointer to curl stream on error

8 years agoMerge pull request #3579 from ethomson/mingw_winhttp
Edward Thomson [Fri, 5 Feb 2016 17:37:40 +0000 (09:37 -0800)]
Merge pull request #3579 from ethomson/mingw_winhttp

winhttp: name mangle class / iid on mingw

8 years agoMerge pull request #3584 from jbreeden/export_fn
Edward Thomson [Fri, 5 Feb 2016 00:43:23 +0000 (16:43 -0800)]
Merge pull request #3584 from jbreeden/export_fn

Export git_stash_apply_init_options

8 years agoMerge pull request #3594 from Ephemera/patch-1
Edward Thomson [Thu, 4 Feb 2016 23:49:00 +0000 (15:49 -0800)]
Merge pull request #3594 from Ephemera/patch-1

Fix typo

8 years agoFix typo
Ephemera [Thu, 4 Feb 2016 16:59:07 +0000 (01:59 +0900)]
Fix typo

8 years agoMerge pull request #3593 from nvanheuverzwijn/patch-1
Edward Thomson [Thu, 4 Feb 2016 16:43:47 +0000 (08:43 -0800)]
Merge pull request #3593 from nvanheuverzwijn/patch-1

Fix a typo in documentation

8 years agoFix a typo in documentation
Nicolas Vanheuverzwijn [Wed, 3 Feb 2016 22:27:04 +0000 (17:27 -0500)]
Fix a typo in documentation

8 years agoIntroduce Contributor Covenant
Edward Thomson [Tue, 2 Feb 2016 22:49:25 +0000 (14:49 -0800)]
Introduce Contributor Covenant

8 years agoFix the build when defining USE_NSEC
Marius Ungureanu [Mon, 25 Jan 2016 12:06:15 +0000 (14:06 +0200)]
Fix the build when defining USE_NSEC

8 years agoExport git_stash_apply_init_options
jbreeden [Sun, 24 Jan 2016 01:13:25 +0000 (17:13 -0800)]
Export git_stash_apply_init_options

8 years agowinhttp: name mangle class / iid on mingw
Edward Thomson [Tue, 19 Jan 2016 17:13:23 +0000 (11:13 -0600)]
winhttp: name mangle class / iid on mingw

Standard Windows type systems define CLSID_InternetSecurityManager
and IID_IInternetSecurityManager, but MinGW lacks these definitions.
As a result, we must hardcode these definitions ourselves.  However,
we should not use a public struct with those names, lest another
library do the same thing and consumers cannot link to both.

8 years agoFree allocated pointer to curl stream on error
Bob Kuo [Sun, 17 Jan 2016 01:39:24 +0000 (19:39 -0600)]
Free allocated pointer to curl stream on error

8 years agoMerge pull request #3573 from pmq20/master-12jan16
Carlos Martín Nieto [Sat, 16 Jan 2016 01:29:17 +0000 (02:29 +0100)]
Merge pull request #3573 from pmq20/master-12jan16

Make packfile_unpack_compressed a private API

8 years agoMerge pull request #3569 from arthurschreiber/arthur/fix-windows-issues
Carlos Martín Nieto [Wed, 13 Jan 2016 16:57:54 +0000 (17:57 +0100)]
Merge pull request #3569 from arthurschreiber/arthur/fix-windows-issues

Fix some issues with generated pkg-config file

8 years agoMake packfile_unpack_compressed a private API
P.S.V.R [Wed, 13 Jan 2016 03:02:38 +0000 (11:02 +0800)]
Make packfile_unpack_compressed a private API

8 years agoWrap path in quotes to support paths containing whitespace.
Arthur Schreiber [Tue, 5 Jan 2016 20:55:11 +0000 (21:55 +0100)]
Wrap path in quotes to support paths containing whitespace.

8 years agoAdd winhttp dependencies to pc file.
Arthur Schreiber [Tue, 5 Jan 2016 18:07:27 +0000 (19:07 +0100)]
Add winhttp dependencies to pc file.