Log

Author Commit Date CI Message
Keith Dahlby 35d255fd 2012-11-04T12:13:42 repo: fix state when HEAD is not detached
Philip Kelley 1e99ce9a 2012-11-02T11:42:45 Merge pull request #1042 from pwkelley/progress_cb Fix bytes_received in fetch tests - we weren't calling the callback
Philip Kelley 438906e1 2012-11-02T14:34:06 Fix bytes_received in fetch tests - we weren't calling the callback
Russell Belfer 3ae0aad7 2012-11-02T10:42:20 Move error capture to top of giterr_set
Vicent Martí 1362a983 2012-11-02T10:00:28 Merge pull request #1014 from arrbee/diff-rename-detection Initial implementation of diff rename detection
Philip Kelley 473a7a1e 2012-11-02T08:43:17 Merge pull request #1040 from ethomson/index_refactor Free conflict index entries on removal
Philip Kelley 2c087f81 2012-11-02T08:40:09 Merge pull request #1041 from pwkelley/transports Prefer GetLastError() for GITERR_OS on Win32
Philip Kelley 8f624a47 2012-11-02T11:30:55 Prefer GetLastError() for GITERR_OS on Win32
Edward Thomson 050cf8b8 2012-11-02T01:01:21 freeing index entries would be helpful
Vicent Marti e30c052c 2012-11-01T23:01:24 LEAAAVE ME ALOOOONEEE
Vicent Martí d13da328 2012-11-01T14:18:40 Merge pull request #1038 from arrbee/doc-fixes Improve docs, examples, warnings
Russell Belfer 60ad7d52 2012-11-01T14:16:19 Merge pull request #1037 from libgit2/index-open-cleanup Some more changes to the Index API
Russell Belfer b90500f0 2012-11-01T14:08:30 Improve docs, examples, warnings This improves docs in some of the public header files, cleans up and improves some of the example code, and fixes a couple of pedantic warnings in places.
Vicent Marti 1e808f9c 2012-11-01T20:28:28 index: Add `git_index_new`
Vicent Marti 43eeca04 2012-11-01T20:24:43 index: Fix tests
Vicent Marti 276ea401 2012-11-01T20:15:53 index: Add git_index_write_tree
Vicent Marti 8ff0f325 2012-10-31T22:26:57 index: Switch to git_futils_filestamp
Russell Belfer dbd6850d 2012-11-01T10:57:14 Hide deprecations on MacOS Why Apple, why?
Russell Belfer da0bfb67 2012-11-01T10:14:04 Merge pull request #1036 from jamill/text_stat Update of text stats calculation
Jameson Miller c902f5a0 2012-11-01T12:11:24 Update of text stats calculation Do not interpret 0x85 as Next Line (NEL) char when gathering statistics for a text file.
Vicent Martí 7ae73e94 2012-11-01T09:15:29 Merge pull request #1030 from pwkelley/transports Reorganize transport architecture
Philip Kelley ff830366 2012-11-01T12:07:42 Http: Set an error for invalid content-type
Philip Kelley e068f2bb 2012-11-01T11:50:08 Fix a bug in cl_setenv on Windows XP
Philip Kelley 0ccfc63b 2012-11-01T10:29:30 Improve consistency of WinHTTP request headers
Philip Kelley 41fb1ca0 2012-10-29T13:41:14 Reorganize transport architecture (squashed 3)
Vicent Marti 003808b3 2012-10-31T20:52:16 Merge branch 'config-refresh' into development
Vicent Marti c1f61af6 2012-10-31T20:52:01 I LIKE THESE NAMES
Russell Belfer c8b511f3 2012-10-31T11:26:12 Better naming for file timestamp/size checker
Ben Straub a9db123b 2012-10-31T10:14:13 Checkout: remove duplicate 100% progress report
Ben Straub c48e8700 2012-10-31T10:13:57 Ensure that non-error is not propagated
Russell Belfer 744cc03e 2012-10-30T12:10:36 Add git_config_refresh() API to reload config This adds a new API that allows users to reload the config if the file has changed on disk. A new config callback function to refresh the config was added. The modified time and file size are used to test if the file needs to be reloaded (and are now stored in the disk backend object). In writing tests, just using mtime was a problem / race, so I wanted to check file size as well. To support that, I extended `git_futils_readbuffer_updated` to optionally check file size in addition to mtime, and I added a new function `git_filebuf_stats` to fetch the mtime and size for an open filebuf (so that the config could be easily refreshed after a write). Lastly, I moved some similar file checking code for attributes into filebuf. It is still only being used for attrs, but it seems potentially reusable, so I thought I'd move it over.
Vicent Martí efde4225 2012-10-30T12:04:28 Merge pull request #1017 from arrbee/diff-patch-to-str Add git_diff_patch_to_str API
Vicent Martí c4a9ded0 2012-10-30T12:03:22 Merge pull request #1026 from nulltoken/repo/state repo: enhance git_repository_state() detection
Vicent Martí 6c21358a 2012-10-30T11:51:58 Merge pull request #1029 from ethomson/index_refactor Index changes
Michael Schubert 6cfbbf7e 2012-10-30T18:50:59 Fix a couple of warnings
Russell Belfer db106d01 2012-10-30T09:40:50 Move rename detection into new file This improves the naming for the rename related functionality moving it to be called `git_diff_find_similar()` and renaming all the associated constants, etc. to make more sense. I also moved the new code (plus the existing `git_diff_merge`) into a new file `diff_tform.c` where I can put new functions related to manipulating git diff lists. This also updates the implementation significantly from the last revision fixing some ordering issues (where break-rewrite needs to be handled prior to copy and rename detection) and improving config option handling.
Edward Thomson f45ec1a0 2012-10-29T20:04:21 index refactoring
Ben Straub 81eecc34 2012-10-29T13:34:14 Fetch: don't clobber received count This memset was being reached after the entire packfile under WinHttp, so the byte count was being lost for small repos.
Vicent Martí 63e44d5e 2012-10-29T13:24:08 Merge pull request #1027 from PaulThompson/cmake-flags-clean Cmake flags clean
Vicent Martí 8a1479a5 2012-10-29T12:57:04 Merge pull request #796 from nulltoken/topic/git-stash Stash
Paul Thompson 88149fae 2012-10-28T10:21:28 Leave CMAKE_BUILD_TYPE absent on those generators which don't use it.
Paul Thompson 4a3be934 2012-10-28T09:56:18 Removed overwrite of CMAKE_C_FLAGS_DEBUG. - No overwriting allows control from cmake cache or cmdline - -g is already the CMake default - -O0 is already gcc's default
Paul Thompson 54c56d3e 2012-10-28T09:42:54 Remove "-O2 -g" from default CMAKE_C_FLAGS. - Those are the RelWithDebInfo flags. - They should be controlled from CMAKE_BUILD_TYPE
Paul Thompson 2df7c944 2012-10-28T09:25:43 Remove duplicate CMAKE_C_FLAGS inside CMAKE_C_FLAGS_DEBUG. - For Debug builds, CMake uses concatenated CMAKE_C_FLAGS and CMAKE_C_FLAGS_DEBUG - This reverts commit 291f7122927d2cc170dc63c378a08fa78515d987.
nulltoken 31966d20 2012-10-27T09:30:03 repo: enhance git_repository_state() detection
nulltoken 00e161b9 2012-10-26T22:09:28 tests: fix a memory leak
Ben Straub a0ce87c5 2012-10-26T13:43:13 Add network transfer callbacks on Windows
nulltoken e4c64cf2 2012-10-08T20:07:55 stash: add git_stash_drop()
nulltoken 23388413 2012-10-04T15:13:43 stash: add git_stash_foreach()
nulltoken 590fb68b 2012-10-04T13:47:45 stash: add git_stash_save()
nulltoken eb44cfe0 2012-10-08T15:49:31 error: add GITERR_STASH error type
nulltoken 4ea0a0ca 2012-06-29T22:59:58 refs: add GIT_REFS_STASH_FILE define
nulltoken b1be9dd0 2012-10-03T12:09:17 index: introduce git_index_owner()
nulltoken 1f87fa35 2012-10-09T18:29:26 reflog: fix bogus removal of reflog entries
nulltoken 27e3c583 2012-10-03T15:12:42 reflog: create reflog and its directory structure
nulltoken d2aa6de7 2012-10-03T13:56:13 reflog: Make git_reflog_free() accept null param
nulltoken f7ae3f75 2012-10-08T16:23:15 reflog: fix documentation typos
nulltoken 65d12df5 2012-10-03T15:04:59 message: reorganize tests
Vicent Martí 8bba3c95 2012-10-25T13:17:08 Merge pull request #1021 from ethomson/cmake_vs remove /ZM1000 from msvc builds
Edward Thomson 94155e2f 2012-10-25T14:51:08 remove /ZM1000 from msvc builds
Russell Belfer cb7180a6 2012-10-25T11:48:39 Add git_diff_patch_print This adds a `git_diff_patch_print()` API which is more like the existing API to "print" a patch from an entire `git_diff_list` but operates on a single `git_diff_patch` object. Also, it rewrites the `git_diff_patch_to_str()` API to use that function (making it very small).
Russell Belfer 3943dc78 2012-10-25T11:12:56 Check errors while generating diff patch string
Russell Belfer 1b934689 2012-10-25T10:55:03 Merge pull request #925 from nulltoken/topic/moving-branch-updates-config Updates config upon moving and deletion of branches
Vicent Marti 505f37b4 2012-10-25T19:22:35 config: Only dereference value on success
Ben Straub 67dad09b 2012-10-25T09:59:49 Remove inline hint
Ben Straub 1fc375e6 2012-10-25T09:02:55 Fix Windows build Pedantic ordering of GIT_UNUSED vs. variable declarations.
nulltoken fcccf304 2012-09-09T20:39:13 remote: introduce git_remote_rename()
nulltoken 3a14d3e2 2012-10-01T11:58:15 buf: introduce git_buf_splice()
nulltoken fb39b3a5 2012-10-02T14:36:59 refspec: introduce git_refspec__serialize()
nulltoken 4fe5520a 2012-09-17T17:46:58 remote: remove some code duplication
nulltoken e497b16c 2012-09-17T14:22:18 remote: prevent from saving a nameless remote
nulltoken aba70781 2012-09-11T18:11:26 config: introduce git_config_rename_section()
nulltoken 383f164a 2012-09-07T17:55:30 branch: rename config section upon moving
nulltoken 0b98a8a4 2012-09-07T15:13:11 branch: remove config section upon deletion
Vicent Martí 1eb8cd7f 2012-10-25T08:16:13 Merge pull request #990 from ben/clone-callbacks Progress callbacks
Russell Belfer 93cf7bb8 2012-10-24T20:56:32 Add git_diff_patch_to_str API This adds an API to generate a complete single-file patch text from a git_diff_patch object.
Vicent Martí 5edb846e 2012-10-24T18:33:02 Merge pull request #1013 from ethomson/reset_merge reset changes for merge
Edward Thomson 03bdb2ad 2012-10-23T16:32:01 GIT_EUNMERGED
Edward Thomson 632d8b23 2012-10-23T15:42:09 reset changes for merge
Ben Straub 1e3b8ed5 2012-10-24T14:07:07 Remove 'bytes' param from git_remote_download
Ben Straub 9762ad99 2012-10-24T13:43:23 Renaming: fix example
Ben Straub 7d222e13 2012-10-24T13:29:14 Network progress: rename things git_indexer_stats and friends -> git_transfer_progress* Also made git_transfer_progress members more sanely named.
Ben Straub c4958e68 2012-10-24T12:38:05 Fix documentation comment
Michael Schubert 6f6b0c01 2012-10-24T15:42:09 tests-clar/repo: remove unused variable
Ignacio Casal Quinteiro 4bc252e4 2012-10-24T11:27:03 Fix example in comment
Scott J. Goldman 308581de 2012-10-23T18:18:19 Fix Makefile.embed to build src/sha1/*.c
Russell Belfer b4f5bb07 2012-10-23T16:40:51 Initial implementation of diff rename detection This implements the basis for diff rename and copy detection, although it is based on simple SHA comparison right now instead of using a matching algortihm. Just as `git_diff_merge` can be used as a post-pass on diffs to emulate certain command line behaviors, there is a new API `git_diff_detect` which will update a diff list in-place, adjusting some deltas to RENAMED or COPIED state (and also, eventually, splitting MODIFIED deltas where the change is too large into DELETED/ADDED pairs). This also adds a new test repo that will hold rename/copy/split scenarios. Right now, it just has exact-match rename and copy, but the tests are written to use tree diffs, so we should be able to add new test scenarios easily without breaking tests.
Vicent Martí 81e7b10a 2012-10-23T13:43:28 Merge pull request #1012 from carlosmn/libcrypto-sha Use libcrypto's SHA-1 implementation when linking to it
Carlos Martín Nieto 7205a4d9 2012-10-23T19:30:04 Use libcrypto's SHA-1 implementation when linking to it libcryto's SHA-1 implementation is measurably better than the one that ships with the library. If we link to it for HTTPS support already, use that implementation instead. Testing on a ~600MB of the linux repository, this reduces indexing time by 40% and removes the hashing from the top spot in the perf output.
Russell Belfer 5b67d145 2012-10-23T09:53:15 Merge pull request #923 from yorah/topic/config-store Add git_config_level support when handling config files
Ben Straub c70ad945 2012-10-23T09:21:32 Update doc strings, warn about callback perf
yorah a1abe66a 2012-09-10T12:11:02 Add config level support in the config API 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
yorah f8ede948 2012-09-18T14:10:40 Fix adding variable to config file with no trailing newline This can occur after a manual modification of a config file.
Vicent Martí 8a89aa1f 2012-10-22T12:04:48 Merge pull request #963 from carlosmn/remote-save-autotag Save the autotag configuration for remotes
Vicent Martí 40846f3d 2012-10-22T10:51:43 Merge pull request #1004 from nulltoken/error/GIT_EORPHANEDHEAD More orphaned head love
nulltoken f36fb761 2012-10-20T19:23:04 tests: more git_repository_head_detached() coverage
nulltoken c436ed26 2012-10-20T12:09:02 reset: make git_reset() cope with an orphaned HEAD
Vicent Martí 0e198408 2012-10-22T10:39:40 Merge pull request #1008 from nulltoken/fix/chunked_blob blob: do not create temp files in the current path
nulltoken cfa6465c 2012-10-22T15:08:09 blob: do not create temp files in the current path - make sure temporary streamed blobs are created under the .git/objects folder and not in the current path, whatever it is. - do not make the name of the temp file depend on the hintpath.
nulltoken cd1ef822 2012-10-20T12:07:53 test: extract make_head_orphaned() logic