Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | index: check for valid filemodes on addcmn/index-add-modes | Carlos Martín Nieto | 2014-05-22 | 2 | -0/+29 |
| | |||||
* | smart: initialize the error variable | Carlos Martín Nieto | 2014-05-22 | 1 | -1/+1 |
| | |||||
* | Plug leaks and fix a C99-ism | Carlos Martín Nieto | 2014-05-22 | 3 | -13/+16 |
| | | | | | | | We have too many places where we repeat free code, so when adding the new free to the generic code, it didn't take for the local transport. While there, fix a C99-ism that sneaked through. | ||||
* | Merge pull request #2376 from libgit2/cmn/remote-symref | Vicent Marti | 2014-05-22 | 11 | -98/+284 |
|\ | | | | | Add support for the symref extension | ||||
| * | clone: get rid of head_infocmn/remote-symref | Carlos Martín Nieto | 2014-05-21 | 1 | -23/+12 |
| | | | | | | | | | | Since we no longer need to push data to callbacks, there's no need for this truct. | ||||
| * | clone: make use of the remote's default branch guessing | Carlos Martín Nieto | 2014-05-21 | 1 | -67/+17 |
| | | | | | | | | | | Let's use the remote's default branch guessing instead of reinventing one ourselves with callbacks. | ||||
| * | remote: add api to guess the remote's default branch | Carlos Martín Nieto | 2014-05-21 | 3 | -0/+115 |
| | | | | | | | | | | If the remote supports the symref protocol extension, then we return that, otherwise we guess with git's rules. | ||||
| * | local transport: expose the symref data | Carlos Martín Nieto | 2014-05-21 | 1 | -4/+18 |
| | | | | | | | | | | When using the local transport, we always have the symbolic information available, so fill it. | ||||
| * | remote: expose the remote's symref mappings | Carlos Martín Nieto | 2014-05-21 | 4 | -0/+43 |
| | | | | | | | | | | Add a symref_target field to git_remote_head to expose the symref mappings to the user. | ||||
| * | smart: store reported symrefs | Carlos Martín Nieto | 2014-05-21 | 3 | -7/+82 |
| | | | | | | | | | | | | | | | | | | | | | | | | The protocol has a capability which allows the server to tell us which refs are symrefs, so we can e.g. know which is the default branch. This capability is different from the ones we already support, as it's not setting a flag to true, but requires us to store a list of refspec-formatted mappings. This commit does not yet expose the information in the reference listing. | ||||
* | | Merge pull request #2375 from libgit2/rb/safecrlf-on-lf-platform | Vicent Marti | 2014-05-22 | 3 | -3/+25 |
|\ \ | | | | | | | Make core.safecrlf not generate an error on LF-ending platforms | ||||
| * | | Just don't CRLF filter if there are no CRsrb/safecrlf-on-lf-platform | Russell Belfer | 2014-05-19 | 1 | -3/+5 |
| | | | |||||
| * | | Make core.safecrlf work on LF-ending platforms | Russell Belfer | 2014-05-19 | 3 | -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_win32 | Vicent Marti | 2014-05-22 | 1 | -2/+3 |
|\ \ \ | | | | | | | | | Include windows.h on win32 for Sleep | ||||
| * | | | Include windows.h on win32 for Sleep | Edward Thomson | 2014-05-21 | 1 | -2/+3 |
|/ / / | |||||
* | | | Merge pull request #2372 from libgit2/cmn/fetch-terminate | Vicent Marti | 2014-05-21 | 1 | -0/+12 |
|\ \ \ | |_|/ |/| | | smart: send a flush when we disconnect | ||||
| * | | smart: send a flush when we disconnectcmn/fetch-terminate | Carlos Martín Nieto | 2014-05-20 | 1 | -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-mirror | Carlos Martín Nieto | 2014-05-21 | 1 | -4/+2 |
|\ \ | | | | | | | Minor fix for cmn/clone-into-mirror. | ||||
| * | | Minor fix for cmn/clone-into-mirror. | Albert Meltzer | 2014-05-20 | 1 | -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 tests | Carlos Martín Nieto | 2014-05-20 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #2371 from martinwoodward/attrib_fnmatch | Vicent Marti | 2014-05-19 | 2 | -3/+58 |
|\ | | | | | Restore attributions for fnmatch | ||||
| * | Restore attributions for fnmatch | Martin Woodward | 2014-05-19 | 2 | -3/+58 |
| | | |||||
* | | Merge pull request #2354 from libgit2/cmn/clone-into-mirror | Vicent Marti | 2014-05-19 | 3 | -15/+75 |
|\ \ | |/ |/| | Allow mirror-clone via `git_clone_into()` | ||||
| * | clone: don't error out if the branch already existscmn/clone-into-mirror | Carlos Martín Nieto | 2014-05-19 | 1 | -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 remote | Carlos Martín Nieto | 2014-05-19 | 1 | -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_into | Carlos Martín Nieto | 2014-05-19 | 2 | -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-char | Vicent Marti | 2014-05-19 | 4 | -13/+15 |
|\ \ | | | | | | | message: don't assume the comment char | ||||
| * | | message: don't assume the comment charcmn/comment-char | Carlos Martín Nieto | 2014-05-18 | 4 | -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-lseek | Vicent Marti | 2014-05-19 | 3 | -2/+3 |
|\ \ \ | | | | | | | | | WIP: Windows fixes | ||||
| * | | | git_pool_mallocsz takes an unsigned long | Jacques Germishuys | 2014-05-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | _InterlockedExchange expects a volatile LONG | Jacques Germishuys | 2014-05-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | Undef lseek first | Jacques Germishuys | 2014-05-01 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #2365 from kitbellew/fix-indexer-mmap | Philip Kelley | 2014-05-18 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | Fix warning on uninitialized variable. | ||||
| * | | | Fix warning on uninitialized variable. | Albert Meltzer | 2014-05-18 | 1 | -1/+1 |
|/ / / | |||||
* | | | Fix a bug in the pack::packbuilder suite | Philip Kelley | 2014-05-17 | 1 | -0/+2 |
| | | | |||||
* | | | Fix printf format string from previous commit | Philip Kelley | 2014-05-17 | 1 | -1/+1 |
| | | | |||||
* | | | print_binary_hunk: Treat types with respect | Philip Kelley | 2014-05-17 | 1 | -7/+24 |
| | | | |||||
* | | | Merge remote-tracking branch 'upstream/cmn/indexer-mmap' into development | Philip Kelley | 2014-05-17 | 8 | -73/+111 |
|\ \ \ | |||||
| * | | | indexer: mmap fixes for Windowscmn/indexer-mmap | Carlos Martín Nieto | 2014-05-17 | 4 | -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 writing | Carlos Martín Nieto | 2014-05-17 | 6 | -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-8k | Vicent Marti | 2014-05-17 | 4 | -2/+125 |
|\ \ \ \ | |/ / / |/| | | | Test and fix Git diff binary detection compatibility | ||||
| * | | | Git binary check compat testsrb/update-4k-to-8k | Russell Belfer | 2014-05-16 | 1 | -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 8k | Russell Belfer | 2014-05-16 | 3 | -2/+11 |
| | | | | |||||
* | | | | Merge pull request #2360 from phkelley/noinherit | Russell Belfer | 2014-05-16 | 1 | -2/+11 |
|\ \ \ \ | | | | | | | | | | | Win32: Supply _O_NOINHERIT when calling _wopen | ||||
| * | | | | Win32: Supply _O_NOINHERIT when calling _wopen | Philip Kelley | 2014-05-16 | 1 | -2/+11 |
|/ / / / | |||||
* | | | | Merge pull request #2313 from libgit2/cmn/remote-delete | Vicent Marti | 2014-05-16 | 5 | -3/+251 |
|\ \ \ \ | |/ / / |/| | | | Remote deletion | ||||
| * | | | remote: remove remote-tracking branches on delete | Carlos Martín Nieto | 2014-05-16 | 2 | -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 iterator | Carlos Martín Nieto | 2014-04-30 | 1 | -57/+38 |
| | | | | | | | | | | | | | | | | This should make it more readable and allocate a bunch fewer strings. | ||||
| * | | | remote: Introduce git_remote_delete() | nulltoken | 2014-04-30 | 3 | -3/+184 |
| | | | | |||||
| * | | | tests: Introduce count_config_entries_match() helper | nulltoken | 2014-04-30 | 2 | -0/+32 |
| | | | |