summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Improve docs for status rename detection limitsrb/status-with-precomposed-changesRussell Belfer2014-04-242-4/+32
| | | | and make tests empty on platforms without iconv support.
* Test toggling core.precomposeunicode yields renameRussell Belfer2014-04-241-0/+69
| | | | | | | | | There is an interesting difference with core Git here, though. Because libgit2 will do rename detection with the working directory, in the last case where the HEAD and the working directory both have the decomposed data and the index has the composed data, we generate a single status record with two renames whereas Git will generate one rename (head to index) and one untracked file.
* Test decomposed unicode renames work as expectedRussell Belfer2014-04-241-37/+92
|
* Merge pull request #2295 from libgit2/cmn/fetchhead-quoteVicent Marti2014-04-243-1/+13
|\ | | | | fetchhead: deal with quotes in branch names
| * fetchhead: deal with quotes in branch namesCarlos Martín Nieto2014-04-243-1/+13
|/ | | | | | | | | The current FETCH_HEAD parsing code assumes that a quote must end the branch name. Git however allows for quotes as part of a branch name, which causes us to consider the FETCH_HEAD file as invalid. Instead of searching for a single quote char, search for a quote char followed by SP, which is not a valid part of a ref name.
* Merge pull request #2291 from ethomson/patch_binaryVicent Marti2014-04-237-6/+452
|\ | | | | patch: emit deflated binary patches (optionally)
| * patch: emit binary patches (optionally)Edward Thomson2014-04-227-6/+452
| |
* | Merge pull request #2283 from phkelley/win32_fsVicent Marti2014-04-2322-491/+1549
|\ \ | | | | | | Win32: UTF-8 <-> WCHAR conversion overhaul
| * | React to feedback for UTF-8 <-> WCHAR and reparse workPhilip Kelley2014-04-239-39/+35
| | |
| * | Handle win32 reparse points properlyEdward Thomson2014-04-227-132/+966
| | |
| * | Win32: UTF-8 <-> WCHAR conversion overhaulPhilip Kelley2014-04-1918-431/+659
| | |
* | | Merge pull request #2289 from libgit2/rb/note-git-diff-index-behaviorVicent Marti2014-04-237-656/+404
|\ \ \ | | | | | | | | Some doc and examples/diff.c changes
| * | | Replace math fns with simpler integer mathrb/note-git-diff-index-behaviorRussell Belfer2014-04-221-11/+23
| | | |
| * | | Use git_diff_get_stats in example/diff + refactorRussell Belfer2014-04-226-619/+340
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This takes the `--stat` and related example options in the example diff.c program and converts them to use the `git_diff_get_stats` API which nicely formats stats for you. I went to add bar-graph scaling to the stats formatter and noticed that the `git_diff_stats` structure was holding on to all of the `git_patch` objects. Unfortunately, each of these objects keeps the full text of the diff in memory, so this is very expensive. I ended up modifying `git_diff_stats` to keep just the data that it needs to keep and allowed it to release the patches. Then, I added width scaling to the output on top of that. In making the diff example program match 'git diff' output, I ended up removing an newline from the sumamry output which I then had to compensate for in the email formatting to match the expectations. Lastly, I went through and refactored the tests to use a couple of helper functions and reduce the overall amount of code there.
| * | | Some doc and examples/diff.c changesRussell Belfer2014-04-223-84/+99
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I was playing with "git diff-index" and wanted to be able to emulate that behavior a little more closely with the diff example. Also, I wanted to play with running `git_diff_tree_to_workdir` directly even though core Git doesn't exactly have the equivalent, so I added a command line option for that and tweaked some other things in the example code. This changes a minor output thing in that the "raw" print helper function will no longer add ellipses (...) if the OID is not actually abbreviated.
* | | Merge pull request #2282 from libgit2/cmn/remote-easier-bindVicent Marti2014-04-224-32/+76
|\ \ \ | | | | | | | | A few niceties for binding authors
| * | | transports: allow the creds callback to say it doesn't existCarlos Martín Nieto2014-04-223-32/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow the credentials callback to return GIT_PASSTHROUGH to make the transports code behave as though none was set. This should make it easier for bindings to behave closer to the C code when there is no credentials callback set at their level.
| * | | remote: provide read access to the callback structureCarlos Martín Nieto2014-04-222-0/+18
|/ / / | | | | | | | | | | | | This should make it easier for bindings to dynamically override their own callbacks.
* | | Merge pull request #2287 from libgit2/rb/moar-coverity-fixesVicent Marti2014-04-224-18/+16
|\ \ \ | | | | | | | | Fix some issues from the last Coverity scan
| * | | Fix some coverity-found issuesRussell Belfer2014-04-214-18/+16
| | |/ | |/|
* | | Merge pull request #2286 from libgit2/rb/fix-reset-staged-deleteVicent Marti2014-04-222-5/+45
|\ \ \ | |/ / |/| | Fix reset for staged deletes
| * | Fix reset for staged deletesRussell Belfer2014-04-212-5/+45
|/ /
* | Merge pull request #2275 from jacquesg/apple-warningRussell Belfer2014-04-212-11/+34
|\ \ | | | | | | Check for compiler flag support instead of checking for a platform
| * | Introduce AddCFlagIfSupported CMake macroJacques Germishuys2014-04-192-38/+25
| | |
| * | Only disable deprecation warnings on Apple for OpenSSLJacques Germishuys2014-04-181-3/+5
| | |
| * | Use CHECK_C_COMPILER_FLAG to determine if the compiler supports a flagJacques Germishuys2014-04-181-8/+42
| | | | | | | | | | | | | | | This simplifies platform/compiler dependent checks where we optionally enable features or disable warnings.
| * | Fix inconsistent use of lower-case and upper-case names for macrosJacques Germishuys2014-04-181-3/+3
| | |
* | | attrcache: fix use-after-freeCarlos Martín Nieto2014-04-211-1/+1
| | | | | | | | | | | | Reported by coverity.
* | | sysdir: free the path if we cannot find the fileCarlos Martín Nieto2014-04-211-1/+1
| |/ |/| | | | | | | Returning an error cleared the buf, but this operation does not free the memory associated with it. Use git_buf_free() instead.
* | Merge pull request #2273 from jacquesg/ssh-interactiveVicent Marti2014-04-193-15/+117
|\ \ | | | | | | Add support for SSH keyboard-interactive authentication
| * | Only zero sensitive information on destruction (and memory actually ↵Jacques Germishuys2014-04-181-7/+21
| | | | | | | | | | | | allocated by us)
| * | Replace void * with proper callback typesJacques Germishuys2014-04-181-2/+2
| | |
| * | Make git_cred_ssh_custom_new() naming more consistentJacques Germishuys2014-04-183-8/+8
| | |
| * | Introduce git_cred_ssh_interactive_new()Jacques Germishuys2014-04-183-0/+88
| |/ | | | | | | This allows for keyboard-interactive based SSH authentication
* | Merge pull request #2279 from libgit2/rb/moar-eegnöre-fîxésVicent Marti2014-04-1911-229/+325
|\ \ | | | | | | Fix several ignore and attribute file behavior bugs
| * | Minor fixesRussell Belfer2014-04-184-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | Only apply LEADING_DIR pattern munging to patterns in ignore and attribute files, not to pathspecs used to select files to operate on. Also, allow internal macro definitions to be evaluated before loading all external ones (important so that external ones can make use of internal `binary` definition).
| * | Fix ignore difference from git with trailing /*Russell Belfer2014-04-183-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore patterns that ended with a trailing '/*' were still needing to match against another actual '/' character in the full path. This is not the same behavior as core Git. Instead, we strip a trailing '/*' off of any patterns that were matching and just take it to imply the FNM_LEADING_DIR behavior.
| * | Preload attribute files that may contain macrosRussell Belfer2014-04-183-45/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | There was a latent bug where files that use macro definitions could be parsed before the macro definitions were loaded. Because of attribute file caching, preloading files that are going to be used doesn't add a significant amount of overhead, so let's always preload any files that could contain macros before we assemble the actual vector of files to scan for attributes.
| * | Cleanup tests with helper functionsRussell Belfer2014-04-182-154/+83
| | |
| * | Pop ignore only if whole relative path matchesRussell Belfer2014-04-185-35/+80
| |/ | | | | | | | | | | | | | | | | | | | | When traversing the directory structure, the iterator pushes and pops ignore files using a vector. Some directories don't have ignore files, so it uses a path comparison to decide when it is right to actually pop the last ignore file. This was only comparing directory suffixes, though, so a subdirectory with the same name as a parent could result in the parent's .gitignore being popped off the list ignores too early. This changes the logic to compare the entire relative path of the ignore file.
* | Merge pull request #2213 from ethomson/safecrlfRussell Belfer2014-04-184-1/+99
|\ \ | |/ |/| Introduce core.safecrlf handling
| * Determine crlf safety by statistics, not literal reversibilityEdward Thomson2014-04-071-24/+9
| |
| * Introduce core.safecrlf handlingEdward Thomson2014-04-074-3/+116
| |
* | Merge pull request #2274 from libgit2/cmn/ssh-expect-usernameVicent Marti2014-04-182-50/+14
|\ \ | | | | | | cred: tighten username rules
| * | cred: tighten username rulesCarlos Martín Nieto2014-04-182-50/+14
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ssh-specific credentials allow the username to be missing. The idea being that the ssh transport will then use the username provided in the url, if it's available. There are two main issues with this. The credential callback already knows what username was provided by the url and needs to figure out whether it wants to ask the user for it or it can reuse it, so passing NULL as the username means the credential callback is suspicious. The username provided in the url is not in fact used by the transport. The only time it even considers it is for the user/pass credential, which asserts the existence of a username in its constructor. For the ssh-specific ones, it passes in the username stored in the credential, which is NULL. The libssh2 macro we use runs strlen() against this value (which is no different from what we would be doing ourselves), so we then crash. As the documentation doesn't suggest to leave out the username, assert the need for a username in the code, which removes this buggy behavior and removes implicit state. git_cred_has_username() becomes a blacklist of credential types that do not have a username. The only one at the moment is the 'default' one, which is meant to call up some Microsoft magic.
* | Merge pull request #2108 from libgit2/rb/threadsafe-index-iteratorVicent Marti2014-04-1850-1292/+2303
|\ \ | | | | | | Make index iterator thread safe
| * | Some memory leak fixesRussell Belfer2014-04-174-30/+38
| | |
| * | Fix broken logic for attr cache invalidationRussell Belfer2014-04-1713-210/+265
| | | | | | | | | | | | | | | | | | | | | The checks to see if files were out of date in the attibute cache was wrong because the cache-breaker data wasn't getting stored correctly. Additionally, when the cache-breaker triggered, the old file data was being leaked.
| * | Lock attribute file while reparsing dataRussell Belfer2014-04-173-17/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | I don't love this approach, but achieving thread-safety for attribute and ignore data while reloading files would require a larger rewrite in order to avoid this. If an attribute or ignore file is out of date, this holds a lock on the file while we are reloading the data so that another thread won't try to reload the data at the same time.
| * | Fix race checking for existing index itemsRussell Belfer2014-04-172-22/+40
| | | | | | | | | | | | | | | | | | | | | In the threading tests, I was still seeing a race condition where the same item could end up being inserted multiple times into the index. Preserving the sorted-ness of the index outside of the `index_insert` call fixes the issue.