summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 'geterr' -> 'giterr'empty-remote-url-crashJustin Spahr-Summers2012-11-051-1/+1
|
* Set GITERR_INVALID when encountering a NULL remote URLJustin Spahr-Summers2012-11-051-0/+1
|
* Bail out if remote->url would be NULLJustin Spahr-Summers2012-11-041-0/+5
| | | | This fixes a crash from attempting to invoke git__strdup() against NULL.
* Merge pull request #1042 from pwkelley/progress_cbPhilip Kelley2012-11-021-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 callbackPhilip Kelley2012-11-021-8/+15
| |
* | Move error capture to top of giterr_setRussell Belfer2012-11-021-4/+4
| |
* | Merge pull request #1014 from arrbee/diff-rename-detectionVicent Martí2012-11-025-183/+538
|\ \ | |/ |/| Initial implementation of diff rename detection
| * Move rename detection into new fileRussell Belfer2012-10-305-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 detectionRussell Belfer2012-10-232-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_refactorPhilip Kelley2012-11-021-3/+9
|\ \ | | | | | | Free conflict index entries on removal
| * | freeing index entries would be helpfulEdward Thomson2012-11-021-3/+9
| | |
* | | Merge pull request #1041 from pwkelley/transportsPhilip Kelley2012-11-021-30/+19
|\ \ \ | |/ / |/| | Prefer GetLastError() for GITERR_OS on Win32
| * | Prefer GetLastError() for GITERR_OS on Win32Philip Kelley2012-11-021-30/+19
| | |
* | | Merge pull request #1038 from arrbee/doc-fixesVicent Martí2012-11-012-3/+3
|\ \ \ | | | | | | | | Improve docs, examples, warnings
| * | | Improve docs, examples, warningsRussell Belfer2012-11-012-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.
* | | | index: Add `git_index_new`index-open-cleanupVicent Marti2012-11-011-0/+5
| | | |
* | | | index: Fix testsVicent Marti2012-11-013-4/+2
| | | |
* | | | index: Add git_index_write_treeVicent Marti2012-11-013-14/+52
| | | |
* | | | index: Switch to git_futils_filestampVicent Marti2012-11-012-20/+18
|/ / /
* | | Update of text stats calculationJameson Miller2012-11-011-4/+0
| | | | | | | | | | | | | | | Do not interpret 0x85 as Next Line (NEL) char when gathering statistics for a text file.
* | | Merge pull request #1030 from pwkelley/transportsVicent Martí2012-11-0122-1557/+2249
|\ \ \ | |/ / | | | Reorganize transport architecture
| * | Http: Set an error for invalid content-typePhilip Kelley2012-11-011-1/+3
| | |
| * | Improve consistency of WinHTTP request headersPhilip Kelley2012-11-011-1/+18
| | |
| * | Reorganize transport architecture (squashed 3)Philip Kelley2012-11-0122-1556/+2229
| | |
* | | Merge branch 'config-refresh' into developmentVicent Marti2012-10-3110-43/+192
|\ \ \
| * | | I LIKE THESE NAMESVicent Marti2012-10-314-15/+15
| | | |
| * | | Better naming for file timestamp/size checkerRussell Belfer2012-10-314-31/+57
| | | |
| * | | Add git_config_refresh() API to reload configRussell Belfer2012-10-3010-41/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a new API that allows users to reload the config if the file has changed on disk. A new config callback function to refresh the config was added. The modified time and file size are used to test if the file needs to be reloaded (and are now stored in the disk backend object). In writing tests, just using mtime was a problem / race, so I wanted to check file size as well. To support that, I extended `git_futils_readbuffer_updated` to optionally check file size in addition to mtime, and I added a new function `git_filebuf_stats` to fetch the mtime and size for an open filebuf (so that the config could be easily refreshed after a write). Lastly, I moved some similar file checking code for attributes into filebuf. It is still only being used for attrs, but it seems potentially reusable, so I thought I'd move it over.
* | | | Checkout: remove duplicate 100% progress reportBen Straub2012-10-311-2/+0
| | | |
* | | | Ensure that non-error is not propagatedBen Straub2012-10-311-0/+1
|/ / /
* | | Merge pull request #1017 from arrbee/diff-patch-to-strVicent Martí2012-10-301-0/+71
|\ \ \ | | | | | | | | Add git_diff_patch_to_str API
| * | | Add git_diff_patch_printRussell Belfer2012-10-251-13/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a `git_diff_patch_print()` API which is more like the existing API to "print" a patch from an entire `git_diff_list` but operates on a single `git_diff_patch` object. Also, it rewrites the `git_diff_patch_to_str()` API to use that function (making it very small).
| * | | Check errors while generating diff patch stringRussell Belfer2012-10-251-4/+11
| | | |
| * | | Add git_diff_patch_to_str APIRussell Belfer2012-10-241-0/+54
| | | | | | | | | | | | | | | | | | | | This adds an API to generate a complete single-file patch text from a git_diff_patch object.
* | | | Merge pull request #1026 from nulltoken/repo/stateVicent Martí2012-10-302-1/+26
|\ \ \ \ | | | | | | | | | | repo: enhance git_repository_state() detection
| * | | | repo: enhance git_repository_state() detectionnulltoken2012-10-272-1/+26
| | | | |
* | | | | Merge pull request #1029 from ethomson/index_refactorVicent Martí2012-10-309-90/+562
|\ \ \ \ \ | | | | | | | | | | | | Index changes
| * | | | | index refactoringEdward Thomson2012-10-299-90/+562
| | | | | |
* | | | | | Fix a couple of warningsMichael Schubert2012-10-301-1/+1
|/ / / / /
* | | | | Fetch: don't clobber received countBen Straub2012-10-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | This memset was being reached after the entire packfile under WinHttp, so the byte count was being lost for small repos.
* | | | | Merge pull request #796 from nulltoken/topic/git-stashVicent Martí2012-10-294-8/+681
|\ \ \ \ \ | |_|_|/ / |/| | | | Stash
| * | | | stash: add git_stash_drop()nulltoken2012-10-262-1/+41
| | | | |
| * | | | stash: add git_stash_foreach()nulltoken2012-10-261-0/+42
| | | | |
| * | | | stash: add git_stash_save()nulltoken2012-10-261-0/+577
| | | | |
| * | | | refs: add GIT_REFS_STASH_FILE definenulltoken2012-10-261-0/+3
| | | | |
| * | | | index: introduce git_index_owner()nulltoken2012-10-261-0/+5
| | | | |
| * | | | reflog: fix bogus removal of reflog entriesnulltoken2012-10-261-6/+6
| | | | |
| * | | | reflog: create reflog and its directory structurenulltoken2012-10-261-1/+4
| | | | |
| * | | | reflog: Make git_reflog_free() accept null paramnulltoken2012-10-261-0/+3
| |/ / /
* | | | Add network transfer callbacks on WindowsBen Straub2012-10-261-0/+1
|/ / /