Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'development' into gsoc-pushfeatures/push_old | Michael Schubert | 2012-10-24 | 20 | -118/+420 |
|\ | |||||
| * | tests-clar/repo: remove unused variable | Michael Schubert | 2012-10-24 | 1 | -2/+0 |
| | | |||||
| * | Add config level support in the config API | yorah | 2012-10-23 | 11 | -67/+310 |
| | | | | | | | | | | | | | | Added `struct git_config_entry`: a git_config_entry contains the key, the value, and the config file level from which a config element was found. Added `git_config_open_level`: build a single-level focused config object from a multi-level one. We are now storing `git_config_entry`s in the khash of the config_file | ||||
| * | Fix adding variable to config file with no trailing newline | yorah | 2012-10-23 | 2 | -0/+21 |
| | | | | | | | | This can occur after a manual modification of a config file. | ||||
| * | Merge pull request #963 from carlosmn/remote-save-autotag | Vicent Martí | 2012-10-22 | 1 | -0/+24 |
| |\ | | | | | | | Save the autotag configuration for remotes | ||||
| | * | remote: set/unset the autotag setting on save | Carlos Martín Nieto | 2012-10-02 | 1 | -0/+24 |
| | | | | | | | | | | | | | | | Make the configuration option match the configured behavior when saving a remote. | ||||
| * | | tests: more git_repository_head_detached() coverage | nulltoken | 2012-10-22 | 1 | -0/+9 |
| | | | |||||
| * | | reset: make git_reset() cope with an orphaned HEAD | nulltoken | 2012-10-22 | 1 | -0/+21 |
| | | | |||||
| * | | test: extract make_head_orphaned() logic | nulltoken | 2012-10-20 | 6 | -28/+26 |
| | | | |||||
| * | | tests: leverage git_repository_detach_head() | nulltoken | 2012-10-20 | 3 | -25/+13 |
| | | | |||||
* | | | object: add git_object_oid2type | Michael Schubert | 2012-10-20 | 1 | -0/+12 |
|/ / | |||||
* | | Merge pull request #1003 from arrbee/fix-test-core-env | Philip Kelley | 2012-10-19 | 1 | -39/+81 |
|\ \ | | | | | | | Fix env variable tests with new Win32 path rules | ||||
| * | | Fix env variable tests with new Win32 path rules | Russell Belfer | 2012-10-19 | 1 | -39/+81 |
| | | | | | | | | | | | | | | | | | | | | | | | | The new Win32 global path search was not working with the environment variable tests. But when I fixed the test, the new codes use of getenv() was causing more failures (presumably because of caching on Windows ???). This fixes the global file lookup to always go directly to the Win32 API in a predictable way. | ||||
* | | | Merge pull request #1000 from nulltoken/error/GIT_EORPHANEDHEAD | Vicent Martí | 2012-10-19 | 5 | -10/+92 |
|\ \ \ | | | | | | | | | Add error GIT_EORPHANEDHEAD | ||||
| * | | | errors: deploy GIT_EORPHANEDHEAD usage | nulltoken | 2012-10-19 | 4 | -5/+89 |
| | | | | |||||
| * | | | branch: allow deletion of branch when HEAD's missing | nulltoken | 2012-10-19 | 1 | -4/+3 |
| | | | | |||||
| * | | | tests: Fix unused variable warning | nulltoken | 2012-10-19 | 1 | -1/+0 |
| |/ / | |||||
* | | | Update README because vmg is @vmg. | Ted Nyman | 2012-10-19 | 1 | -1/+1 |
|/ / | |||||
* | | refs: cover more refname validity edge cases | nulltoken | 2012-10-18 | 1 | -0/+3 |
| | | |||||
* | | status: querying a bare repo returns EBAREREPO | nulltoken | 2012-10-18 | 1 | -4/+1 |
| | | |||||
* | | diff: workdir diffing in a bare repo returns EBAREREPO | nulltoken | 2012-10-18 | 1 | -0/+17 |
| | | |||||
* | | Merge pull request #993 from pwkelley/clar_update | Vicent Martí | 2012-10-18 | 3 | -4/+44 |
|\ \ | | | | | | | Update clar and add reliable rename for Win32 | ||||
| * | | Update clar and add reliable rename for Win32 | Philip Kelley | 2012-10-18 | 3 | -4/+44 |
| | | | |||||
* | | | revparse: properly handle refnames containing a @ | nulltoken | 2012-10-18 | 2 | -0/+35 |
|/ / | | | | | | | Fix #994 | ||||
* | | Merge pull request #968 from arrbee/diff-support-typechange | Russell Belfer | 2012-10-17 | 114 | -29/+363 |
|\ \ | | | | | | | Support TYPECHANGE records in status and adjust checkout accordingly | ||||
| * | | Add complex checkout test and then fix checkout | Russell Belfer | 2012-10-09 | 12 | -51/+232 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This started as a complex new test for checkout going through the "typechanges" test repository, but that revealed numerous issues with checkout, including: * complete failure with submodules * failure to create blobs with exec bits * problems when replacing a tree with a blob because the tree "example/" sorts after the blob "example" so the delete was being processed after the single file blob was created This fixes most of those problems and includes a number of other minor changes that made it easier to do that, including improving the TYPECHANGE support in diff/status, etc. | ||||
| * | | Test data with lots of type changes | Russell Belfer | 2012-10-09 | 104 | -0/+153 |
| | | | |||||
* | | | Fix -Wunused-but-set-variable warning | Michael Schubert | 2012-10-16 | 1 | -0/+2 |
| | | | |||||
* | | | test: Don't be so picky with failed lookups | Vicent Marti | 2012-10-16 | 1 | -7/+5 |
| | | | | | | | | | | | | Not found means not found, and the other way around. | ||||
* | | | Merge pull request #984 from arrbee/fix-fnmatch-and-ignore | Philip Kelley | 2012-10-16 | 6 | -9/+114 |
|\ \ \ | | | | | | | | | Fix single file ignores | ||||
| * | | | Fix single-file ignore checks | Russell Belfer | 2012-10-15 | 6 | -9/+114 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To answer if a single given file should be ignored, the path to that file has to be processed progressively checking that there are no intermediate ignored directories in getting to the file in question. This enables that, fixing the broken old behavior, and adds tests to exercise various ignore situations. | ||||
* | | | | test: fix some memory leaks | nulltoken | 2012-10-16 | 1 | -0/+9 |
| | | | | |||||
* | | | | Merge pull request #982 from nulltoken/clone/no-checkout | Ben Straub | 2012-10-15 | 1 | -0/+33 |
|\ \ \ \ | |/ / / |/| | | | clone: Explicit support of no-checkout option | ||||
| * | | | clone: fix detection of remote HEAD | nulltoken | 2012-10-15 | 1 | -0/+5 |
| | | | | |||||
| * | | | clone: Explicit support of no-checkout option | nulltoken | 2012-10-15 | 1 | -0/+28 |
| | | | | |||||
* | | | | test: fix some memory leaks | nulltoken | 2012-10-15 | 1 | -0/+2 |
| | | | | |||||
* | | | | reset: prevent hard reset in a bare repository | nulltoken | 2012-10-15 | 1 | -0/+14 |
|/ / / | |||||
* | | | Clone: use libgit2's test repos | Ben Straub | 2012-10-15 | 2 | -3/+3 |
| | | | |||||
* | | | Tests: add "network" category | Ben Straub | 2012-10-15 | 2 | -66/+80 |
| | | | | | | | | | | | | Split the clone tests into network and no-network suites. | ||||
* | | | Fix leak in the tests | Carlos Martín Nieto | 2012-10-15 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | Also introduce the slective ref trimming promised but also missed in the previous commit. | ||||
* | | | refs: loosen the OID parsing | Carlos Martín Nieto | 2012-10-15 | 2 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to require loose references to contain only an OID (possibly after trimming the string). This is however not enough for letting us lookup FETCH_HEAD, which can have a lot of content after the initial OID. Change the parsing rules so that a loose refernce must e at least 40 bytes long and the 41st (if it's there) must be accepted by isspace(3). This makes the trim unnecessary, so only do it for symrefs. This fixes #977. | ||||
* | | | tags: cover EEXISTS propagation upon creation | nulltoken | 2012-10-11 | 1 | -2/+2 |
| | | | |||||
* | | | branches: cover EEXISTS propagation upon moving | nulltoken | 2012-10-11 | 1 | -1/+1 |
| | | | |||||
* | | | branches: propagate EEXISTS upon creation | nulltoken | 2012-10-11 | 1 | -1/+1 |
| | | | |||||
* | | | refs: propagate EEXISTS upon renaming | nulltoken | 2012-10-11 | 1 | -0/+11 |
| | | | |||||
* | | | tests: add a test for tag autofollow behaviour | Carlos Martín Nieto | 2012-10-11 | 1 | -0/+70 |
| | | | | | | | | | | | | | | | Also tell ctest and valgrind to run libgit2_clar with '-iall' so we run the network tests in travis. | ||||
* | | | Add git_buf_put_base64 to buffer API | Russell Belfer | 2012-10-10 | 1 | -0/+25 |
| | | | |||||
* | | | Fix clar issue | Russell Belfer | 2012-10-09 | 1 | -1/+1 |
| | | | |||||
* | | | Update to latest clar | Russell Belfer | 2012-10-09 | 1 | -5/+40 |
| | | | |||||
* | | | gsoc-pack-objects WIP | Michael Schubert | 2012-10-09 | 1 | -0/+67 |
|/ / |