Commit Graph

9463 Commits

Author SHA1 Message Date
Patrick Steinhardt
8aaa9fb623 win32: rename pthread.{c,h} to thread.{c,h}
The old pthread-file did re-implement the pthreads API with exact symbol
matching. As the thread-abstraction has now been split up between Unix- and
Windows-specific files within the `git_` namespace to avoid symbol-clashes
between libgit2 and pthreads, the rewritten wrappers have nothing to do with
pthreads anymore.

Rename the Windows-specific pthread-files to honor this change.
2016-06-20 19:50:18 +02:00
Patrick Steinhardt
a342e870fc threads: remove now-useless typedefs 2016-06-20 19:50:16 +02:00
Patrick Steinhardt
4f10c1e65c threads: remove unused function pthread_num_processors_np
The function pthread_num_processors_np is currently unused and superseded by the
function `git_online_cpus`. Remove the function.
2016-06-20 19:50:11 +02:00
Patrick Steinhardt
6551004fb1 threads: split up OS-dependent rwlock code 2016-06-20 19:49:40 +02:00
Patrick Steinhardt
139bffa074 threads: split up OS-dependent thread-condition code 2016-06-20 19:49:34 +02:00
Patrick Steinhardt
20d078dff1 threads: remove unused function pthread_cond_broadcast 2016-06-20 19:48:19 +02:00
Patrick Steinhardt
1c13540510 threads: split up OS-dependent mutex code 2016-06-20 19:34:51 +02:00
Patrick Steinhardt
faebc1c6ec threads: split up OS-dependent thread code 2016-06-20 19:32:59 +02:00
Carlos Martín Nieto
69c71f2917 Merge pull request #3823 from libgit2/ethomson/checkout_no_index
checkout: use empty baseline when no index file exists
2016-06-17 15:45:55 +02:00
Carlos Martín Nieto
3e9830d7bc Merge pull request #3822 from libgit2/ethomson/checkout_head_docs
documentation: improve docs for `checkout_head`
2016-06-16 08:53:30 +02:00
Edward Thomson
bb0bd71ab4 checkout: use empty baseline when no index
When no index file exists and a baseline is not explicitly provided, use
an empty baseline instead of trying to load `HEAD`.
2016-06-15 15:47:28 -05:00
Edward Thomson
b926648839 documentation: improve docs for checkout_head
`git_checkout_head` is sadly misunderstood as something that can
switch branches.  It cannot.  Update the documentation to reflect this.
2016-06-15 15:23:39 -05:00
Edward Thomson
abb6f72aaa Merge pull request #3812 from stinb/fetch-tag-update-callback
fetch: Fixed spurious update callback for existing tags.
2016-06-14 11:42:00 -10:00
Jason Haslam
7f9673e415 fetch: Fixed spurious update callback for existing tags. 2016-06-14 14:46:12 -06:00
Edward Thomson
2a09de91a8 Merge pull request #3816 from pks-t/pks/memory-leaks
Memory leak fixes
2016-06-14 04:33:55 -10:00
Edward Thomson
65e4ab7a33 Merge pull request #3814 from pks-t/pks/invalid-memrefs
Fix invalid memory references
2016-06-14 04:10:11 -10:00
Patrick Steinhardt
43c55111d9 winhttp: plug several memory leaks 2016-06-07 15:36:13 +02:00
Patrick Steinhardt
432af52b37 global: clean up crt only after freeing tls data
The thread local storage is used to hold some global state that
is dynamically allocated and should be freed upon exit. On
Windows, we clean up the C run-time right after execution of
registered shutdown callbacks and before cleaning up the TLS.

When we clean up the CRT, we also cause it to analyze for memory
leaks. As we did not free the TLS yet this will lead to false
positives.

Fix the issue by first freeing the TLS and cleaning up the CRT
only afterwards.
2016-06-07 12:55:17 +02:00
Patrick Steinhardt
292c60275e tests: fix memory leaks in checkout::typechange 2016-06-07 12:29:16 +02:00
Patrick Steinhardt
13deb8745d index: fix NULL pointer access in index_remove_entry
When removing an entry from the index by its position, we first
retrieve the position from the index's entries and then try to
remove the retrieved value from the index map with
`DELETE_IN_MAP`. When `index_remove_entry` returns `NULL` we try
to feed it into the `DELETE_IN_MAP` macro, which will
unconditionally call `idxentry_hash` and then happily dereference
the `NULL` entry pointer.

Fix the issue by not passing a `NULL` entry into `DELETE_IN_MAP`.
2016-06-07 09:14:14 +02:00
Patrick Steinhardt
7d02019a07 transports: smart: fix potential invalid memory dereferences
When we receive a packet of exactly four bytes encoding its
length as those four bytes it can be treated as an empty line.
While it is not really specified how those empty lines should be
treated, we currently ignore them and do not return an error when
trying to parse it but simply advance the data pointer.

Callers invoking `git_pkt_parse_line` are currently not prepared
to handle this case as they do not explicitly check this case.
While they could always reset the passed out-pointer to `NULL`
before calling `git_pkt_parse_line` and determine if the pointer
has been set afterwards, it makes more sense to update
`git_pkt_parse_line` to set the out-pointer to `NULL` itself when
it encounters such an empty packet. Like this it is guaranteed
that there will be no invalid memory references to free'd
pointers.

As such, the issue has been fixed such that `git_pkt_parse_line`
always sets the packet out pointer to `NULL` when an empty packet
has been received and callers check for this condition, skipping
such packets.
2016-06-07 09:14:14 +02:00
Edward Thomson
f0ee795ccb Merge pull request #3808 from ethomson/read_index_fixes
`git_index_read_index` fixes
2016-06-02 03:08:26 -05:00
Edward Thomson
46082c384f index_read_index: invalidate new paths in tree cache
When adding a new entry to an existing index via `git_index_read_index`,
be sure to remove the tree cache entry for that new path.  This will
mark all parent trees as dirty.
2016-06-02 02:38:55 -05:00
Edward Thomson
5acf18ac63 rebase: test rebasing a new commit with subfolder
Test a rebase (both a merge rebase and an inmemory rebase) with a new
commit that adds files underneath a new subfolder.
2016-06-02 02:38:18 -05:00
Edward Thomson
91fbf9d867 test: ensure we can round-trip a written tree
Read a tree into an index, write the index, then re-open the index and
ensure that we are treesame to the original.
2016-06-02 02:37:04 -05:00
Edward Thomson
9167c1450e index_read_index: set flags for path_len correctly
Update the flags to reset the path_len (to emulate `index_insert`)
2016-06-02 02:36:50 -05:00
Edward Thomson
046ec3c9d6 index_read_index: differentiate on mode
Treat index entries with different modes as different, which they
are, at least for the purposes of up-to-date calculations.
2016-06-02 02:36:46 -05:00
Edward Thomson
93de20b8d2 index_read_index: reset error correctly
Clear any error state upon each iteration.  If one of the iterations
ends (with an error of `GIT_ITEROVER`) we need to reset that error to 0,
lest we stop the whole process prematurely.
2016-06-02 02:36:44 -05:00
Edward Thomson
5baa20b86e round-trip trees through index_read_index
Read a tree into an index using `git_index_read_index` (by reading
a tree into a new index, then reading that index into the current
index), then write the index back out, ensuring that our new index
is treesame to the tree that we read.
2016-06-02 00:59:46 -05:00
Edward Thomson
0aaba44593 Merge pull request #3796 from mmuman/haiku
Preliminary Haiku port
2016-06-01 11:33:58 -05:00
Edward Thomson
efb432c9b9 Merge pull request #3801 from ethomson/warning
cleanup: unused warning
2016-06-01 11:05:45 -05:00
Edward Thomson
14cf05dae8 win32: clean up unused warnings in DllMain 2016-06-01 10:03:52 -05:00
Edward Thomson
4505a42a23 rebase: change assertion to avoid
It looks like we're getting the operation and not doing anything
with it, when in fact we are asserting that it's not null.  Simply
assert that we are within the operation boundary instead of using
the `git_array_get` macro to do this for us.
2016-06-01 10:03:52 -05:00
Edward Thomson
e3c42fee77 filebuf: fix uninitialized warning 2016-06-01 10:03:52 -05:00
Edward Thomson
0d77a56f39 checkout: drop unused repo 2016-06-01 10:03:51 -05:00
Edward Thomson
c2f18b9b06 cleanup: unused warning 2016-06-01 10:03:51 -05:00
Edward Thomson
37dba1a739 Merge pull request #3803 from glensc/patch-1
Update CMakeLists.txt
2016-05-27 09:15:01 -05:00
Elan Ruusamäe
13b0b7d520 Update CMakeLists.txt
typo fix
2016-05-27 10:20:35 +03:00
Edward Thomson
784bb30300 Merge pull request #3799 from sschuberth/master
Use AppVeyor's Start-FileDownload cmdlet
2016-05-26 10:28:00 -05:00
Edward Thomson
e102daa4f6 Merge pull request #3798 from mmuman/stat-test-fix
test: Fix stat() test to mask out unwanted bits
2016-05-26 10:25:40 -05:00
Edward Thomson
06f42b6217 Merge branch 'checkout_submodules' 2016-05-26 01:20:41 -05:00
Jason Haslam
c864b4ab99 Ignore submodules when checking for merge conflicts in the workdir. 2016-05-26 01:11:55 -05:00
Jason Haslam
afab1fff01 checkout: handle dirty submodules correctly
Don't generate conflicts when checking out a modified submodule and the
submodule is dirty or modified in the workdir.
2016-05-26 01:11:34 -05:00
Edward Thomson
fdf14637d5 Merge pull request #3792 from edquist/misc
Fix comment for GIT_FILEMODE_LINK
2016-05-26 00:58:43 -05:00
Sebastian Schuberth
247665ed51 Use AppVeyor's Start-FileDownload cmdlet
Start-FileDownload maintains current directory context and allows
specifying a request timeout, see [1].

[1] https://www.appveyor.com/docs/how-to/download-file#start-filedownload-cmdlet
2016-05-25 12:10:44 +02:00
François Revol
407f2e9fbd test: Fix stat() test to mask out unwanted bits
Haiku and Hurd both pass extra bits in struct stat::st_mode.
2016-05-24 20:01:49 +02:00
Carlos Martín Nieto
c756448cef Merge pull request #3797 from libgit2/cmn/remove-single-entry
tree: handle removal of all entries in the updater
2016-05-24 16:15:57 +02:00
Carlos Martín Nieto
a2cb47130e tree: handle removal of all entries in the updater
When we remove all entries in a tree, we should remove that tree from
its parent rather than include the empty tree.
2016-05-24 14:30:43 +02:00
Carlos Martín Nieto
c91a1dc1d9 Merge pull request #3794 from libgit2/cmn/tree-update-basename
Tree updater fixups
2016-05-23 18:02:24 +02:00
François Revol
d94f503729 CMakeLists: Add libnetwork for Haiku 2016-05-22 23:24:30 +02:00