summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Get rid of libssh2 embeddingcmn/remove-ssh-embedCarlos Martín Nieto2015-05-121-13/+2
| | | | | | | It was added as a workaround while the project had code to use WinCNG but had not made a release with it. There is now a release of libssh2 with WinCNG support, so this option is redundant. Let's get rid of it before people start liking it too much.
* Merge pull request #3111 from whoisj/centralizing-buffer-sizesCarlos Martín Nieto2015-05-127-9/+12
|\ | | | | Centralizing all IO buffer size values
| * centralizing all IO buffer size valuesJ Wyman2015-05-117-9/+12
| |
* | Merge pull request #3018 from ethomson/stash_applyCarlos Martín Nieto2015-05-1214-49/+1076
|\ \ | |/ |/| Stash apply
| * checkout: better document the `baseline_index` optEdward Thomson2015-05-112-1/+12
| |
| * stash application: document new API in CHANGELOGEdward Thomson2015-05-111-0/+6
| |
| * stash: propagate the error when writing a treeEdward Thomson2015-05-111-1/+1
| |
| * stash_apply: provide progress callbacksEdward Thomson2015-05-113-3/+106
| |
| * stash_apply: provide its own options structureEdward Thomson2015-05-114-62/+128
| |
| * stash: test checkout notify callbacksEdward Thomson2015-05-111-0/+52
| |
| * stash apply: default to at least GIT_CHECKOUT_SAFEEdward Thomson2015-05-112-3/+6
| |
| * stash: return GIT_EMERGECONFLICT on merge conflictEdward Thomson2015-05-112-4/+2
| |
| * stash: document merge conflictsEdward Thomson2015-05-111-13/+11
| |
| * stash: refactor to use merge_iteratorsEdward Thomson2015-05-113-190/+111
| |
| * stash: ensure a reflog has entriesEdward Thomson2015-05-111-2/+2
| |
| * stash apply: check out a tree, not piecewiseEdward Thomson2015-05-112-34/+13
| |
| * stash: use git_commit_summary for a summaryEdward Thomson2015-05-111-12/+4
| |
| * index: introduce git_index_read_indexEdward Thomson2015-05-113-0/+173
| |
| * checkout: allow baseline to be specified as indexEdward Thomson2015-05-112-5/+15
| | | | | | | | | | | | Allow the baseline to be specified as an index, so that users need not write their index to a tree just to checkout with that as the baseline.
| * merge: merge iteratorsEdward Thomson2015-05-113-25/+93
| |
| * Added git_stash_apply() and git_stash_pop() APIsPierre-Olivier Latour2015-05-114-4/+651
|/
* Merge pull request #3104 from whoisj/optimal-buffer-sizeCarlos Martín Nieto2015-05-091-1/+1
|\ | | | | Adjusting stream buffer size to 64KB
| * Adjusting stream buffer size to 64KBJ Wyman2015-05-071-1/+1
| | | | | | | | 64K is optimal buffer size per https://technet.microsoft.com/en-us/library/cc938632.aspx
* | Merge pull request #3086 from yongthecoder/masterCarlos Martín Nieto2015-05-062-4/+2
|\ \ | | | | | | Android build doesn't need deps/regex
| * | Android build doesn't need deps/regexYong Li2015-05-042-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deps/regex was included in Android build because Android NDK 4 has a packaging bug and doesn't have the regular expression functions defined in its libc.so. The bug has been fixed in subsequent Android NDK releases. If it is still necessary to work around the bug in Android NDK 4, we should consider to use an option like ANDROID_NDK_RELEASE or ANDROID_NDK_RELEASE_NUM.
* | | Merge pull request #3100 from arthurschreiber/patch-5Carlos Martín Nieto2015-05-061-0/+2
|\ \ \ | | | | | | | | Ensure frameworks are mentioned in libgit2.pc
| * | | Ensure frameworks are mentioned in libgit2.pcArthur Schreiber2015-05-051-0/+2
|/ / / | | | | | | When building on Mac OS X, the `CoreFoundation` and `Security` frameworks where missing from `Libs.private` in the generated `libgit2.pc` file.
* | | config: plug a couple of leaksCarlos Martín Nieto2015-05-051-4/+7
| | |
* | | Merge pull request #3079 from ethomson/configCarlos Martín Nieto2015-05-042-400/+640
|\ \ \ | | | | | | | | Configuration changes for handling multiple of the same sections
| * | | config: test all multivars are updatedEdward Thomson2015-05-041-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | If a multivar exists within two sections (of the same name) then they should both be updated in a `set_multivar`. Ensure that this is the case.
| * | | config: use wildcard in test instead of empty exprEdward Thomson2015-05-041-1/+1
| | | |
| * | | config: cleanup some now-unused variablesEdward Thomson2015-05-042-9/+16
| | | |
| * | | config: lock the file for write before readingEdward Thomson2015-05-041-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When writing a configuration file, we want to take a lock on the new file (eg, `config.lock`) before opening the configuration file (`config`) for reading so that we can prevent somebody from changing the contents underneath us.
| * | | Test setting config var under duplicate header.Ryan Roden-Corrent2015-05-041-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a test that exposes a bug in config_write. It is valid to have multiple separate headers for the same config section, but config_write will exit after finding the first matching section in certain situations. This test proves that config_write will duplicate a variable that already exists instead of overwriting it if the variable is defined under a duplicate section header.
| * | | config: write existing lines as-is when rewritingEdward Thomson2015-05-041-28/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When updating a configuration file, we want to copy the old data from the file to preserve comments and funny whitespace, instead of writing it in some "canonical" format. Thus, we keep a pointer to the start of the line and the line length to preserve these things we don't care to rewrite.
| * | | config: examine whole file when writingEdward Thomson2015-05-042-396/+421
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we would try to be clever when writing the configuration file and try to stop parsing (and simply copy the rest of the old file) when we either found the value we were trying to write, or when we left the section that value was in, the assumption being that there was no more work to do. Regrettably, you can have another section with the same name later in the file, and we must cope with that gracefully, thus we read the whole file in order to write a new file. Now, writing a file looks even more than reading. Pull the config parsing out into its own function that can be used by both reading and writing the configuration.
| * | | config: test overwriting cvar in multiple regionsEdward Thomson2015-05-041-0/+36
| | | |
| * | | config: ensure we can write to an empty fileEdward Thomson2015-05-041-0/+72
| | | |
* | | | Merge pull request #3070 from ethomson/checkout_icaseCarlos Martín Nieto2015-05-046-25/+253
|\ \ \ \ | |/ / / |/| | | Case insensitive checkout improvements
| * | | checkout test: better case-insensitive test on MacEdward Thomson2015-05-041-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mac OS, `realpath` is deficient in determining the actual filename on-disk as it will simply provide the string you gave it if that file exists, instead of returning the filename as it exists. Instead we must read the directory entries for the parent directory to get the canonical filename.
| * | | status test: always test the new file pathEdward Thomson2015-05-041-8/+12
| | | |
| * | | checkout test: only run icase on icase platformEdward Thomson2015-05-042-79/+61
| | | |
| * | | checkout: break case-changes into delete/addEdward Thomson2015-05-043-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When checking out with a case-insensitive working directory, we want to change the case of items in the working directory to reflect changes that occured in the checkout target. Diff now has an option to break case-changing renames into delete/add.
| * | | checkout: remove blocking dir when FORCEdEdward Thomson2015-05-042-10/+117
| | | |
| * | | Revert "Always checkout with case sensitive iterator"Edward Thomson2015-05-042-3/+14
| | | | | | | | | | | | | | | | This reverts commit 40d791545abfb3cb71553a27dc64129e1a9bec28.
| * | | checkout test: ensure we write to casechanged dirEdward Thomson2015-05-041-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | Ensure that on a case insensitive filesystem that we can checkout into some folder 'FOLDER' that exists on disk, even if the target of the checkout is a different case (eg 'folder').
| * | | checkout test: ignore unstaged case-changing renamesEdward Thomson2015-05-041-0/+22
|/ / / | | | | | | | | | | | | | | | | | | | | | On Windows, you might sloppily rewrite a file (or have a sloppy text editor that does it for you) and accidentally change its case. (eg, "README" -> "readme"). Git ignores this accidental case changing rename during checkout and will happily write the new content to the file despite the name change. We should, too.
* | | Merge pull request #3087 from ethomson/pr/3054Carlos Martín Nieto2015-05-0422-358/+852
|\ \ \ | | | | | | | | Performance Improvements to Status on Windows
| * | | diriter: actually use iconv on macEdward Thomson2015-05-012-86/+94
| | | |
| * | | git_buf_put_w: introduce utf16->utf8 conversionEdward Thomson2015-05-015-27/+81
| | | |
View Lorry Controller Status