summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | network: add sideband supportCarlos Martín Nieto2012-08-249-13/+156
| | | | | | | | | | | | | | | | | | | | This lets us notify the user of what the remote end is doing while we wait for it to start sending us the packfile.
| * | | indexer: recognize and mark when all of the packfile has been downloadedCarlos Martín Nieto2012-08-244-3/+18
| | | | | | | | | | | | | | | | | | | | We can't always rely on the network telling us when the download is finished. Recognize it from the indexer itself.
* | | | Merge pull request #852 from arrbee/submodule-extensionsVicent Martí2012-08-24293-301/+3777
|\ \ \ \ | | | | | | | | | | Submodule extensions
| * | | | Fix valgrind warnings and spurious error messagesRussell Belfer2012-08-244-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just clean up valgrind warnings about uninitialized memory and also clear out errno in some cases where it results in a false error message being generated at a later point.
| * | | | Working implementation of git_submodule_statusRussell Belfer2012-08-2410-316/+606
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a big redesign of the git_submodule_status API and the implementation of the redesigned API. It also fixes a number of bugs that I found in other parts of the submodule API while writing the tests for the status part. This also fixes a couple of bugs in the iterators that had not been noticed before - one with iterating when there is a gitlink (i.e. separate-work-dir) and one where I was treating anything even vaguely submodule-like as a submodule, more aggressively than core git does.
| * | | | Fix valgrind issues and leaksRussell Belfer2012-08-246-128/+226
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes up a number of problems flagged by valgrind and also cleans up the internal `git_submodule` allocation handling overall with a simpler model.
| * | | | Major submodule rewriteRussell Belfer2012-08-2413-200/+2273
| | | | | | | | | | | | | | | | | | | | | | | | | This replaces the old submodule API with a new extended API that supports most of the things that can be done with `git submodule`.
| * | | | New submodule test dataRussell Belfer2012-08-24270-0/+1007
| | | | |
* | | | | Merge pull request #876 from arrbee/new-config-locationsVicent Martí2012-08-244-11/+24
|\ \ \ \ \ | | | | | | | | | | | | new config file locations and defaults
| * | | | | Support new config locationsRussell Belfer2012-08-244-11/+24
|/ / / / / | | | | | | | | | | | | | | | | | | | | As of git v1.7.12, $HOME/.config/git/ is supported as a new location for "config", "attributes", and "ignore" files.
* | | | | Fix memory leak in cp_rRussell Belfer2012-08-241-0/+1
| |_|_|/ |/| | |
* | | | Fix crash with adding internal ignoresRussell Belfer2012-08-242-8/+27
|/ / / | | | | | | | | | | | | | | | Depending on what you had done before adding new items to the internal ignores list, it was possible for the cache of ignore data to be uninitialized.
* | | Fix errors on Win32 with new repo initRussell Belfer2012-08-244-21/+37
|/ /
* | Merge pull request #844 from arrbee/init-extendedVicent Martí2012-08-2338-276/+1922
|\ \ | |/ |/| Add git_repository_init_ext for power initters
| * Fix warnings and merge issues on Win64Russell Belfer2012-08-2312-43/+30
| |
| * Some cleanup suggested during reviewRussell Belfer2012-08-227-56/+24
| | | | | | | | | | | | | | | | | | | | This cleans up a number of items suggested during code review with @vmg, including: * renaming "outside repo" config API to `git_config_open_default` * killing the `git_config_open_global` API * removing the `git_` prefix from the static functions in fileops * removing some unnecessary functionality from the "cp" command
| * Don't reference stack vars in cleanup callbackRussell Belfer2012-08-221-4/+7
| | | | | | | | | | | | If you use the clar cleanup callback function, you can't pass a reference pointer to a stack allocated variable because when the cleanup function runs, the stack won't exist anymore.
| * fix missing validation and type cast warningRussell Belfer2012-08-221-1/+4
| |
| * Add template dir and set gid to repo initRussell Belfer2012-08-2229-184/+1481
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This extends git_repository_init_ext further with support for initializing the repository from an external template directory and with support for the "create shared" type flags that make a set GID repository directory. This also adds tests for much of the new functionality to the existing `repo/init.c` test suite. Also, this adds a bunch of new utility functions including a very general purpose `git_futils_mkdir` (with the ability to make paths and to chmod the paths post-creation) and a file tree copying function `git_futils_cp_r`. Also, this includes some new path functions that were useful to keep the code simple.
| * Add git_repository_init_ext for power inittersRussell Belfer2012-08-226-141/+529
|/ | | | | | | The extended version of repository init adds support for many of the things that you can do with `git init` and sets up structures that will make it easier to extend further in the future.
* Minor bug fixes in diff codeRussell Belfer2012-08-223-3/+6
| | | | | | | In looking at PR #878, I found a few small bugs in the diff code, mostly related to work that can be avoided when processing tree- to-tree diffs that was always being carried out. This commit has some small fixes in it.
* Merge pull request #891 from arrbee/internal-ignore-apiVicent Martí2012-08-227-9/+190
|\ | | | | API for managing in-memory ignore rules
| * Wrap up ignore API and add testsRussell Belfer2012-08-224-9/+146
| | | | | | | | This fills out the ignore API and adds tests.
| * Add public API for internal ignoresRussell Belfer2012-08-214-0/+44
| | | | | | | | | | | | | | This creates a public API for adding to the internal ignores list, which already existing but was not accessible. This adds the new default value for core.excludesfile also.
* | Merge pull request #889 from nulltoken/filemode-enumVicent Martí2012-08-219-92/+116
|\ \ | |/ |/| Filemode enum
| * tree entry: rename git_tree_entry_attributes() into git_tree_entry_filemode()nulltoken2012-08-215-12/+12
| |
| * filemode: deploy enum usagenulltoken2012-08-217-80/+94
| |
| * filemode: introduce enum to ease use of attributesnulltoken2012-08-211-0/+10
|/
* Win32: test core.autocrlfBen Straub2012-08-211-7/+23
|
* Tests: close file handles before assertingBen Straub2012-08-201-5/+9
| | | | | Avoids getting ERROR_SHARING_VIOLATION on win32 and killing the entire clar run.
* Merge pull request #884 from carlosmn/global-windowsVicent Martí2012-08-204-14/+44
|\ | | | | Make the memory-window conrol structures global
| * Make the memory-window conrol structures globalCarlos Martín Nieto2012-08-204-14/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | Up to now, the idea was that the user would do all the operations for one repository in the same thread. Thus we could have the memory-mapped window information thread-local and avoid any locking. This is not practical in a few environments, such as Apple's GCD which allocates threads arbitrarily or the .NET CLR, where the OS-level thread can change at any moment. Make the control structure global and protect it with a mutex so we don't depend on the thread currently executing the code.
* | Merge pull request #879 from nulltoken/deprecated-modeVicent Martí2012-08-1913-5/+167
|\ \ | | | | | | Handling of 100664 deprecated mode in tree entries
| * | treebuilder: enhance attributes handling on insertionnulltoken2012-08-193-5/+151
| | |
| * | Add deprecated-mode.git test repositorynulltoken2012-08-1910-0/+16
|/ /
* | Merge pull request #778 from ben/cloneVicent Martí2012-08-1942-30/+1304
|\ \ | |/ |/| Clone
| * Checkout: fix memory leak in tests.Ben Straub2012-08-061-0/+2
| |
| * Clean up a TODO comment.Ben Straub2012-08-011-1/+0
| |
| * Add documentation for clone methods.Ben Straub2012-07-311-2/+3
| |
| * Checkout: fix problem with detached HEAD.Ben Straub2012-07-312-5/+7
| |
| * Add checkout.h to git2.h.Ben Straub2012-07-313-4/+5
| | | | | | Also correcting some documentation strings.
| * Checkout: fix crlf tests under win32.Ben Straub2012-07-311-3/+8
| |
| * Checkout: crlf filter.Ben Straub2012-07-312-17/+83
| |
| * Checkout: handle file modes properly.Ben Straub2012-07-316-10/+17
| | | | | | | | Global file mode override now works properly with the file mode stored in the tree node.
| * Try to fix Travis.Ben Straub2012-07-311-1/+7
| |
| * Rename example function to avoid name collision.Ben Straub2012-07-313-3/+3
| |
| * Checkout: save index on checkout.Ben Straub2012-07-312-1/+1
| |
| * Enable stats on git_index_read_tree.Ben Straub2012-07-306-24/+7
| | | | | | | | | | Replace with the contents of git_index_read_tree_with_stats() and improve documentation comments.
| * Add clone to the network example.Ben Straub2012-07-304-0/+72
| |
| * Checkout: use git_index_read_tree_with_stats.Ben Straub2012-07-303-6/+39
| | | | | | | | | | New variant of git_index_read_tree that fills in the 'total' field of a git_indexer_stats struct as it's walking the tree.