summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Change the git_branch_iterator_new and git_branch_next definitions to use ↵Arthur Schreiber2013-11-051-2/+2
| | | | | | | | | | | | | | | | git_branch_t.
* | | | Blame: change signature to be more binding-friendlyBen Straub2013-11-051-1/+1
|/ / /
* | | Fix MSVC 64-bit warningsBen Straub2013-11-052-10/+10
| | |
* | | Plug configuration file search paths leaksnulltoken2013-11-052-1/+6
| | |
* | | Plug git_merge() related leaksnulltoken2013-11-051-0/+1
| | |
* | | merge branch into current, updating workdirEdward Thomson2013-11-052-18/+536
| | |
* | | Merge pull request #1943 from libgit2/ntk/fix/leaksVicent Martí2013-11-051-2/+5
|\ \ \ | | | | | | | | Fix leaks
| * | | Fix leaksnulltoken2013-11-051-2/+5
| | | |
* | | | Merge pull request #1938 from libgit2/cmn/branch-iteratorVicent Martí2013-11-051-32/+50
|\ \ \ \ | | | | | | | | | | branch: move from foreach to an iterator
| * | | | branch: move from foreach to an iteratorCarlos Martín Nieto2013-11-051-32/+50
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-errorVicent Martí2013-11-052-0/+31
|\ \ \ \ | |/ / / |/| | | Preserve error messages during file system iterator cleanup
| * | | error: Simplify giterr_detachVicent Marti2013-11-052-16/+12
| | | |
| * | | Preserve file error in iteratorRussell Belfer2013-11-041-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Add giterr_detach API to get and clear errorRussell Belfer2013-11-041-0/+23
| | |/ | |/| | | | | | | | | | | | | | | | | | | There are a number of cases where it is convenient to be able to fetch and "claim" the current error string, clearing the error. This is helpful when you need to call some code that may alter the error and you want to restore it later on and/or report it via some other mechanism.
* | | Propagate ELOCKED error when updating the confignulltoken2013-11-051-4/+4
| | |
* | | move mode_t to filebuf_open instead of _commitEdward Thomson2013-11-0415-60/+63
| | |
* | | Take umask into account in filebuf_commitEdward Thomson2013-11-042-3/+7
|/ /
* | Merge pull request #1939 from ethomson/readwrite_odbVicent Martí2013-11-042-5/+17
|\ \ | | | | | | Allow backend consumers to specify file mode
| * | Allow backend consumers to specify file modeEdward Thomson2013-11-042-5/+17
| | |
* | | Merge pull request #1317 from libgit2/blameRussell Belfer2013-11-045-0/+1246
|\ \ \ | | | | | | | | Blame Canada
| * | | Adjust for diff API changesBen Straub2013-10-282-26/+19
| | | |
| * | | Merge remote-tracking branch 'libgit2/development' into blameBen Straub2013-10-2860-1429/+2908
| |\ \ \
| * | | | :heart: boolBen Straub2013-10-282-3/+3
| | | | |
| * | | | Mmmm, GIT_FLEX_ARRAYBen Straub2013-10-281-1/+1
| | | | |
| * | | | Avoid temporary object in lookup routineBen Straub2013-10-281-8/+7
| | | | |
| * | | | Move flag dependencies into docs and code.Ben Straub2013-10-101-0/+8
| | | | |
| * | | | Include signatures in blame hunksBen Straub2013-10-101-0/+4
| | | | |
| * | | | Merge branch 'development' into blameBen Straub2013-10-0324-424/+526
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/git2.h
| * \ \ \ \ Merge branch 'development' into blameBen Straub2013-09-2552-896/+1865
| |\ \ \ \ \
| * | | | | | Blame: minor cleanupBen Straub2013-09-252-4/+4
| | | | | | |
| * | | | | | Clean up ported codeBen Straub2013-09-213-126/+142
| | | | | | |
| * | | | | | Simplify blob loading logicBen Straub2013-09-211-22/+17
| | | | | | |
| * | | | | | Clean up old methods, format long linesBen Straub2013-09-212-54/+72
| | | | | | | | | | | | | | | | | | | | | Added back the line index. We'll need it later.
| * | | | | | git_blame is a scoreboardBen Straub2013-09-214-152/+132
| | | | | | |
| * | | | | | Trim fat from git_blame structBen Straub2013-09-202-18/+0
| | | | | | |
| * | | | | | Add typedefs for internal structsBen Straub2013-09-203-78/+82
| | | | | | |
| * | | | | | Detect boundaries, support limiting commit rangeBen Straub2013-09-203-3/+17
| | | | | | |
| * | | | | | blame: allow restriction to line rangeBen Straub2013-09-191-0/+11
| | | | | | |
| * | | | | | Stop being crazy about freeing memoryBen Straub2013-09-191-26/+2
| | | | | | |
| * | | | | | Check errors from libgit2 callsBen Straub2013-09-171-13/+10
| | | | | | |
| * | | | | | Port blame from git.gitBen Straub2013-09-165-0/+1249
| | | | | | |
* | | | | | | Merge pull request #1937 from scunz/checkout_assertVicent Martí2013-11-041-19/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Don't assert in git_checkout_tree
| * | | | | | | Checkout: git_checkout_head is git_checkout_tree without a treeishSascha Cunz2013-11-021-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The last commit taught git_checkout_tree to actually do something meaningfull, when treeish was NULL. This lets us rewrite git_checkout_head to simply call git_checkout_tree without giving it a treeish.
| * | | | | | | Checkout: Don't assert if treeish is NULLSascha Cunz2013-11-021-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In git_checkout_tree, the first check tests if either repo or treeish is NULL and says that eithor of them has to have a valid value. But there is no code to handle the treeish == NULL case. So, do something meaningful in that case: use HEAD instead.
| * | | | | | | Checkout: Unifiy const-ness of `opts` parameterSascha Cunz2013-11-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since all 3 checkout APIs perform the same operation with the options, all of them should use the same const-ness.
* | | | | | | | Merge pull request #1929 from libgit2/rb/misc-diff-fixesVicent Martí2013-11-047-46/+131
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | Fix some observed problems with incorrect diffs
| * | | | | | | Fix --assume-unchanged supportRussell Belfer2013-11-012-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was never really working right because we were checking the wrong flag and not checking it in all the places that we need to be checking it. I finally got around to writing a test and adding actual support for it.
| * | | | | | | More tests and fixed for merging reversed diffsRussell Belfer2013-11-011-14/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were a lot more cases to deal with to make sure that our merged (i.e. workdir-to-tree-to-index) diffs were matching the output of core Git.
| * | | | | | | Add git_diff_options_init helperRussell Belfer2013-11-011-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes the static initializer for git_diff_options cannot be used and since setting them to all zeroes doesn't actually work quite right, this adds a new helper for that situation. This also adds an explicit new value to the submodule settings options to be used when those enums need static initialization.
| * | | | | | | Convert git_index_read to have a "force" flagRussell Belfer2013-11-014-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a little more intuitive than the turned-around option that I originally wrote.
View Lorry Controller Status