Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Rename tests-clar to tests | Ben Straub | 2013-11-14 | 2062 | -55912/+0 |
| | |||||
* | Merge pull request #1951 from victorgp/create-remote-plus-fetch | Vicent Martí | 2013-11-14 | 1 | -1/+11 |
|\ | | | | | Allowing create remotes with custom fetch spec | ||||
| * | splitting funcionality in two methods to avoid ambiguity with NULL | Victor Garcia | 2013-11-08 | 6 | -16/+16 |
| | | |||||
| * | adding doc for new param and test to check fetch spec is correctly added | Victor Garcia | 2013-11-07 | 1 | -1/+11 |
| | | |||||
| * | allowing create remote with custom fetch spec | Victor Garcia | 2013-11-07 | 6 | -14/+14 |
| | | |||||
* | | Fix warnings | Russell Belfer | 2013-11-13 | 1 | -1/+2 |
| | | |||||
* | | tests: make a few globals statics | Carlos Martín Nieto | 2013-11-13 | 2 | -3/+3 |
| | | | | | | | | ld was warning that the size of path changed, rightly so. | ||||
* | | Minor cleanupblame-fixes | Ben Straub | 2013-11-12 | 1 | -3/+2 |
| | | |||||
* | | Fix buffer blame with new lines at end of file | Ben Straub | 2013-11-12 | 1 | -2/+3 |
| | | |||||
* | | Add some failing blame test cases | Ben Straub | 2013-11-12 | 1 | -0/+36 |
| | | |||||
* | | Merge pull request #1956 from libgit2/cmn/fetch-default-head | Vicent Martí | 2013-11-11 | 5 | -74/+65 |
|\ \ | | | | | | | Remote revamp (director's cut) | ||||
| * | | tests: update push tests | Carlos Martín Nieto | 2013-11-11 | 3 | -19/+23 |
| | | | | | | | | | | | | These tests were forgotten when modifying git_remote_ls(). | ||||
| * | | remote: make _ls return the list directly | Carlos Martín Nieto | 2013-11-11 | 5 | -55/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The callback-based method of listing remote references dates back to the beginning of the network code's lifetime, when we didn't know any better. We need to keep the list around for update_tips() after disconnect() so let's make use of this to simply give the user a pointer to the array so they can write straightforward code instead of having to go through a callback. | ||||
* | | | Fix warning in tests-clar/merge/workdir/trivial.c | Linquize | 2013-11-11 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1950 from csware/quote-config-values | Vicent Martí | 2013-11-10 | 1 | -0/+31 |
|\ \ \ | | | | | | | | | Correctly quote config values while saving | ||||
| * | | | Add another testcase to make sure double quotes are correctly escaped | Sven Strickroth | 2013-11-07 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de> | ||||
| * | | | Add a testcase for values which needs quotes | Sven Strickroth | 2013-11-07 | 1 | -0/+27 |
| | | | | | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de> | ||||
* | | | | Merge pull request #1936 from libgit2/better-url-parsing | Vicent Martí | 2013-11-10 | 1 | -18/+41 |
|\ \ \ \ | | | | | | | | | | | Streamline url-parsing logic. | ||||
| * | | | | Make url decoding more bulletproofbetter-url-parsing | Ben Straub | 2013-11-05 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Unescape url-encoded usernames and passwords | Ben Straub | 2013-11-04 | 1 | -2/+14 |
| | | | | | |||||
| * | | | | Use http_parser_parse_url to parse urls | Ben Straub | 2013-11-04 | 1 | -27/+28 |
| | | | | | |||||
| * | | | | Streamline url-parsing logic. | Ben Straub | 2013-11-01 | 1 | -0/+10 |
| | |/ / | |/| | | |||||
* | | | | Allow callers to set mode on packfile creation | Edward Thomson | 2013-11-07 | 2 | -6/+50 |
| | | | | |||||
* | | | | Add git_packbuilder_hash to query pack filename | Edward Thomson | 2013-11-07 | 1 | -0/+12 |
| |_|/ |/| | | |||||
* | | | Change the git_branch_iterator_new and git_branch_next definitions to use ↵ | Arthur Schreiber | 2013-11-05 | 2 | -3/+3 |
| | | | | | | | | | | | | git_branch_t. | ||||
* | | | Plug configuration file search paths leaks | nulltoken | 2013-11-05 | 2 | -0/+10 |
| | | | |||||
* | | | Plug git_merge() related leaks | nulltoken | 2013-11-05 | 1 | -0/+2 |
| | | | |||||
* | | | merge branch into current, updating workdir | Edward Thomson | 2013-11-05 | 7 | -2/+1252 |
| | | | |||||
* | | | Merge pull request #1943 from libgit2/ntk/fix/leaks | Vicent Martí | 2013-11-05 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | Fix leaks | ||||
| * | | | Fix leaks | nulltoken | 2013-11-05 | 1 | -0/+2 |
| | | | | |||||
* | | | | Merge pull request #1938 from libgit2/cmn/branch-iterator | Vicent Martí | 2013-11-05 | 2 | -84/+55 |
|\ \ \ \ | | | | | | | | | | | branch: move from foreach to an iterator | ||||
| * | | | | branch: move from foreach to an iterator | Carlos Martín Nieto | 2013-11-05 | 2 | -84/+55 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a git_branch_iterator type which is equivalent to the foreach but lets us write loops instead of callbacks. Since the introduction of git_reference_shorthand(), the added value of passing the name is reduced. | ||||
* | | | | Merge pull request #1941 from libgit2/rb/preserve-iterator-error | Vicent Martí | 2013-11-05 | 1 | -0/+34 |
|\ \ \ \ | |/ / / |/| | | | Preserve error messages during file system iterator cleanup | ||||
| * | | | Preserve file error in iterator | Russell Belfer | 2013-11-04 | 1 | -0/+34 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | When the filesystem iterator encounters an error with a file, it returns the error but because of the cleanup code, it was in some cases erasing the error message. This uses the giterr_detach API to make sure that the actual error message is restored after the cleanup code has been run. | ||||
* | | | Propagate ELOCKED error when updating the config | nulltoken | 2013-11-05 | 1 | -0/+13 |
| | | | |||||
* | | | move mode_t to filebuf_open instead of _commit | Edward Thomson | 2013-11-04 | 4 | -17/+17 |
| | | | |||||
* | | | Take umask into account in filebuf_commit | Edward Thomson | 2013-11-04 | 1 | -0/+34 |
|/ / | |||||
* | | Merge pull request #1939 from ethomson/readwrite_odb | Vicent Martí | 2013-11-04 | 1 | -0/+52 |
|\ \ | | | | | | | Allow backend consumers to specify file mode | ||||
| * | | Allow backend consumers to specify file mode | Edward Thomson | 2013-11-04 | 1 | -0/+52 |
| | | | |||||
* | | | Merge pull request #1317 from libgit2/blame | Russell Belfer | 2013-11-04 | 30 | -0/+747 |
|\ \ \ | | | | | | | | | Blame Canada | ||||
| * \ \ | Merge remote-tracking branch 'libgit2/development' into blame | Ben Straub | 2013-10-28 | 49 | -1008/+2572 |
| |\ \ \ | |||||
| * | | | | Fix initializer error | Ben Straub | 2013-10-10 | 1 | -5/+5 |
| | | | | | |||||
| * | | | | Merge branch 'development' into blame | Ben Straub | 2013-10-03 | 19 | -260/+518 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/git2.h | ||||
| * \ \ \ \ | Merge branch 'development' into blame | Ben Straub | 2013-09-25 | 53 | -369/+1324 |
| |\ \ \ \ \ | |||||
| * | | | | | | Trim fat from git_blame struct | Ben Straub | 2013-09-20 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Detect boundaries, support limiting commit range | Ben Straub | 2013-09-20 | 4 | -87/+111 |
| | | | | | | | |||||
| * | | | | | | Blame: fixturize tests | Ben Straub | 2013-09-19 | 1 | -110/+126 |
| | | | | | | | |||||
| * | | | | | | blame: allow restriction to line range | Ben Straub | 2013-09-19 | 1 | -0/+68 |
| | | | | | | | |||||
| * | | | | | | Port blame from git.git | Ben Straub | 2013-09-16 | 30 | -0/+639 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1929 from libgit2/rb/misc-diff-fixes | Vicent Martí | 2013-11-04 | 10 | -44/+210 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | Fix some observed problems with incorrect diffs |