Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'ben/local-transport' into development | Vicent Marti | 2012-11-12 | 1 | -7/+135 |
|\ | |||||
| * | Remove unnecessary progress logic | Ben Straub | 2012-11-12 | 1 | -4/+0 |
| | | | | | | | | | | The indexer handles this better than the fetch logic does. | ||||
| * | Fix error check | Ben Straub | 2012-11-12 | 1 | -1/+1 |
| | | |||||
| * | Avoid copying duplicate commits | Ben Straub | 2012-11-09 | 1 | -7/+8 |
| | | |||||
| * | Implement local transport's fetch | Ben Straub | 2012-11-09 | 1 | -7/+138 |
| | | |||||
* | | repository: Refine repository_head() error report | nulltoken | 2012-11-12 | 2 | -2/+12 |
| | | |||||
* | | create FETCH_HEAD specially instead of as a ref file | Edward Thomson | 2012-11-11 | 8 | -3/+321 |
| | | |||||
* | | Merge pull request #1056 from nulltoken/duplicate-tree-entries | Vicent Martí | 2012-11-10 | 2 | -0/+21 |
|\ \ | | | | | | | Duplicate tree entries | ||||
| * | | index: prevent tree creation from a non merged state | nulltoken | 2012-11-09 | 1 | -0/+6 |
| | | | | | | | | | | | | Fix libgit2/libgit2sharp#243 | ||||
| * | | index: Introduce git_index_has_conflicts() | nulltoken | 2012-11-08 | 1 | -0/+15 |
| |/ | |||||
* | | index: prefer INDEX_OWNER usage | nulltoken | 2012-11-10 | 1 | -1/+1 |
| | | |||||
* | | index: refine add_from_workdir() error report | nulltoken | 2012-11-10 | 1 | -24/+24 |
| | | |||||
* | | index: make git_index_new() work with a NULL path | nulltoken | 2012-11-10 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1058 from pwkelley/development | Vicent Martí | 2012-11-09 | 3 | -6/+11 |
|\ \ | | | | | | | Fixes for two segfaults | ||||
| * | | Fix a mutex/critical section leak | Philip Kelley | 2012-11-09 | 1 | -0/+1 |
| | | | |||||
| * | | Fix uninitialized memory in winhttp subtransport on 64-bit | Philip Kelley | 2012-11-09 | 1 | -1/+4 |
| | | | |||||
| * | | Fix implementation of strndup to not overrun | Philip Kelley | 2012-11-09 | 1 | -5/+6 |
| | | | |||||
* | | | config: make git_config_open_level() work with an empty config | nulltoken | 2012-11-09 | 1 | -2/+0 |
|/ / | |||||
* | | Merge pull request #1052 from delanne/invalid_read | Vicent Martí | 2012-11-09 | 1 | -2/+2 |
|\ \ | |/ |/| | Valgrind reports Invalid Read when the configuration file contains some empty line | ||||
| * | - Update 'tests-clar/resources/config/config11' in order to reproduce the ↵ | delanne | 2012-11-08 | 1 | -2/+2 |
| | | | | | | | | | | | | invalidread with the unittest (just added some \n at the end of the file) - Fix config_file.c | ||||
* | | Merge pull request #1048 from pwkelley/basic_auth | Philip Kelley | 2012-11-08 | 9 | -122/+529 |
|\ \ | |/ |/| | Basic authentication for http and winhttp | ||||
| * | Don't store no_check_cert; fetch it on demand | Philip Kelley | 2012-11-06 | 2 | -24/+16 |
| | | |||||
| * | Fix connection leak in http subtransport | Philip Kelley | 2012-11-06 | 2 | -3/+9 |
| | | |||||
| * | Basic authentication for http and winhttp | Philip Kelley | 2012-11-06 | 8 | -95/+504 |
| | | |||||
* | | Merge pull request #1039 from erikvanzijst/erik/tag_without_message | Vicent Martí | 2012-11-07 | 1 | -7/+10 |
|\ \ | | | | | | | Correctly parse tags lacking a description | ||||
| * | | tags: Fixed the tag parser to correctly treat the message field as optional. | Erik van Zijst | 2012-11-02 | 1 | -7/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix makes libgit2 capable of parsing annotated tag objects that lack the optional message/description field. Previously, libgit2 treated this field as mandatory and raised a tag_error on such tags. However, the message field is optional. An example of such a tag is refs/tags/v2.6.16.31-rc1 in Linux: $ git cat-file tag refs/tags/v2.6.16.31-rc1 object afaa018cefb6af63befef1df7d8febaae904434f type commit tag v2.6.16.31-rc1 tagger Adrian Bunk <bunk@stusta.de> 1162716505 +0100 $ | ||||
* | | | Move inet_pton to posix platform-compatibility layer | Eduardo Bart | 2012-11-07 | 6 | -52/+49 |
| | | | |||||
* | | | Fix compilation for mingw32 and cygwin | Eduardo Bart | 2012-11-06 | 2 | -2/+51 |
| | | | | | | | | | | | | | | | inet_pton is available only in windows vista or later, fixed the issue by reimplementing it using WSAStringToAddress | ||||
* | | | create callback to handle packs from fetch, move the indexer to odb_pack | Edward Thomson | 2012-11-05 | 4 | -16/+105 |
| |/ |/| | |||||
* | | Merge pull request #1046 from libgit2/empty-remote-url-crash | Russell Belfer | 2012-11-05 | 1 | -0/+6 |
|\ \ | | | | | | | Bail out of remote loading if the URL would be NULL | ||||
| * | | 'geterr' -> 'giterr'empty-remote-url-crash | Justin Spahr-Summers | 2012-11-05 | 1 | -1/+1 |
| | | | |||||
| * | | Set GITERR_INVALID when encountering a NULL remote URL | Justin Spahr-Summers | 2012-11-05 | 1 | -0/+1 |
| | | | |||||
| * | | Bail out if remote->url would be NULL | Justin Spahr-Summers | 2012-11-04 | 1 | -0/+5 |
| | | | | | | | | | | | | This fixes a crash from attempting to invoke git__strdup() against NULL. | ||||
* | | | Merge pull request #1044 from dahlbyk/repo/state | Russell Belfer | 2012-11-05 | 1 | -3/+0 |
|\ \ \ | | | | | | | | | Fix state when HEAD is not detached | ||||
| * | | | repo: fix state when HEAD is not detached | Keith Dahlby | 2012-11-04 | 1 | -3/+0 |
| |/ / | |||||
* | | | Merge pull request #1034 from carlosmn/packbuilder-foreach | Vicent Martí | 2012-11-05 | 1 | -0/+16 |
|\ \ \ | |/ / |/| | | Let the user grab the packfile as it's being written | ||||
| * | | packbuilder: add accessors for the number of total and written objects | Carlos Martín Nieto | 2012-11-01 | 1 | -0/+10 |
| | | | |||||
| * | | packbuilder: add git_packbuilder_foreach | Carlos Martín Nieto | 2012-11-01 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | Let the user get each object as a buffer+size pair so they can handle the packfile content as they need to. | ||||
* | | | Merge pull request #1042 from pwkelley/progress_cb | Philip Kelley | 2012-11-02 | 1 | -8/+15 |
|\ \ \ | | | | | | | | | Fix bytes_received in fetch tests - we weren't calling the callback | ||||
| * | | | Fix bytes_received in fetch tests - we weren't calling the callback | Philip Kelley | 2012-11-02 | 1 | -8/+15 |
| | | | | |||||
* | | | | Move error capture to top of giterr_set | Russell Belfer | 2012-11-02 | 1 | -4/+4 |
| | | | | |||||
* | | | | Merge pull request #1014 from arrbee/diff-rename-detection | Vicent Martí | 2012-11-02 | 5 | -183/+538 |
|\ \ \ \ | |/ / / |/| | | | Initial implementation of diff rename detection | ||||
| * | | | Move rename detection into new file | Russell Belfer | 2012-10-30 | 5 | -319/+524 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves the naming for the rename related functionality moving it to be called `git_diff_find_similar()` and renaming all the associated constants, etc. to make more sense. I also moved the new code (plus the existing `git_diff_merge`) into a new file `diff_tform.c` where I can put new functions related to manipulating git diff lists. This also updates the implementation significantly from the last revision fixing some ordering issues (where break-rewrite needs to be handled prior to copy and rename detection) and improving config option handling. | ||||
| * | | | Initial implementation of diff rename detection | Russell Belfer | 2012-10-23 | 2 | -0/+150 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements the basis for diff rename and copy detection, although it is based on simple SHA comparison right now instead of using a matching algortihm. Just as `git_diff_merge` can be used as a post-pass on diffs to emulate certain command line behaviors, there is a new API `git_diff_detect` which will update a diff list in-place, adjusting some deltas to RENAMED or COPIED state (and also, eventually, splitting MODIFIED deltas where the change is too large into DELETED/ADDED pairs). This also adds a new test repo that will hold rename/copy/split scenarios. Right now, it just has exact-match rename and copy, but the tests are written to use tree diffs, so we should be able to add new test scenarios easily without breaking tests. | ||||
* | | | | Merge pull request #1040 from ethomson/index_refactor | Philip Kelley | 2012-11-02 | 1 | -3/+9 |
|\ \ \ \ | | | | | | | | | | | Free conflict index entries on removal | ||||
| * | | | | freeing index entries would be helpful | Edward Thomson | 2012-11-02 | 1 | -3/+9 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #1041 from pwkelley/transports | Philip Kelley | 2012-11-02 | 1 | -30/+19 |
|\ \ \ \ | |/ / / |/| | | | Prefer GetLastError() for GITERR_OS on Win32 | ||||
| * | | | Prefer GetLastError() for GITERR_OS on Win32 | Philip Kelley | 2012-11-02 | 1 | -30/+19 |
| | | | | |||||
* | | | | Merge pull request #1038 from arrbee/doc-fixes | Vicent Martí | 2012-11-01 | 2 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | Improve docs, examples, warnings | ||||
| * | | | | Improve docs, examples, warnings | Russell Belfer | 2012-11-01 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves docs in some of the public header files, cleans up and improves some of the example code, and fixes a couple of pedantic warnings in places. |