summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* status: Add case insensitivity related failing testbug/status_casenulltoken2013-06-293-2/+35
|
* tests: Remove misleading commentsnulltoken2013-06-291-2/+0
|
* tests: Fix indentationnulltoken2013-06-291-13/+13
|
* Merge pull request #1688 from arrbee/submodule-load-ignore-orphaned-headRussell Belfer2013-06-272-2/+76
|\ | | | | Test submodules with empty index or orphaned head
| * Test submodules with empty index or orphaned headRussell Belfer2013-06-272-2/+76
| | | | | | | | | | | | | | | | In both of these cases, the submodule data should still be loaded just (obviously) without the data that comes from either the index or the HEAD. This fixes a bug in the orphaned head case.
* | Merge pull request #1684 from libgit2/fix-dirty-submodule-diffRussell Belfer2013-06-272-2/+8
|\ \ | | | | | | Dirty submodules do not correctly appear in diffs
| * | Fix bug marking submodule diffs as unmodifiedRussell Belfer2013-06-272-2/+8
| | | | | | | | | | | | | | | | | | | | | There was a bug where submodules whose HEAD had not been moved were being marked as having an UNMODIFIED delta record instead of being left MODIFIED. This fixes that and fixes the tests to notice if a submodule has been incorrectly marked as UNMODIFIED.
| * | Fail on unmodified deltas when they're unexpectedJustin Spahr-Summers2013-06-261-1/+1
|/ /
* | Merge pull request #1681 from arthurschreiber/patch-1Russell Belfer2013-06-252-1/+13
|\ \ | |/ |/| Prefer younger merge bases over older ones.
| * Add a test case.Arthur Schreiber2013-06-251-0/+12
| |
| * Prefer younger merge bases over older ones.Arthur Schreiber2013-06-251-1/+1
| | | | | | git-core prefers younger merge bases over older ones in case that multiple valid merge bases exists.
* | Merge pull request #1678 from arthurschreiber/unbreak-local-ls-after-disconnectRussell Belfer2013-06-252-12/+34
|\ \ | | | | | | Unbreak git_remote_ls on a local transport after disconnecting.
| * | Make sure we don't leak memory again.Arthur Schreiber2013-06-251-0/+7
| | |
| * | Unbreak git_remote_ls on a local transport after disconnecting.Arthur Schreiber2013-06-252-12/+27
| |/
* | Merge pull request #1680 from csware/win32-junctionRussell Belfer2013-06-252-2/+4
|\ \ | |/ |/| Correctly handle win32 junctions
| * Correctly handle junctionsSven Strickroth2013-06-251-0/+3
| | | | | | | | | | | | A junction has S_IFDIR | S_IFLNK set, however, only one makes sense. Signed-off-by: Sven Strickroth <email@cs-ware.de>
| * Revert "Work around reparse point stat issues"Sven Strickroth2013-06-251-2/+1
|/ | | | This reverts commit 32c12ea6a9cafd76a746af2e2be9366c95752f5b.
* libgit2 v0.19.0 "gut merge"v0.19.0Vicent Marti2013-06-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | Minor point release! We got a lot of rather large features that we wanted to get settled in: - New (threadsafe) cache for objects - Iterator for Status - New Merge APIs - SSH support on *NIX - Function context on diff - Namespaces support - Index add/update/remove with wildcard support - Iterator for References - Fetch and push refspecs for Remotes - Rename support in Status - New 'sys/` namespace for external headers with low-level APIs As always, this comes with hundreds of bug fixes and performance improvements. We're faster and better than ever. And we haven't broken many APIs this time! Build stuff.
* test-rename: This is not a decimal, sillyVicent Marti2013-06-251-2/+2
|
* Merge pull request #1675 from arthurschreiber/fix-leak-in-local-transportRussell Belfer2013-06-241-9/+9
|\ | | | | Fix a leak in the local transport code.
| * Fix a leak in the local transport code.Arthur Schreiber2013-06-241-9/+9
| |
* | Merge pull request #1674 from arrbee/fix-checkout-target-dir-win32Vicent Martí2013-06-242-6/+14
|\ \ | |/ |/| Fix checkout tests on Windows
| * Fix checkout tests on WindowsRussell Belfer2013-06-242-6/+14
|/
* Merge pull request #1672 from TheRealKerni/fix/header_docsVicent Martí2013-06-2417-35/+35
|\ | | | | Fixed most documentation header bugs
| * Fixed most documentation header bugsAndreas Linde2013-06-2417-35/+35
| | | | | | | | | | | | | | | | | | | | | | Fixed a few header @param and @return typos with the help of -Wdocumentation in Xcode. The following warnings have not been fixed: common.h:213 - Not sure how the documentation format is for '...' notes.h:102 - Correct @param name but empty text notes.h:111 - Correct @param name but empty text pack.h:140 - @return missing text pack.h:148 - @return missing text
* | Merge pull request #1670 from arrbee/open-cloexecVicent Martí2013-06-243-4/+9
|\ \ | | | | | | Add O_CLOEXEC to open calls
| * | Add O_CLOEXEC to open callsRussell Belfer2013-06-223-4/+9
| |/
* | Merge pull request #1669 from arrbee/fix-index-add-bypathVicent Martí2013-06-242-17/+32
|\ \ | |/ |/| In loose objects backend, constrain mkdir calls to avoid extra mkdirs
| * Work around reparse point stat issuesRussell Belfer2013-06-241-1/+2
| | | | | | | | | | | | | | | | | | In theory, p_stat should never return an S_ISLNK result, but due to the current implementation on Windows with mount points it is possible that it will. For now, work around that by allowing a link in the path to a directory being created. If it is really a problem, then the issue will be caught on the next iteration of the loop, but typically this will be the right thing to do.
| * Constrain mkdir calls to avoid extra mkdirsRussell Belfer2013-06-221-16/+30
| | | | | | | | | | | | | | | | | | | | | | This updates the calls that make the subdirectories for objects to use a base directory above which git_futils_mkdir won't walk any higher. This prevents attempts to mkdir all the way up to the root of the filesystem. Also, this moves the objects_dir into the loose backend structure and removes the separate allocation, plus does some preformatting of the objects_dir value to guarantee a trailing slash, etc.
* | Merge pull request #1668 from csware/WC_ERR_INVALID_CHARSRussell Belfer2013-06-221-0/+2
|\ \ | |/ |/| Do not redefine WC_ERR_INVALID_CHARS
| * Do not redefine WC_ERR_INVALID_CHARSSven Strickroth2013-06-231-0/+2
|/ | | | | | WC_ERR_INVALID_CHARS might be already defined by the Windows SDK. Signed-off-by: Sven Strickroth <email@cs-ware.de>
* Merge pull request #1665 from arrbee/checkout-target-directoryVicent Martí2013-06-216-19/+211
|\ | | | | Add target directory to checkout options
| * Addition checkout target directory testsRussell Belfer2013-06-212-0/+115
| | | | | | | | | | This adds additonal tests of the checkout target directory option including using it to dump data from bare repos.
| * Loosen ensure_not_bare rules in checkoutRussell Belfer2013-06-211-6/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | With the new target directory option to checkout, the non-bareness of the repository should be checked much later in the parameter validation process - actually that check was already in place, but I was doing it redundantly in the checkout APIs. This removes the now unnecessary early check for bare repos. It also adds some other parameter validation and makes it so that implied parameters can actually be passed as NULL (i.e. if you pass a git_index, you don't have to pass the git_repository - we can get it from index).
| * Add target directory to checkoutRussell Belfer2013-06-215-13/+69
|/ | | | | | | | | | | | | | | | This adds the ability for checkout to write to a target directory instead of having to use the working directory of the repository. This makes it easier to do exports of repository data and the like. This is similar to, but not quite the same as, the --prefix option to `git checkout-index` (this will always be treated as a directory name, not just as a simple text prefix). As part of this, the workdir iterator was extended to take the path to the working directory as a parameter and fallback on the git_repository_workdir result only if it's not specified. Fixes #1332
* Merge pull request #1664 from arrbee/checkout-deleted-with-fixVicent Martí2013-06-215-1/+158
|\ | | | | Checkout should not recreate deleted files - with fix
| * Fix checkout of modified file when missing from wdRussell Belfer2013-06-215-1/+128
| | | | | | | | | | | | | | | | | | | | This fixes the checkout case when a file is modified between the baseline and the target and yet missing in the working directory. The logic for that case appears to have been wrong. This also adds a useful checkout notify callback to the checkout test helpers that will count notifications and also has a debug mode to visualize what checkout thinks that it's doing.
| * test asserting checkout should not recreate deleted filesEdward Thomson2013-06-201-0/+30
|/
* Merge pull request #1662 from arrbee/examples-like-gitVicent Martí2013-06-2013-20/+597
|\ | | | | Command line status example (with bug fixes)
| * Add test for fixed diff bugRussell Belfer2013-06-201-0/+20
| | | | | | | | | | | | | | Add test for bug fixed in 852ded96982ae70acb63c3940fae08ea29e40fee Sorry, I wrote that bug fix and forgot to check in a test at the same time. Here is one that fails on the old version of the code and now works.
| * Fix comment and copyright in exampleRussell Belfer2013-06-201-6/+11
| |
| * Add example implementation of long format statusRussell Belfer2013-06-201-2/+145
| |
| * Add status flags to force output sort orderRussell Belfer2013-06-2011-16/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Files in status will, be default, be sorted according to the case insensitivity of the filesystem that we're running on. However, in some cases, this is not desirable. Even on case insensitive file systems, 'git status' at the command line will generally use a case sensitive sort (like 'ls'). Some GUIs prefer to display a list of file case insensitively even on case-sensitive platforms. This adds two new flags: GIT_STATUS_OPT_SORT_CASE_SENSITIVELY and GIT_STATUS_OPT_SORT_CASE_INSENSITIVELY that will override the default sort order of the status output and give the user control. This includes tests for exercising these new options and makes the examples/status.c program emulate core Git and always use a case sensitive sort.
| * Initial implementation of status exampleRussell Belfer2013-06-202-1/+295
| |
| * Fix bug in diff untracked dir scanRussell Belfer2013-06-201-4/+9
|/ | | | | | When scanning untracked directories looking for non-ignored files there was a bug where an empty directory would generate a false error.
* Merge pull request #1661 from arrbee/index-add-allVicent Martí2013-06-198-4/+718
|\ | | | | Index operations using globs
| * Add tests and fix use of freed memoryRussell Belfer2013-06-192-3/+29
| | | | | | | | | | | | | | | | | | | | | | This adds some tests for updating the index and having it remove items to make sure that the iteration over the index still works even as earlier items are removed. In testing with valgrind, this found a path that would use the path string from the index entry after it had been freed. The bug fix is simply to copy the path of the index entry before doing any actual index manipulation.
| * Add index pathspec-based operationsRussell Belfer2013-06-194-4/+586
| | | | | | | | | | | | | | | | | | | | | | | | | | This adds three new public APIs for manipulating the index: 1. `git_index_add_all` is similar to `git add -A` and will add files in the working directory that match a pathspec to the index while honoring ignores, etc. 2. `git_index_remove_all` removes files from the index that match a pathspec. 3. `git_index_update_all` updates entries in the index based on the current contents of the working directory, either added the new information or removing the entry from the index.
| * Add fn to check pathspec for ignored filesRussell Belfer2013-06-192-0/+67
| | | | | | | | | | | | | | | | | | Command line Git sometimes generates an error message if given a pathspec that contains an exact match to an ignored file (provided --force isn't also given). This adds an internal function that makes it easy to check it that has happened. Right now, I'm not creating a public API for this because that would get a little more complicated with a need for callbacks for all invalid paths.