summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Trim fat from git_blame structBen Straub2013-09-203-19/+1
| | | | | | |
| * | | | | | Add typedefs for internal structsBen Straub2013-09-203-78/+82
| | | | | | |
| * | | | | | Detect boundaries, support limiting commit rangeBen Straub2013-09-208-90/+132
| | | | | | |
| * | | | | | Blame: fixturize testsBen Straub2013-09-191-110/+126
| | | | | | |
| * | | | | | blame: allow restriction to line rangeBen Straub2013-09-192-0/+79
| | | | | | |
| * | | | | | Stop being crazy about freeing memoryBen Straub2013-09-191-26/+2
| | | | | | |
| * | | | | | Check errors from libgit2 callsBen Straub2013-09-171-13/+10
| | | | | | |
| * | | | | | Add blame exampleBen Straub2013-09-163-1/+133
| | | | | | |
| * | | | | | Port blame from git.gitBen Straub2013-09-1637-30/+1946
| | | | | | |
| * | | | | | Merge branch 'development' into blame_rebasedBen Straub2013-09-16264-3658/+14891
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/git2.h
| * | | | | | | Fix spelling, remove pesky constsBen Straub2013-06-131-3/+3
| | | | | | | |
| * | | | | | | Introduce git_blame_bufferBen Straub2013-06-131-0/+14
| | | | | | | |
| * | | | | | | Change API based on @arrbee's feedbackBen Straub2013-06-131-13/+33
| | | | | | | |
| * | | | | | | Initial blame APIBen Straub2013-06-132-0/+146
| | | | | | | |
* | | | | | | | Merge pull request #1934 from libgit2/relicense-examplesVicent Martí2013-11-0416-38/+262
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Relicense examples under CC0
| * | | | | | | | Replace copyright topmatter in example filesBen Straub2013-11-0212-33/+125
| | | | | | | | |
| * | | | | | | | Relicense examples under CC0Ben Straub2013-11-014-5/+137
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #1937 from scunz/checkout_assertVicent Martí2013-11-042-22/+21
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | 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-022-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-022-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0422-109/+411
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | Fix some observed problems with incorrect diffs
| * | | | | | | | Fix --assume-unchanged supportRussell Belfer2013-11-013-6/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-012-14/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-015-19/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-017-30/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a little more intuitive than the turned-around option that I originally wrote.
| * | | | | | | | Make diff and status perform soft index reloadRussell Belfer2013-11-0117-56/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes `git_index_read` to have two modes - a hard index reload that always resets the index to match the on-disk data (which was the old behavior) and a soft index reload that uses the timestamp / file size information and only replaces the index data if the file on disk has been modified. This then updates the git_status code to do a soft reload unless the new GIT_STATUS_OPT_NO_REFRESH flag is passed in. This also changes the behavior of the git_diff functions that use the index so that when an index is not explicitly passed in (i.e. when the functions call git_repository_index for you), they will also do a soft reload for you. This intentionally breaks the file signature of git_index_read because there has been some confusion about the behavior previously and it seems like all existing uses of the API should probably be examined to select the desired behavior.
| * | | | | | | | Fix some of the glaring errors in GIT_DIFF_REVERSERussell Belfer2013-11-012-17/+34
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes fix the basic problem with GIT_DIFF_REVERSE being broken for text diffs. The reversed diff entries were getting added to the git_diff correctly, but some of the metadata was kept incorrectly in a way that prevented the text diffs from being generated correctly. Once I fixed that, it became clear that it was not possible to merge reversed diffs correctly. This has a first pass at fixing that problem. We probably need more tests to make sure that is really fixed thoroughly.
* | | | | | | | examples: doc updateCarlos Martín Nieto2013-11-031-16/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the explanation to reflect our use of git_status_list_new() and make the breaks in rocco more meaningful. Clarify why GIT_STATUS_CURRENT and index_to_workdir don't always imply each other. Fixes #1740.
* | | | | | | | remote: don't write too much when dealing with multivarsCarlos Martín Nieto2013-11-021-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to move `data_start` forward, which is wrong as that needs to point to the beginning of the buffer in order to perform size calculations. Introduce a `write_start` variable which indicates where we should start writing from, which is what the `data_start` was being wrongly reused to be.
* | | | | | | | Fix a leak in the diff testsCarlos Martín Nieto2013-11-021-0/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #1935 from ethomson/winerrsVicent Martí2013-11-012-2/+26
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | preserve windows error numbers as well
| * | | | | | preserve windows error numbers as wellEdward Thomson2013-11-012-2/+26
|/ / / / / /
* | | | | | Merge pull request #1916 from libgit2/simplify-examplesVicent Martí2013-11-0116-950/+1255
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix examples to make the important stuff more obvious
| * | | | | | Fix typosBen Straub2013-11-012-3/+3
| | | | | | |
| * | | | | | A few formatting changes for roccoCarlos Martín Nieto2013-11-014-8/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm not too happy about manually inserting < and > but those get output as html tags otherwise.
| * | | | | | Update examples/README.mdRussell Belfer2013-10-311-6/+14
| | | | | | |
| * | | | | | Format comments for use with doccoBen Straub2013-10-315-72/+86
| | | | | | |
| * | | | | | Clean up showindex sampleBen Straub2013-10-301-23/+15
| | | | | | |
| * | | | | | Reorganize rev-parse exampleBen Straub2013-10-301-53/+56
| | | | | | |
| * | | | | | rev-list.c example: use common utils, reorganizeBen Straub2013-10-301-34/+28
| | | | | | |
| * | | | | | cat-file.c example: deploy helpers, reorgBen Straub2013-10-301-76/+78
| | | | | | |
| * | | | | | add.c: proper frontmatterBen Straub2013-10-301-3/+8
| | | | | | |
| * | | | | | init.c example: deploy more helpersBen Straub2013-10-301-7/+4
| | | | | | |
| * | | | | | add.c example: deploy helpers, reorgBen Straub2013-10-301-57/+61
| | | | | | |
| * | | | | | init example: deploy helpers, reorgBen Straub2013-10-301-127/+122
| | | | | | |
| * | | | | | Extract common example helpers and reorg examplesRussell Belfer2013-10-297-540/+808
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reorganizes a few of the examples so that the main function comes first with the argument parsing extracted into a helper that can come at the end of the file (so the example focuses more on the use of libgit2 instead of command line support). This also creates a shared examples/common.[ch] so that useful helper funcs can be shared across examples instead of repeated.
* | | | | | Merge pull request #1933 from libgit2/vmg/gcc-warningsRussell Belfer2013-11-0114-29/+62
|\ \ \ \ \ \ | | | | | | | | | | | | | | Warnings for Windows x64 (MSVC) and GCC on Linux
| * | | | | | clar: Fix warnings in GCC/Linuxvmg/gcc-warningsVicent Marti2013-11-013-4/+7
| | | | | | |
| * | | | | | iconv: Do not fake an API when iconv is not availableVicent Marti2013-11-015-16/+47
| | | | | | |
View Lorry Controller Status