- 30 Mar, 2013 2 commits
-
-
The term 'tracking' is overloaded. Help distinguish what we mean by using 'upstream' for this part of the library.
Carlos Martín Nieto committed -
Carlos Martín Nieto committed
-
- 29 Mar, 2013 4 commits
-
-
Clean up some memleaks in tests
Edward Thomson committed -
Edward Thomson committed
-
remove unmerged files during reset hard
Vicent Martí committed -
Edward Thomson committed
-
- 26 Mar, 2013 7 commits
-
-
Russell Belfer committed
-
opts: allow configuration of odb cache size
Vicent Martí committed -
Several diff and status fixes
Vicent Martí committed -
This started out trying to look at the problems from issue #1425 and gradually grew to a broader set of fixes. There are two core things fixed here: 1. When you had an ignore like "/bin" which is rooted at the top of your tree, instead of immediately adding the "bin/" entry as an ignored item in the diff, we were returning all of the direct descendants of the directory as ignored items. This changes things to immediately ignore the directory. Note that this effects the behavior in test_status_ignore__subdirectories so that we no longer exactly match core gits ignore behavior, but the new behavior probably makes more sense (i.e. we now will include an ignored directory inside an untracked directory that we previously would have left off). 2. When a submodule only contained working directory changes, the diff code was always considering it unmodified which was just an outright bug. The HEAD SHA of the submodule matches the SHA in the parent repo index, and since the SHAs matches, the diff code was overwriting the actual status with UNMODIFIED. These fixes broke existing tests test_diff_workdir__submodules and test_status_ignore__subdirectories but looking it over, I actually think the new results are correct and the old results were wrong. @nulltoken had actually commented on the subdirectory ignore issue previously. I also included in the tests some debugging versions of the shared iteration callback routines that print status or diff information. These aren't used actively in the tests, but can be quickly swapped in to test code to give a better picture of what is being scanned in some of the complex test scenarios.
Russell Belfer committed -
This option has been sitting unimplemented for a while, so I finally went through and implemented it along with some tests. As part of this, I improved the implementation of GIT_DIFF_IGNORE_SUBMODULES so it be more diligent about avoiding extra work and about leaving off delta records for submodules to the greatest extent possible (though it may include them still if you are request TYPECHANGE records).
Russell Belfer committed -
don't stat until the file is written
Vicent Martí committed -
Edward Thomson committed
-
- 25 Mar, 2013 18 commits
-
-
This implements working versions of GIT_DIFF_RECURSE_IGNORED_DIRS and GIT_STATUS_OPT_RECURSE_IGNORED_DIRS along with some tests for the newly available behaviors. This is not turned on by default for status, but can be accessed via the options to the extended version of the command.
Russell Belfer committed -
http: Support 302 Found (arrbee did most of the work)
Vicent Martí committed -
Philip Kelley committed
-
Philip Kelley committed
-
Fix crlf handling, particularly when autocrlf=true
Vicent Martí committed -
Philip Kelley committed
-
This adds crlf/lf conversion functions into buf_text with more efficient implementations that bypass the high level buffer functions. They attempt to minimize the number of reallocations done and they directly write the buffer data as needed if they know that there is enough memory allocated to memcpy data. Tests are added for these new functions. The crlf.c code is updated to use the new functions. Removed the include of buf_text.h from filter.h and just include it more narrowly in the places that need it.
Russell Belfer committed -
This fixes of the file contents checks in checkout to give slightly better error messages by directly calling the underlying clar assertions so the file and line number of the top level call can be reported correctly, and renames the helpers to not start with "test_" since that is kind of reserved by clar. This also enables some of the CRLF tests on all platforms that were previously Windows only (by pushing a check of the native line endings into the test body).
Russell Belfer committed -
Edward Thomson committed
-
This fixes some places where the new tests were leaving the test area in a bad state or were freeing data they should not free. It also removes code that is extraneous to the core issue and fixes an invalid SHA being looked up in one of the tests (which was failing, but for the wrong reason).
Russell Belfer committed -
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth committed -
This adds a check to the drop_crlf filter path to check it the file in the index already has a CR in it, in which case this will not drop the CRs from the workdir file contents. This uncovered a "bug" in `git_blob_create_fromworkdir` where the full path to the file was passed to look up the attributes instead of the relative path from the working directory root. This meant that the check in the index for a pre-existing entry of the same name was failing.
Russell Belfer committed -
Vicent Marti committed
-
Nul terminated oid
Vicent Martí committed -
Vicent Marti committed
-
Fix link issue in network examples
Russell Belfer committed -
Remove GIT_SUCCESS from documentation
Russell Belfer committed -
Currently, the odb cache has a fixed size of 128 slots as defined by GIT_DEFAULT_CACHE_SIZE. Allow users to set the size of the cache via git_libgit2_opts(). Fixes #1035.
Michael Schubert committed
-
- 24 Mar, 2013 1 commit
-
-
Miquel Canes Gonzalez committed
-
- 23 Mar, 2013 1 commit
-
-
Update clar and some test helpers clean up
Vicent Martí committed
-
- 22 Mar, 2013 4 commits
-
-
This adds a helper function for the cases where you want to quickly set a single boolean config value for a repository. This allowed me to remove a lot of code.
Russell Belfer committed -
This makes the size_t comparison test nicer (assuming that the values are actually not using the full length), and converts some cases that were using it for pointer comparison to use the macro that is designed for pointer comparison.
Russell Belfer committed -
Russell Belfer committed
-
Explain it in local-upstream branch terms so it's easier to grasp than with the `one` and `two` naming from the merge-base code.
Carlos Martín Nieto committed
-
- 21 Mar, 2013 3 commits