summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Make core.safecrlf work on LF-ending platformsRussell Belfer2014-05-193-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | If you enabled core.safecrlf on an LF-ending platform, we would error even for files with all LFs. We should only be warning on irreversible mappings, I think.
* | | | Merge pull request #2379 from ethomson/status_win32Vicent Marti2014-05-221-2/+3
|\ \ \ \ | | | | | | | | | | Include windows.h on win32 for Sleep
| * | | | Include windows.h on win32 for SleepEdward Thomson2014-05-211-2/+3
|/ / / /
* | | | Merge pull request #2372 from libgit2/cmn/fetch-terminateVicent Marti2014-05-211-0/+12
|\ \ \ \ | |_|/ / |/| | | smart: send a flush when we disconnect
| * | | smart: send a flush when we disconnectcmn/fetch-terminateCarlos Martín Nieto2014-05-201-0/+12
| |/ / | | | | | | | | | | | | The git server wants to hear a flush from us when we disconnect, particularly when we want to perform a fetch but are up to date.
* | | Merge pull request #2373 from kitbellew/fix-clone-into-mirrorCarlos Martín Nieto2014-05-211-4/+2
|\ \ \ | | | | | | | | Minor fix for cmn/clone-into-mirror.
| * | | Minor fix for cmn/clone-into-mirror.Albert Meltzer2014-05-201-4/+2
|/ / / | | | | | | | | | | | | A recently added check might skip initialization of old_fetchhead and go directly to cleanup. So, destruct in the opposite order of construction.
* | | Fix a leak in the testsCarlos Martín Nieto2014-05-201-1/+1
|/ /
* | Merge pull request #2371 from martinwoodward/attrib_fnmatchVicent Marti2014-05-192-3/+58
|\ \ | | | | | | Restore attributions for fnmatch
| * | Restore attributions for fnmatchMartin Woodward2014-05-192-3/+58
| | |
* | | Merge pull request #2354 from libgit2/cmn/clone-into-mirrorVicent Marti2014-05-193-15/+75
|\ \ \ | |/ / |/| | Allow mirror-clone via `git_clone_into()`
| * | clone: don't error out if the branch already existscmn/clone-into-mirrorCarlos Martín Nieto2014-05-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | We set up the current branch after we fetch from the remote. This means that the user's refspec may have already created this reference. It is therefore not an error if we cannot create the branch because it already exists. This allows for the user to replicate git-clone's --mirror option.
| * | clone: duplicate the remoteCarlos Martín Nieto2014-05-191-15/+12
| | | | | | | | | | | | | | | | | | Instead of changing the user-provided remote, duplicate it so we can add the extra refspec without having to worry about unsetting it before returning.
| * | clone: add failing test for a mirror-clone with clone_intoCarlos Martín Nieto2014-05-192-0/+59
| | | | | | | | | | | | | | | Show a failure to perform a mirror-clone from a repository, both local and remote.
* | | Merge pull request #2364 from libgit2/cmn/comment-charVicent Marti2014-05-194-13/+15
|\ \ \ | | | | | | | | message: don't assume the comment char
| * | | message: don't assume the comment charcmn/comment-charCarlos Martín Nieto2014-05-184-13/+15
| | | | | | | | | | | | | | | | | | | | The comment char is configurable and we need to provide a way for the user to specify which comment char they chose for their message.
* | | | Merge pull request #2303 from jacquesg/mingw-lseekVicent Marti2014-05-193-2/+3
|\ \ \ \ | | | | | | | | | | WIP: Windows fixes
| * | | | git_pool_mallocsz takes an unsigned longJacques Germishuys2014-05-011-1/+1
| | | | |
| * | | | _InterlockedExchange expects a volatile LONGJacques Germishuys2014-05-011-1/+1
| | | | |
| * | | | Undef lseek firstJacques Germishuys2014-05-011-0/+1
| | | | |
* | | | | Merge pull request #2365 from kitbellew/fix-indexer-mmapPhilip Kelley2014-05-181-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Fix warning on uninitialized variable.
| * | | | Fix warning on uninitialized variable.Albert Meltzer2014-05-181-1/+1
|/ / / /
* | | | Fix a bug in the pack::packbuilder suitePhilip Kelley2014-05-171-0/+2
| | | |
* | | | Fix printf format string from previous commitPhilip Kelley2014-05-171-1/+1
| | | |
* | | | print_binary_hunk: Treat types with respectPhilip Kelley2014-05-171-7/+24
| | | |
* | | | Merge remote-tracking branch 'upstream/cmn/indexer-mmap' into developmentPhilip Kelley2014-05-178-73/+111
|\ \ \ \
| * | | | indexer: mmap fixes for Windowscmn/indexer-mmapCarlos Martín Nieto2014-05-174-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows has its own ftruncate() called _chsize_s(). p_mkstemp() is changed to use p_open() so we can make sure we open for writing; the addition of exclusive create is a good thing to do regardless, as we want a temporary path for ourselves. Lastly, MSVC doesn't quite know how to add two numbers if one of them is a void pointer, so let's alias it to unsigned char.C
| * | | | indexer: use mmap for writingCarlos Martín Nieto2014-05-176-72/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some OSs cannot keep their ideas about file content straight when mixing standard IO with file mapping. As we use mmap for reading from the packfile, let's make writing to the pack file use mmap.
* | | | | Merge pull request #2362 from libgit2/rb/update-4k-to-8kVicent Marti2014-05-174-2/+125
|\ \ \ \ \ | |/ / / / |/| | | | Test and fix Git diff binary detection compatibility
| * | | | Git binary check compat testsrb/update-4k-to-8kRussell Belfer2014-05-161-0/+114
| | | | | | | | | | | | | | | | | | | | | | | | | A variety of data patterns for diffs verified to match the behavior of binary detection with Git on the command line.
| * | | | Increase binary detection len to 8kRussell Belfer2014-05-163-2/+11
| | | | |
* | | | | Merge pull request #2360 from phkelley/noinheritRussell Belfer2014-05-161-2/+11
|\ \ \ \ \ | |_|_|_|/ |/| | | | Win32: Supply _O_NOINHERIT when calling _wopen
| * | | | Win32: Supply _O_NOINHERIT when calling _wopenPhilip Kelley2014-05-161-2/+11
|/ / / /
* | | | Merge pull request #2313 from libgit2/cmn/remote-deleteVicent Marti2014-05-165-3/+251
|\ \ \ \ | |/ / / |/| | | Remote deletion
| * | | remote: remove remote-tracking branches on deleteCarlos Martín Nieto2014-05-162-8/+62
| | | | | | | | | | | | | | | | | | | | When we delete a remote, we also need to go through its fetch refspecs and remove the references they create locally.
| * | | remote: move branch upstream deletion to use an iteratorCarlos Martín Nieto2014-04-301-57/+38
| | | | | | | | | | | | | | | | This should make it more readable and allocate a bunch fewer strings.
| * | | remote: Introduce git_remote_delete()nulltoken2014-04-303-3/+184
| | | |
| * | | tests: Introduce count_config_entries_match() helpernulltoken2014-04-302-0/+32
| | | |
* | | | Merge pull request #2357 from libgit2/cmn/pack-cache-initRussell Belfer2014-05-151-8/+7
|\ \ \ \ | | | | | | | | | | pack: init the cache on packfile alloc
| * | | | pack: init the cache on packfile alloccmn/pack-cache-initCarlos Martín Nieto2014-05-151-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running multithreaded, it is not enough to check for the offmap allocation. Move the call to cache_init() to packfile allocation so we can be sure it is always allocated free of races. This fixes #2355.
* | | | | Merge pull request #2356 from libgit2/rb/restore-search-pathsVicent Marti2014-05-158-66/+54
|\ \ \ \ \ | |/ / / / |/| | | | Better global search path sandboxing in tests
| * | | | Better search path sandboxingrb/restore-search-pathsRussell Belfer2014-05-158-66/+54
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | There are a number of tests that modify the global or system search paths during the tests. This adds a helper function to make it easier to restore those paths and makes sure that they are getting restored in a manner that preserves test isolation.
* | | | Fix mutex init/free in config_file.cPhilip Kelley2014-05-151-1/+4
| |_|/ |/| |
* | | Merge pull request #2351 from linquize/init-varVicent Marti2014-05-141-1/+1
|\ \ \ | | | | | | | | Initialize local variable
| * | | Initialize local variableLinquize2014-05-131-1/+1
| | | |
* | | | Merge pull request #2349 from libgit2/rb/coverity-fixesVicent Marti2014-05-1411-73/+93
|\ \ \ \ | | | | | | | | | | Increase config snapshot usage
| * | | | Increase use of config snapshotsrb/coverity-fixesRussell Belfer2014-05-137-53/+69
| | | | | | | | | | | | | | | | | | | | And decrease extra reload checks of config data.
| * | | | Some coverity inspired cleanupsRussell Belfer2014-05-134-20/+24
| |/ / /
* | | | Merge pull request #2348 from stewid/add-link-R-bindingsVicent Marti2014-05-141-0/+2
|\ \ \ \ | |/ / / |/| | | Add R bindings to the README
| * | | Add R bindings to the READMEStefan Widgren2014-05-131-0/+2
|/ / /
View Lorry Controller Status