summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* revwalk: refactor the initial mark-unintersting loopethomson/revwalk_hide_oldCarlos Martín Nieto2016-08-311-51/+6
| | | | | | | | We're now close to the way git itself does it, and most of the logic goes into mark_parents_uninteresting so we can remove our own loop from premark_uninteresting. This function then becomes so simple we should extract its loop and make it part of loop we're running over the same input in its caller.
* revwalk: mark all incoming uninteresting commits' parentsCarlos Martín Nieto2016-08-311-0/+35
| | | | | Failing to do so can mean the priority queue never gets around to the unintersting commits that are older than the rest of the history.
* revwalk: reverse bad logic when marking uninterestingCarlos Martín Nieto2016-07-211-1/+1
| | | | | | We want to loop until there are no more interesting commits in the array. The reversed logic will stop prematurely leading to incorrect results in cases with nonmonotonic timestamps.
* revwalk: introduce tests that hide old commitsEdward Thomson2016-06-2514-0/+60
| | | | | | Introduce some tests that show some commits, while hiding some commits that have a timestamp older than the common ancestors of these two commits.
* Merge pull request #3834 from pks-t/pks/cleanupsEdward Thomson2016-06-216-99/+6
|\ | | | | Cleanups
| * Remove unused static functionsPatrick Steinhardt2016-06-213-93/+0
| |
| * Avoid old-style function definitionsPatrick Steinhardt2016-06-213-6/+6
| | | | | | | | | | | | Avoid declaring old-style functions without any parameters. Functions not accepting any parameters should be declared with `void fn(void)`. See ISO C89 $3.5.4.3.
* | Merge pull request #3833 from pks-t/pks/msys-conditional-fpicEdward Thomson2016-06-211-6/+8
|\ \ | |/ |/| cmake: do not use -fPIC for MSYS2
| * cmake: do not use -fPIC for MSYS2Patrick Steinhardt2016-06-211-6/+8
|/ | | | | | | | | The MSYS2 build system automatically compiles all code with position-independent code. When we manually add the -fPIC flag to the compiler flags, MSYS2 will loudly complain about PIC being the default and thus not required. Fix the annoyance by stripping -fPIC in MSYS2 enviroments like it is already done for MinGW.
* Merge pull request #3830 from pks-t/pks/thread-namespacingEdward Thomson2016-06-2012-233/+181
|\ | | | | Thread namespacing
| * threads: add platform-independent thread initialization functionPatrick Steinhardt2016-06-204-32/+32
| |
| * win32: rename pthread.{c,h} to thread.{c,h}Patrick Steinhardt2016-06-205-7/+7
| | | | | | | | | | | | | | | | | | | | 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.
| * threads: remove now-useless typedefsPatrick Steinhardt2016-06-201-7/+0
| |
| * threads: remove unused function pthread_num_processors_npPatrick Steinhardt2016-06-202-13/+0
| | | | | | | | | | The function pthread_num_processors_np is currently unused and superseded by the function `git_online_cpus`. Remove the function.
| * threads: split up OS-dependent rwlock codePatrick Steinhardt2016-06-204-43/+31
| |
| * threads: split up OS-dependent thread-condition codePatrick Steinhardt2016-06-204-20/+17
| |
| * threads: remove unused function pthread_cond_broadcastPatrick Steinhardt2016-06-203-6/+0
| |
| * threads: split up OS-dependent mutex codePatrick Steinhardt2016-06-204-26/+23
| |
| * threads: split up OS-dependent thread codePatrick Steinhardt2016-06-208-45/+37
| |
* | Merge pull request #3818 from meatcoder/fix_odb_read_errorEdward Thomson2016-06-201-1/+1
|\ \ | | | | | | | | | Fix truncation of SHA in error message for git_odb_read
| * | fix error message SHA truncation in git_odb__error_notfound()Sim Domingo2016-06-201-1/+1
| | |
* | | Merge pull request #3827 from dbrnz/basic_authEdward Thomson2016-06-201-1/+1
|\ \ \ | |_|/ |/| | HTTP authentication scheme name is case insensitive.
| * | HTTP authentication scheme name is case insensitive.David Brooks2016-06-191-1/+1
|/ /
* | Merge pull request #3823 from libgit2/ethomson/checkout_no_indexCarlos Martín Nieto2016-06-172-1/+69
|\ \ | | | | | | checkout: use empty baseline when no index file exists
| * | checkout: use empty baseline when no indexethomson/checkout_no_indexEdward Thomson2016-06-152-1/+69
| | | | | | | | | | | | | | | When no index file exists and a baseline is not explicitly provided, use an empty baseline instead of trying to load `HEAD`.
* | | Merge pull request #3822 from libgit2/ethomson/checkout_head_docsCarlos Martín Nieto2016-06-161-0/+7
|\ \ \ | |/ / |/| | documentation: improve docs for `checkout_head`
| * | documentation: improve docs for `checkout_head`ethomson/checkout_head_docsEdward Thomson2016-06-151-0/+7
| | | | | | | | | | | | | | | `git_checkout_head` is sadly misunderstood as something that can switch branches. It cannot. Update the documentation to reflect this.
* | | Merge pull request #3812 from stinb/fetch-tag-update-callbackEdward Thomson2016-06-141-1/+5
|\ \ \ | |/ / |/| | fetch: Fixed spurious update callback for existing tags.
| * | fetch: Fixed spurious update callback for existing tags.Jason Haslam2016-06-141-1/+5
| |/
* | Merge pull request #3816 from pks-t/pks/memory-leaksEdward Thomson2016-06-143-9/+23
|\ \ | | | | | | Memory leak fixes
| * | winhttp: plug several memory leaksPatrick Steinhardt2016-06-071-2/+16
| | |
| * | global: clean up crt only after freeing tls dataPatrick Steinhardt2016-06-071-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | tests: fix memory leaks in checkout::typechangePatrick Steinhardt2016-06-071-2/+2
| |/
* | Merge pull request #3814 from pks-t/pks/invalid-memrefsEdward Thomson2016-06-143-2/+15
|\ \ | |/ |/| Fix invalid memory references
| * index: fix NULL pointer access in index_remove_entryPatrick Steinhardt2016-06-071-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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`.
| * transports: smart: fix potential invalid memory dereferencesPatrick Steinhardt2016-06-072-0/+12
|/ | | | | | | | | | | | | | | | | | | | | | | 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.
* Merge pull request #3808 from ethomson/read_index_fixesEdward Thomson2016-06-0210-1/+151
|\ | | | | `git_index_read_index` fixes
| * index_read_index: invalidate new paths in tree cacheEdward Thomson2016-06-021-0/+6
| | | | | | | | | | | | 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.
| * rebase: test rebasing a new commit with subfolderEdward Thomson2016-06-028-0/+83
| | | | | | | | | | Test a rebase (both a merge rebase and an inmemory rebase) with a new commit that adds files underneath a new subfolder.
| * test: ensure we can round-trip a written treeEdward Thomson2016-06-021-0/+23
| | | | | | | | | | Read a tree into an index, write the index, then re-open the index and ensure that we are treesame to the original.
| * index_read_index: set flags for path_len correctlyEdward Thomson2016-06-021-0/+3
| | | | | | | | Update the flags to reset the path_len (to emulate `index_insert`)
| * index_read_index: differentiate on modeEdward Thomson2016-06-021-1/+2
| | | | | | | | | | Treat index entries with different modes as different, which they are, at least for the purposes of up-to-date calculations.
| * index_read_index: reset error correctlyEdward Thomson2016-06-021-0/+2
| | | | | | | | | | | | 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.
| * round-trip trees through index_read_indexEdward Thomson2016-06-021-0/+32
|/ | | | | | | 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.
* Merge pull request #3796 from mmuman/haikuEdward Thomson2016-06-011-0/+4
|\ | | | | Preliminary Haiku port
| * CMakeLists: Add libnetwork for HaikuFrançois Revol2016-05-221-0/+4
| |
* | Merge pull request #3801 from ethomson/warningEdward Thomson2016-06-015-9/+11
|\ \ | | | | | | cleanup: unused warning
| * | win32: clean up unused warnings in DllMainEdward Thomson2016-06-011-0/+3
| | |
| * | rebase: change assertion to avoidEdward Thomson2016-06-011-4/+1
| | | | | | | | | | | | | | | | | | | | | 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.
| * | filebuf: fix uninitialized warningEdward Thomson2016-06-011-1/+1
| | |