Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix segmentation fault observed on OpenBSD/sparc64cmn/mmap-readable | Stefan Sperling | 2014-11-03 | 1 | -4/+2 |
| | | | | | A non-readable mapping of a file causes an access violation in the pack tests. Always use PROT_READ to work around this. | ||||
* | remote: fix tagopt test | Carlos Martín Nieto | 2014-11-02 | 1 | -7/+7 |
| | | | | | | | | | | | An anonymous remote wouldn't create remote-tracking branches, so testing we don't create them for TAGS_ALL is nonsensical. Furthermore, the name of the supposed remote-tracking branch was also not one which would have been created had it had a name. Give the remote a name and test that we only create the tags when we pass TAGS_ALL and that we do create the remote-branch branch when given TAGS_AUTO. | ||||
* | merge: talk about the merging state after git_merge() | Carlos Martín Nieto | 2014-11-02 | 1 | -0/+5 |
| | | | | | Since it's not necessarily obvious, mention the merging state and how to clear it. | ||||
* | Merge pull request #2669 from ethomson/revert_test_fix | Edward Thomson | 2014-10-27 | 13 | -12/+8 |
|\ | | | | | revert tests: always use core.autocrlf=false in tests | ||||
| * | revert tests: always use core.autocrlf=false in tests | Edward Thomson | 2014-10-27 | 13 | -12/+8 |
|/ | |||||
* | Merge pull request #2659 from swisspol/static_analysis | Edward Thomson | 2014-10-27 | 5 | -8/+3 |
|\ | | | | | Fixed the most obvious Clang static analyzer warnings | ||||
| * | Fixed potential crash with uninitialized variables | Pierre-Olivier Latour | 2014-10-27 | 2 | -2/+2 |
| | | |||||
| * | Removed some useless variable assignments | Pierre-Olivier Latour | 2014-10-27 | 4 | -6/+1 |
|/ | |||||
* | Merge pull request #2666 from libgit2/cmn/threadsafe-on | Edward Thomson | 2014-10-27 | 3 | -2/+5 |
|\ | | | | | Flip THREADSAFE's default to ON | ||||
| * | Flip THREADSAFE's default to ONcmn/threadsafe-on | Carlos Martín Nieto | 2014-10-27 | 3 | -2/+5 |
| | | | | | | | | | | | | Threads are here to stay; and for a while now, users have had to call the initialization function which sets up threads and crypto regardless of whether the library was built threadsafe or not. | ||||
* | | Merge commit 'refs/pull/2366/head' of github.com:libgit2/libgit2 | Carlos Martín Nieto | 2014-10-27 | 8 | -24/+29 |
|\ \ | |/ |/| | |||||
| * | Fix compiler warning (git_off_t cast to size_t). | Albert Meltzer | 2014-05-19 | 8 | -24/+29 |
| | | | | | | | | | | | | Use size_t for page size, instead of long. Check result of sysconf. Use size_t for page offset so no cast to size_t (second arg to p_mmap). Use mod instead div/mult pair, so no cast to size_t is necessary. | ||||
* | | Merge branch 'csware/cleanup' | Edward Thomson | 2014-10-26 | 1 | -8/+6 |
|\ \ | |||||
| * | | Minor cleanup: Use defined no_check_cert_flags instead of C&P them again | Sven Strickroth | 2014-10-26 | 1 | -8/+6 |
|/ / | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de> | ||||
* | | Merge pull request #2482 from libgit2/ed/rebase | Edward Thomson | 2014-10-26 | 169 | -566/+3381 |
|\ \ | | | | | | | Rebase (merge) | ||||
| * | | rebase: add information to the CHANGELOGed/rebase | Edward Thomson | 2014-10-26 | 1 | -0/+14 |
| | | | |||||
| * | | rebase: updates based on PR comments | Edward Thomson | 2014-10-26 | 3 | -34/+47 |
| | | | |||||
| * | | s/git_merge_head/git_annotated_commit | Edward Thomson | 2014-10-26 | 21 | -631/+700 |
| | | | | | | | | | | | | | | | Rename git_merge_head to git_annotated_commit, as it becomes used in more operations than just merge. | ||||
| * | | rebase: clean up some warnings and memory leaks | Edward Thomson | 2014-10-26 | 2 | -26/+15 |
| | | | |||||
| * | | rebase: oid member of operation should be const | Edward Thomson | 2014-10-26 | 2 | -3/+3 |
| | | | |||||
| * | | git_rebase: iterators for operations | Edward Thomson | 2014-10-26 | 3 | -0/+156 |
| | | | |||||
| * | | rebase: preload all operations | Edward Thomson | 2014-10-26 | 3 | -125/+165 |
| | | | |||||
| * | | rebase: init/open a git_rebase object | Edward Thomson | 2014-10-26 | 6 | -295/+398 |
| | | | |||||
| * | | git_rebase_next: provide info about the operation | Edward Thomson | 2014-10-26 | 3 | -25/+111 |
| | | | |||||
| * | | git_rebase_finish: rewrite notes when finishing rebase | Edward Thomson | 2014-10-26 | 3 | -18/+255 |
| | | | |||||
| * | | Introduce `git_note_author`, `git_note_committer` | Edward Thomson | 2014-10-26 | 3 | -4/+51 |
| | | | |||||
| * | | git_rebase_commit: write HEAD's reflog appropriately | Edward Thomson | 2014-10-26 | 5 | -35/+67 |
| | | | |||||
| * | | Introduce git_rebase_finish to complete a rebase | Edward Thomson | 2014-10-26 | 3 | -1/+131 |
| | | | |||||
| * | | git_rebase_next: test that we return GIT_ITEROVER | Edward Thomson | 2014-10-26 | 1 | -0/+50 |
| | | | |||||
| * | | git_rebase_commit: drop already-picked commits | Edward Thomson | 2014-10-26 | 14 | -5/+62 |
| | | | | | | | | | | | | | | | | | | Already cherry-picked commits should not be re-included. If all changes included in a commit exist in the upstream, then we should error with GIT_EAPPLIED. | ||||
| * | | Introduce git_rebase_commit | Edward Thomson | 2014-10-26 | 5 | -11/+241 |
| | | | | | | | | | | | | Commit the current patch of a rebase process. | ||||
| * | | git_rebase_next: write conflicts nicely during rebase | Edward Thomson | 2014-10-26 | 2 | -18/+161 |
| | | | |||||
| * | | Introduce git_rebase_next | Edward Thomson | 2014-10-26 | 3 | -0/+228 |
| | | | | | | | | | | | | | | | | | | `git_rebase_next` will apply the next patch (or cherry-pick) operation, leaving the results checked out in the index / working directory so that consumers can resolve any conflicts, as appropriate. | ||||
| * | | Introduce git_rebase_abort | Edward Thomson | 2014-10-26 | 3 | -0/+289 |
| | | | | | | | | | | | | | | | Abort an in-progress rebase and move the working directory and repository back to the ORIG_HEAD state. | ||||
| * | | git_reset: const the git_signature arg | Edward Thomson | 2014-10-26 | 2 | -2/+2 |
| | | | |||||
| * | | Introduce git_rebase to set up a rebase session | Edward Thomson | 2014-10-26 | 131 | -24/+926 |
|/ / | | | | | | | | | | | Introduce `git_rebase` to set up a rebase session that can then be continued. Immediately, only merge-type rebase is supported. | ||||
* | | Merge pull request #2612 from ethomson/warnings | Edward Thomson | 2014-10-26 | 14 | -49/+69 |
|\ \ | | | | | | | Clean up some warnings | ||||
| * | | Remove unused warning on non-win32 | Edward Thomson | 2014-10-26 | 1 | -1/+1 |
| | | | |||||
| * | | iterator: free paths when skipping them | Edward Thomson | 2014-10-26 | 1 | -1/+4 |
| | | | |||||
| * | | revwalk::mergebase test: free memory | Edward Thomson | 2014-10-26 | 1 | -0/+1 |
| | | | |||||
| * | | mwindow: clean up pack map at shutdown | Edward Thomson | 2014-10-26 | 1 | -0/+2 |
| | | | |||||
| * | | submodule test: free submodule | Edward Thomson | 2014-10-26 | 1 | -0/+1 |
| | | | |||||
| * | | global: clean up openssl_locks on shutdown | Edward Thomson | 2014-10-26 | 1 | -1/+7 |
| | | | |||||
| * | | clone::local test: isalpha -> git__isalpha | Edward Thomson | 2014-10-26 | 1 | -1/+1 |
| | | | |||||
| * | | config test: clean up memory leak | Edward Thomson | 2014-10-26 | 1 | -0/+1 |
| | | | |||||
| * | | Cleanup memory leak in ssh transport | Edward Thomson | 2014-10-26 | 1 | -34/+28 |
| | | | |||||
| * | | Clean up some memory leaks | Edward Thomson | 2014-10-26 | 2 | -0/+3 |
| | | | |||||
| * | | Clean up various compiler warnings | Edward Thomson | 2014-10-26 | 5 | -11/+20 |
|/ / | |||||
* | | Merge from 2660 | Carlos Martín Nieto | 2014-10-27 | 1 | -1/+2 |
|\ \ | |||||
| * | | tests: fix leak | Carlos Martín Nieto | 2014-10-27 | 1 | -0/+1 |
| | | |