summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Plug configuration file search paths leaksnulltoken2013-11-054-1/+16
|/ / /
* | | Merge pull request #1945 from libgit2/ntk/fix/merge_leaksVicent Martí2013-11-052-0/+3
|\ \ \ | | | | | | | | Plug git_merge() related leaks
| * | | Plug git_merge() related leaksnulltoken2013-11-052-0/+3
|/ / /
* | | Merge pull request #1007 from ethomson/mergeVicent Martí2013-11-0511-20/+1851
|\ \ \ | | | | | | | | merge!
| * | | merge branch into current, updating workdirEdward Thomson2013-11-0511-20/+1851
|/ / /
* | | Merge pull request #1943 from libgit2/ntk/fix/leaksVicent Martí2013-11-052-2/+7
|\ \ \ | | | | | | | | Fix leaks
| * | | Fix leaksnulltoken2013-11-052-2/+7
| | | |
* | | | Merge pull request #1938 from libgit2/cmn/branch-iteratorVicent Martí2013-11-054-132/+129
|\ \ \ \ | | | | | | | | | | branch: move from foreach to an iterator
| * | | | branch: move from foreach to an iteratorCarlos Martín Nieto2013-11-054-132/+129
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-054-0/+79
|\ \ \ \ | |/ / / |/| | | Preserve error messages during file system iterator cleanup
| * | | error: Simplify giterr_detachVicent Marti2013-11-053-25/+18
| | | |
| * | | Preserve file error in iteratorRussell Belfer2013-11-042-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-042-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #1942 from libgit2/fix/config_propagate_errorVicent Martí2013-11-052-4/+17
|\ \ \ \ | | | | | | | | | | Propagate ELOCKED error when updating the config
| * | | | Propagate ELOCKED error when updating the confignulltoken2013-11-052-4/+17
|/ / / /
* | | | Merge pull request #1940 from ethomson/filebuf_umaskEdward Thomson2013-11-0520-75/+116
|\ \ \ \ | |_|_|/ |/| | | Take umask into account in filebuf_commit
| * | | move mode_t to filebuf_open instead of _commitEdward Thomson2013-11-0419-77/+80
| | | |
| * | | Take umask into account in filebuf_commitEdward Thomson2013-11-044-5/+43
| |/ /
* | | blame sample: usage commentBen Straub2013-11-041-0/+1
| | |
* | | Fix warningsBen Straub2013-11-041-2/+2
| | |
* | | Reorganize and doc-commentify blame sample.Ben Straub2013-11-041-69/+96
| | |
* | | Standardize layout of blame sampleBen Straub2013-11-041-36/+47
|/ /
* | Merge pull request #1939 from ethomson/readwrite_odbVicent Martí2013-11-044-6/+78
|\ \ | | | | | | Allow backend consumers to specify file mode
| * | Allow backend consumers to specify file modeEdward Thomson2013-11-044-6/+78
| | |
* | | Merge pull request #1317 from libgit2/blameRussell Belfer2013-11-0441-1/+2376
|\ \ \ | | | | | | | | Blame Canada
| * | | Adjust for diff API changesBen Straub2013-10-282-26/+19
| | | |
| * | | Merge remote-tracking branch 'libgit2/development' into blameBen Straub2013-10-28141-3154/+6354
| |\ \ \
| * | | | :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-102-4/+12
| | | | |
| * | | | Fix initializer errorBen Straub2013-10-101-5/+5
| | | | |
| * | | | Fix post-line-range iterationBen Straub2013-10-101-1/+5
| | | | |
| * | | | Include signatures in blame hunksBen Straub2013-10-103-6/+10
| | | | |
| * | | | Only show lines that had blame run on themBen Straub2013-10-101-12/+14
| | | | |
| * | | | Be more flexible with argument order and formatBen Straub2013-10-101-8/+31
| | | | |
| * | | | Ignore more built examplesBen Straub2013-10-091-0/+5
| | | | |
| * | | | Simplify loading blobBen Straub2013-10-091-13/+11
| | | | |
| * | | | Allow null bytes in blobBen Straub2013-10-091-10/+11
| | | | |
| * | | | Initialize threading, fix broken strncmpBen Straub2013-10-091-1/+4
| | | | |
| * | | | Un-remove init exampleBen Straub2013-10-091-1/+1
| | | | |
| * | | | Merge branch 'development' into blameBen Straub2013-10-0355-783/+1272
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/git2.h
| * | | | | Fix typoBen Straub2013-09-291-1/+1
| | | | | |
| * | | | | Merge branch 'development' into blameBen Straub2013-09-25123-1472/+4161
| |\ \ \ \ \
| * | | | | | Trim API, document which parts aren't doneBen Straub2013-09-251-6/+8
| | | | | | |
| * | | | | | Blame: minor cleanupBen Straub2013-09-253-5/+5
| | | | | | |
| * | | | | | 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
| | | | | | |