kmx git

Commit	Date	Message
4e4eab52	2013-04-19T18:19:53	alloc doesn't take a refdb; git_refdb_free nicely in the tests
1af80a67	2013-04-18T16:13:52	Fix workdir iterator leak When attempting to create a workdir iterator for a bare repo, don't leak the iterator structure.
2aee1aa4	2013-04-18T14:35:13	Fix uninitialized var warnings
fc57471a	2013-04-18T14:13:53	More filesystem iterator cleanup Renamed the callback functions and made some minor rearrangements to clean up the flow of some code.
38fd8121	2013-04-18T14:48:20	Fix win64 warnings
71f85226	2013-04-18T11:11:38	Make workdir iterator use filesystem iterator This adds some hooks into the filesystem iterator so that the workdir iterator can just become a wrapper around it. Then we remove most of the workdir iterator code and just have it augment the filesystem iterator with skipping .git entries, updating the ignore stack, and checking for submodules.
ff0ddfa4	2013-04-17T15:56:31	Add filesystem iterator variant This adds a new variant iterator that is a raw filesystem iterator for scanning directories from a root. There is still more work to do to blend this with the working directory iterator.
2b63dbfb	2013-04-18T06:01:41	Merge pull request #1482 from nviennot/error-name-email Return error for empty name/email
f90391ea	2013-04-18T14:47:54	treebuilder: don't overwrite the error message
9e46f676	2013-04-18T00:55:20	Return error for empty name/email
0d9bf890	2013-04-17T14:59:28	Merge pull request #1475 from libgit2/vmg/refs-peel Allow access to the cached peel data in packed-refs
fedd0f9e	2013-04-17T23:29:34	refs: Do not union the peel
13421eee	2013-04-17T22:32:39	refs: Check alloc is cleaner
526882a3	2013-04-17T12:20:09	Merge pull request #1477 from ethomson/checkout_modified_use_cache checkout: use cache when possible to determine if workdir item is dirty
0da62c5c	2013-04-17T10:52:49	checkout: use cache when possible to determine if workdir item is dirty If the on-disk file has been staged (it's stat data matches the stat data in the cache) then we need not hash the file to determine whether it differs from the checkout target; instead we can simply use the oid in the index. This prevents recomputing a file's hash unnecessarily, prevents loading the file (when filtering) and prevents edge cases where filters suggest that a file is dirty immediately after git writes the file.
3be933b1	2013-04-17T17:33:51	refs: Add `git_referene_target_peel`
a442ed68	2013-04-17T04:46:37	repository: Add `git_repository_open_bare`
24f61bc5	2013-04-15T15:47:38	Merge pull request #1469 from libgit2/vmg/unified-revision Unified rev-parse, with a revision object
404eadb0	2013-04-16T00:11:59	remote: don't try to update FETCH_HEAD if no extra heads exist Don't try to update anything if there are no heads to update. This saves us from trying to look into a fetch refspec when there is none. A better fix for compatibility with git when using remotes without refspecs is still needed, but this stops us from segfaulting.
cbda09d0	2013-04-15T23:40:46	git_revision -> git_revspec
36c2dfed	2013-04-15T23:32:40	Is this crazy?
67ba7d20	2013-04-15T22:53:57	Allow git_remote_ls after disconnecting from the remote Keep the data around until free, as expected by our own fetch example
d064c747	2013-04-15T23:18:24	Merge remote-tracking branch 'ben/unified-revparse' into development
299a224b	2013-04-15T12:00:04	Change git_revparse to output git_object pointers This will probably prevent many lookup/free operations in calling code.
2ebc3c66	2013-04-15T11:57:24	Redeploy git_revparse_single.
4291ad07	2013-04-15T11:42:34	Reintroduce git_revparse_single.
872ca1d3	2013-04-15T20:00:42	Fix compilation on OpenBSD
0efae3b2	2013-04-15T12:24:08	commit: correctly detect the start of the commit message The end of the header is signaled by to consecutive LFs and the commit message starts immediately after. Jumping over LFs at the start of the message is a bug and leads to creating different commits if when rebuilding history. This also fixes an empty commit message being returned as "\n".
7ebc249c	2013-04-04T11:38:17	dec refcount on refdb instead of always freeing
ea8bac37	2013-04-11T06:34:59	Merge pull request #1450 from carlosmn/branch-upstream Branch upstream configuration
d59942c2	2013-03-30T04:27:42	branch: add more upstream configuration management Add functions to set and unset the upstream configuration to complement the getter we already have.
0d32f39e	2013-03-04T11:31:50	Notify '*' pathspec correctly when diffing I also moved all tests related to notifying in their own file.
90431f1b	2013-04-10T08:33:33	Merge pull request #1424 from phkelley/efficient_push Reduce the number of unnecessary objects in pushed packs
575a54db	2013-04-10T16:55:29	object: Export git_object_dup
ad26434b	2013-04-09T14:52:32	Tests and more fixes for submodule diffs This adds tests for diffs with submodules in them and (perhaps unsurprisingly) requires further fixes to be made. Specifically, this fixes: - when considering if a submodule is dirty in the workdir, it was being treated as dirty even if only the index was dirty. - git_diff_patch_to_str (and git_diff_patch_print) were "printing" the headers for files (and submodules) that were unmodified or had no meaningful content. - added comment to previous fix and removed unneeded parens.
9da187e8	2013-04-09T11:40:00	Fix clang warnings and improve checks
94750e8a	2013-03-29T11:52:18	Fix submodule dirty states not showing if submodules comes before files, or there are only dirty submodules but no changed files GIT_DIFF_PATCH_DIFFABLE was not set, so the diff content was not shown When submodule is dirty, the hash may be the same, but the length is different because -dirty is appended We can therefore compare the length or hash
1aa21fe3	2013-04-09T05:03:51	Deprecate git_revparse_single and _rangelike
8480eef7	2013-03-11T20:27:16	Implement unified git_revparse
d9ecaf8c	2013-04-07T07:22:38	Merge remote-tracking branch 'gnprice/revwalk' into development
af079d8b	2013-03-03T20:54:23	revwalk: Parse revision ranges All the hard work is already in revparse. Signed-off-by: Greg Price <price@mit.edu>
b208d900	2013-03-20T10:01:58	revparse: Parse range-like syntax Signed-off-by: Greg Price <price@mit.edu>
08283cbd	2013-04-01T07:12:49	Merge pull request #1448 from phkelley/development Avoid pre-Win7 WinHTTP self-redirect quirk
b39f9697	2013-03-31T23:04:14	Fix whitespace in src/win32/version.h
5c5eeba6	2013-03-31T22:22:33	Add git_has_win32_version helper
8cc2f2d8	2013-03-31T12:10:27	Win32 error reporting: Support WinHTTP errors
24cb87e2	2013-03-31T13:27:43	tag: Fix parsing when no tagger nor message
97016f29	2013-03-30T09:30:29	branch: refactor git_branch_remote_name Return the size we'd need to write to instead of simply an error. Split the function into two to be used later by the upstream configuration functions.
0227fa2a	2013-03-30T21:36:04	Avoid pre-Win7 WinHTTP self-redirect quirk
a258d8e3	2013-03-30T03:39:19	branch: rename 'tracking' to 'upstream' The term 'tracking' is overloaded. Help distinguish what we mean by using 'upstream' for this part of the library.
54a1a042	2013-03-29T11:26:12	remove unmerged files during reset hard
8cfd54f0	2013-03-26T12:27:15	Fix Windows/Win32 warning
0b061b5b	2013-03-26T11:05:57	Merge pull request #1436 from schu/opts-cache-size opts: allow configuration of odb cache size
86d24ce4	2013-03-26T10:42:30	Merge pull request #1439 from arrbee/recurse-ignored-dirs Several diff and status fixes
ccfa6805	2013-03-25T23:58:40	Fix some diff ignores and submodule dirty workdir This started out trying to look at the problems from issue #1425 and gradually grew to a broader set of fixes. There are two core things fixed here: 1. When you had an ignore like "/bin" which is rooted at the top of your tree, instead of immediately adding the "bin/" entry as an ignored item in the diff, we were returning all of the direct descendants of the directory as ignored items. This changes things to immediately ignore the directory. Note that this effects the behavior in test_status_ignore__subdirectories so that we no longer exactly match core gits ignore behavior, but the new behavior probably makes more sense (i.e. we now will include an ignored directory inside an untracked directory that we previously would have left off). 2. When a submodule only contained working directory changes, the diff code was always considering it unmodified which was just an outright bug. The HEAD SHA of the submodule matches the SHA in the parent repo index, and since the SHAs matches, the diff code was overwriting the actual status with UNMODIFIED. These fixes broke existing tests test_diff_workdir__submodules and test_status_ignore__subdirectories but looking it over, I actually think the new results are correct and the old results were wrong. @nulltoken had actually commented on the subdirectory ignore issue previously. I also included in the tests some debugging versions of the shared iteration callback routines that print status or diff information. These aren't used actively in the tests, but can be quickly swapped in to test code to give a better picture of what is being scanned in some of the complex test scenarios.
37ee70fa	2013-03-25T22:19:39	Implement GIT_STATUS_OPT_EXCLUDE_SUBMODULES This option has been sitting unimplemented for a while, so I finally went through and implemented it along with some tests. As part of this, I improved the implementation of GIT_DIFF_IGNORE_SUBMODULES so it be more diligent about avoiding extra work and about leaving off delta records for submodules to the greatest extent possible (though it may include them still if you are request TYPECHANGE records).
d2a4a54b	2013-03-25T21:46:51	Merge pull request #1438 from ethomson/checkout_stat don't stat until the file is written
d828f118	2013-03-25T18:16:02	don't stat until the file is written
0c289dd7	2013-03-25T16:40:16	Recursing into ignored dirs for diff and status This implements working versions of GIT_DIFF_RECURSE_IGNORED_DIRS and GIT_STATUS_OPT_RECURSE_IGNORED_DIRS along with some tests for the newly available behaviors. This is not turned on by default for status, but can be accessed via the options to the extended version of the command.
f2850f33	2013-03-25T15:30:37	Merge pull request #1437 from phkelley/redirect http: Support 302 Found (arrbee did most of the work)
35e0f3c6	2013-03-25T17:59:30	Refine the redirect check condition
2c7f7a66	2013-03-25T17:35:36	http: Support 302 Found (arrbee did most of the work)
3658e81e	2013-03-25T14:20:07	Move crlf conversion into buf_text This adds crlf/lf conversion functions into buf_text with more efficient implementations that bypass the high level buffer functions. They attempt to minimize the number of reallocations done and they directly write the buffer data as needed if they know that there is enough memory allocated to memcpy data. Tests are added for these new functions. The crlf.c code is updated to use the new functions. Removed the include of buf_text.h from filter.h and just include it more narrowly in the places that need it.
4a15ea86	2013-03-21T14:02:25	don't convert CRLF to CRCRLF
9733e80c	2013-03-22T10:44:45	Add has_cr_in_index check to CRLF filter This adds a check to the drop_crlf filter path to check it the file in the index already has a CR in it, in which case this will not drop the CRs from the workdir file contents. This uncovered a "bug" in `git_blob_create_fromworkdir` where the full path to the file was passed to look up the attributes instead of the relative path from the working directory root. This meant that the check in the index for a pre-existing entry of the same name was failing.
13640d1b	2013-03-25T21:39:11	oid: Do not parse OIDs longer than 40
1f107478	2013-03-25T13:26:50	Merge pull request #1428 from xavier-l/nul-terminated-oid Nul terminated oid
f5e28202	2013-03-25T13:38:43	opts: allow configuration of odb cache size Currently, the odb cache has a fixed size of 128 slots as defined by GIT_DEFAULT_CACHE_SIZE. Allow users to set the size of the cache via git_libgit2_opts(). Fixes #1035.
33a59401	2013-03-22T20:22:39	graph: make the ahead-behind docs clearer Explain it in local-upstream branch terms so it's easier to grasp than with the `one` and `two` naming from the merge-base code.
1e7b7523	2013-03-21T12:30:08	git_oid_fromstrn already sets a maximum on the length of the string
0c8efb38	2013-03-21T11:59:01	Added an oid function that accepts nul-terminated strings
cd01dd5d	2013-03-19T15:43:34	Fix dumb mistake in the comparison function
bef2a12c	2013-03-19T15:35:26	Convert enqueue_object to a function
799f9a04	2013-03-19T14:56:45	Reduce the number of unnecessary objects in pushed packs
65025cb8	2013-03-18T17:24:13	Three submodule status bug fixes 1. Fix sort order problem with submodules where "mod" was sorting after "mod-plus" because they were being sorted as "mod/" and "mod-plus/". This involved pushing the "contains a .git entry" test significantly lower in the stack. 2. Reinstate behavior that a directory which contains a .git entry will be treated as a submodule during iteration even if it is not yet added to the .gitmodules. 3. Now that any directory containing .git is reported as submodule, we have to be more careful checking for GIT_EEXISTS when we do a submodule lookup, because that is the error code that is returned by git_submodule_lookup when you try to look up a directory containing .git that has no record in gitmodules or the index.
5b27bf7e	2013-03-18T16:17:14	Merge pull request #1417 from arrbee/opts-for-paths Implement opts interface for global/system file search paths
32460251	2013-03-18T15:54:35	Fixes and cleanups Get rid of some dead code, tighten things up a bit, and fix a bug with core::env test.
41954a49	2013-03-18T14:19:35	Switch search paths to classic delimited strings This switches the APIs for setting and getting the global/system search paths from using git_strarray to using a simple string with GIT_PATH_LIST_SEPARATOR delimited paths, just as the environment PATH variable would contain. This makes it simpler to get and set the value. I also added code to expand "$PATH" when setting a new value to embed the old value of the path. This means that I no longer require separate actions to PREPEND to the value.
50eb8520	2013-03-18T14:05:31	Merge pull request #1420 from KindDragon/static-code-analyzer-warnings Several warnings detected by static code analyzer fixed
677dce8a	2013-03-18T14:00:09	Merge pull request #1080 from carlosmn/config-set-null Failing config related test
10c06114	2013-03-17T04:46:46	Several warnings detected by static code analyzer fixed Implicit type conversion argument of function to size_t type Suspicious sequence of types castings: size_t -> int -> size_t Consider reviewing the expression of the 'A = B == C' kind. The expression is calculated as following: 'A = (B == C)' Unsigned type is never < 0
5540d947	2013-03-15T16:39:00	Implement global/system file search paths The goal of this work is to expose the search logic for "global", "system", and "xdg" files through the git_libgit2_opts() interface. Behind the scenes, I changed the logic for finding files to have a notion of a git_strarray that represents a search path and to store a separate search path for each of the three tiers of config file. For each tier, I implemented a function to initialize it to default values (generally based on environment variables), and then general interfaces to get it, set it, reset it, and prepend new directories to it. Next, I exposed these interfaces through the git_libgit2_opts interface, reusing the GIT_CONFIG_LEVEL_SYSTEM, etc., constants for the user to control which search path they were modifying. There are alternative designs for the opts interface / argument ordering, so I'm putting this phase out for discussion. Additionally, I ended up doing a little bit of clean up regarding attr.h and attr_file.h, adding a new attrcache.h so the other two files wouldn't have to be included in so many places.
a5f61384	2013-03-15T12:24:20	odb_pack: Unused functions
f16fb099	2013-03-15T12:11:02	pool: Internal struct name
5b229e20	2013-03-15T04:06:31	Merge pull request #1413 from arrbee/more-iterator-refactor Further tree_iterator refactoring
55e0f53d	2013-03-14T15:09:29	Fix various build warnings This fixes various build warnings on Mac and Windows (64-bit).
14bedad9	2013-03-14T15:08:04	Added pool freelist struct for readability This adds a git_pool_freelist_item struct that makes it a little easier to follow what's going on with the pool free list block management code. It is functionally neutral.
d85296ab	2013-03-14T13:50:54	Fix valgrind issues (and mmap fallback for diff) This fixes a number of issues identified by valgrind - mostly missed free calls. Inside valgrind, mmap() may fail which causes some of the diff tests to fail. This adds a fallback code path to diff_output.c:get_workdir_content() where is the mmap() fails the code will now try to read the file data directly into allocated memory (which is what it would do if the data needed to be filtered anyhow).
0c468633	2013-03-14T13:40:15	Improved tree iterator internals This updates the tree iterator internals to be more efficient. The tree_iterator_entry objects are now kept as pointers that are allocated from a git_pool, so that we may use git__tsort_r for sorting (which is better than qsort, given that the tree is likely mostly ordered already). Those tree_iterator_entry objects now keep direct pointers to the data they refer to instead of keeping indirect index values. This simplifies a lot of the data structure traversal code. This also adds bsearch to find the start item position for range- limited tree iterators, and is more explicit about using git_path_cmp instead of reimplementing it. The git_path_cmp changed a bit to make it easier for tree_iterators to use it (but it was barely being used previously, so not a big deal). This adds a git_pool_free_array function that efficiently frees a list of pool allocated pointers (which the tree_iterator keeps). Also, added new tests for the git_pool free list functionality that was not previously being tested (or used).
bbb13646	2013-03-13T14:59:51	Fix workdir iterator bugs This fixes two bugs with the workdir iterator depth check: first that the depth was not being decremented and second that empty directories were counting against the depth even though a frame was not being created for them. This also fixes a bug with the ENOTFOUND return code for workdir iterators when you attempt to advance_into an empty directory. Actually, that works correctly, but it was incorrectly being propogated into regular advance() calls in some circumstances. Added new tests for the above that create a huge hierarchy on the fly and try using the workdir iterator to traverse it.
ad003763	2013-03-12T20:36:35	MSVC: What could possibly be the size of a void*?
f5898324	2013-03-12T15:31:14	Style: Reverse lhs and rhs of == comparisons
b8c32580	2013-03-12T15:19:32	Advertise and support side-band-64k when calling receive-pack
1ac10aae	2013-03-12T09:23:53	Merge pull request #1408 from arrbee/refactor-iterators Refactor iterators
62beacd3	2013-03-11T16:43:58	Sorting function cleanup and MinGW fix Clean up some sorting function stuff including fixing qsort_r on MinGW, common function pointer type for comparison, and basic insertion sort implementation (which we, regrettably, fall back on for MinGW).
b70bf922	2013-03-11T14:35:49	Merge pull request #1406 from cpthamilton/local_push Implemented push on the local transport
20858f6e	2013-02-19T06:22:58	Implemented push on the local transport
a5eea2d7	2013-03-11T11:31:50	Stabilize order for equiv tree iterator entries Given a group of case-insensitively equivalent tree iterator entries, this ensures that the case-sensitively first trees will be used as the representative items. I.e. if you have conflicting entries "A/B/x", "a/b/x", and "A/b/x", this change ensures that the earliest entry "A/B/x" will be returned. The actual choice is not that important, but it is nice to have it stable and to have it been either the first or last item, as opposed to a random item from within the equivalent span.
aa408cbf	2013-03-11T11:18:00	handle small files in similarity metrics
aec4f663	2013-03-11T10:37:12	Fix tree iterator advance using wrong name compare Tree iterator advance was moving forward without taking the filemode of the entries into account, equating "a" and "a/". This makes the tree entry comparison code more easily reusable and fixes the problem.

4e4eab52

2013-04-19T18:19:53

alloc doesn't take a refdb; git_refdb_free nicely in the tests

1af80a67

2013-04-18T16:13:52

Fix workdir iterator leak When attempting to create a workdir iterator for a bare repo, don't leak the iterator structure.

2aee1aa4

2013-04-18T14:35:13

Fix uninitialized var warnings

fc57471a

2013-04-18T14:13:53

More filesystem iterator cleanup Renamed the callback functions and made some minor rearrangements to clean up the flow of some code.

38fd8121

2013-04-18T14:48:20

Fix win64 warnings

71f85226

2013-04-18T11:11:38

Make workdir iterator use filesystem iterator This adds some hooks into the filesystem iterator so that the workdir iterator can just become a wrapper around it. Then we remove most of the workdir iterator code and just have it augment the filesystem iterator with skipping .git entries, updating the ignore stack, and checking for submodules.

ff0ddfa4

2013-04-17T15:56:31

Add filesystem iterator variant This adds a new variant iterator that is a raw filesystem iterator for scanning directories from a root. There is still more work to do to blend this with the working directory iterator.

2b63dbfb

2013-04-18T06:01:41

Merge pull request #1482 from nviennot/error-name-email Return error for empty name/email

f90391ea

2013-04-18T14:47:54

treebuilder: don't overwrite the error message

9e46f676

2013-04-18T00:55:20

Return error for empty name/email

0d9bf890

2013-04-17T14:59:28

Merge pull request #1475 from libgit2/vmg/refs-peel Allow access to the cached peel data in packed-refs

fedd0f9e

2013-04-17T23:29:34

refs: Do not union the peel

13421eee

2013-04-17T22:32:39

refs: Check alloc is cleaner

526882a3

2013-04-17T12:20:09

Merge pull request #1477 from ethomson/checkout_modified_use_cache checkout: use cache when possible to determine if workdir item is dirty

0da62c5c

2013-04-17T10:52:49

checkout: use cache when possible to determine if workdir item is dirty If the on-disk file has been staged (it's stat data matches the stat data in the cache) then we need not hash the file to determine whether it differs from the checkout target; instead we can simply use the oid in the index. This prevents recomputing a file's hash unnecessarily, prevents loading the file (when filtering) and prevents edge cases where filters suggest that a file is dirty immediately after git writes the file.

3be933b1

2013-04-17T17:33:51

refs: Add `git_referene_target_peel`

a442ed68

2013-04-17T04:46:37

repository: Add `git_repository_open_bare`

24f61bc5

2013-04-15T15:47:38

Merge pull request #1469 from libgit2/vmg/unified-revision Unified rev-parse, with a revision object

404eadb0

2013-04-16T00:11:59

remote: don't try to update FETCH_HEAD if no extra heads exist Don't try to update anything if there are no heads to update. This saves us from trying to look into a fetch refspec when there is none. A better fix for compatibility with git when using remotes without refspecs is still needed, but this stops us from segfaulting.

cbda09d0

2013-04-15T23:40:46

git_revision -> git_revspec

36c2dfed

2013-04-15T23:32:40

Is this crazy?

67ba7d20

2013-04-15T22:53:57

Allow git_remote_ls after disconnecting from the remote Keep the data around until free, as expected by our own fetch example

d064c747

2013-04-15T23:18:24

Merge remote-tracking branch 'ben/unified-revparse' into development

299a224b

2013-04-15T12:00:04

Change git_revparse to output git_object pointers This will probably prevent many lookup/free operations in calling code.

2ebc3c66

2013-04-15T11:57:24

Redeploy git_revparse_single.

4291ad07

2013-04-15T11:42:34

Reintroduce git_revparse_single.

872ca1d3

2013-04-15T20:00:42

Fix compilation on OpenBSD

0efae3b2

2013-04-15T12:24:08

commit: correctly detect the start of the commit message The end of the header is signaled by to consecutive LFs and the commit message starts immediately after. Jumping over LFs at the start of the message is a bug and leads to creating different commits if when rebuilding history. This also fixes an empty commit message being returned as "\n".

7ebc249c

2013-04-04T11:38:17

dec refcount on refdb instead of always freeing

ea8bac37

2013-04-11T06:34:59

Merge pull request #1450 from carlosmn/branch-upstream Branch upstream configuration

d59942c2

2013-03-30T04:27:42

branch: add more upstream configuration management Add functions to set and unset the upstream configuration to complement the getter we already have.

0d32f39e

2013-03-04T11:31:50

Notify '*' pathspec correctly when diffing I also moved all tests related to notifying in their own file.

90431f1b

2013-04-10T08:33:33

Merge pull request #1424 from phkelley/efficient_push Reduce the number of unnecessary objects in pushed packs

575a54db

2013-04-10T16:55:29

object: Export git_object_dup

ad26434b

2013-04-09T14:52:32

Tests and more fixes for submodule diffs This adds tests for diffs with submodules in them and (perhaps unsurprisingly) requires further fixes to be made. Specifically, this fixes: - when considering if a submodule is dirty in the workdir, it was being treated as dirty even if only the index was dirty. - git_diff_patch_to_str (and git_diff_patch_print) were "printing" the headers for files (and submodules) that were unmodified or had no meaningful content. - added comment to previous fix and removed unneeded parens.

9da187e8

2013-04-09T11:40:00

Fix clang warnings and improve checks

94750e8a

2013-03-29T11:52:18

Fix submodule dirty states not showing if submodules comes before files, or there are only dirty submodules but no changed files GIT_DIFF_PATCH_DIFFABLE was not set, so the diff content was not shown When submodule is dirty, the hash may be the same, but the length is different because -dirty is appended We can therefore compare the length or hash

1aa21fe3

2013-04-09T05:03:51

Deprecate git_revparse_single and _rangelike

8480eef7

2013-03-11T20:27:16

Implement unified git_revparse

d9ecaf8c

2013-04-07T07:22:38

Merge remote-tracking branch 'gnprice/revwalk' into development

af079d8b

2013-03-03T20:54:23

revwalk: Parse revision ranges All the hard work is already in revparse. Signed-off-by: Greg Price <price@mit.edu>

b208d900

2013-03-20T10:01:58

revparse: Parse range-like syntax Signed-off-by: Greg Price <price@mit.edu>

08283cbd

2013-04-01T07:12:49

Merge pull request #1448 from phkelley/development Avoid pre-Win7 WinHTTP self-redirect quirk

b39f9697

2013-03-31T23:04:14

Fix whitespace in src/win32/version.h

5c5eeba6

2013-03-31T22:22:33

Add git_has_win32_version helper

8cc2f2d8

2013-03-31T12:10:27

Win32 error reporting: Support WinHTTP errors

24cb87e2

2013-03-31T13:27:43

tag: Fix parsing when no tagger nor message

97016f29

2013-03-30T09:30:29

branch: refactor git_branch_remote_name Return the size we'd need to write to instead of simply an error. Split the function into two to be used later by the upstream configuration functions.

0227fa2a

2013-03-30T21:36:04

Avoid pre-Win7 WinHTTP self-redirect quirk

a258d8e3

2013-03-30T03:39:19

branch: rename 'tracking' to 'upstream' The term 'tracking' is overloaded. Help distinguish what we mean by using 'upstream' for this part of the library.

54a1a042

2013-03-29T11:26:12

remove unmerged files during reset hard

8cfd54f0

2013-03-26T12:27:15

Fix Windows/Win32 warning

0b061b5b

2013-03-26T11:05:57

Merge pull request #1436 from schu/opts-cache-size opts: allow configuration of odb cache size

86d24ce4

2013-03-26T10:42:30

Merge pull request #1439 from arrbee/recurse-ignored-dirs Several diff and status fixes

ccfa6805

2013-03-25T23:58:40

Fix some diff ignores and submodule dirty workdir This started out trying to look at the problems from issue #1425 and gradually grew to a broader set of fixes. There are two core things fixed here: 1. When you had an ignore like "/bin" which is rooted at the top of your tree, instead of immediately adding the "bin/" entry as an ignored item in the diff, we were returning all of the direct descendants of the directory as ignored items. This changes things to immediately ignore the directory. Note that this effects the behavior in test_status_ignore__subdirectories so that we no longer exactly match core gits ignore behavior, but the new behavior probably makes more sense (i.e. we now will include an ignored directory inside an untracked directory that we previously would have left off). 2. When a submodule only contained working directory changes, the diff code was always considering it unmodified which was just an outright bug. The HEAD SHA of the submodule matches the SHA in the parent repo index, and since the SHAs matches, the diff code was overwriting the actual status with UNMODIFIED. These fixes broke existing tests test_diff_workdir__submodules and test_status_ignore__subdirectories but looking it over, I actually think the new results are correct and the old results were wrong. @nulltoken had actually commented on the subdirectory ignore issue previously. I also included in the tests some debugging versions of the shared iteration callback routines that print status or diff information. These aren't used actively in the tests, but can be quickly swapped in to test code to give a better picture of what is being scanned in some of the complex test scenarios.

37ee70fa

2013-03-25T22:19:39

Implement GIT_STATUS_OPT_EXCLUDE_SUBMODULES This option has been sitting unimplemented for a while, so I finally went through and implemented it along with some tests. As part of this, I improved the implementation of GIT_DIFF_IGNORE_SUBMODULES so it be more diligent about avoiding extra work and about leaving off delta records for submodules to the greatest extent possible (though it may include them still if you are request TYPECHANGE records).

d2a4a54b

2013-03-25T21:46:51

Merge pull request #1438 from ethomson/checkout_stat don't stat until the file is written

d828f118

2013-03-25T18:16:02

don't stat until the file is written

0c289dd7

2013-03-25T16:40:16

Recursing into ignored dirs for diff and status This implements working versions of GIT_DIFF_RECURSE_IGNORED_DIRS and GIT_STATUS_OPT_RECURSE_IGNORED_DIRS along with some tests for the newly available behaviors. This is not turned on by default for status, but can be accessed via the options to the extended version of the command.

f2850f33

2013-03-25T15:30:37

Merge pull request #1437 from phkelley/redirect http: Support 302 Found (arrbee did most of the work)

35e0f3c6

2013-03-25T17:59:30

Refine the redirect check condition

2c7f7a66

2013-03-25T17:35:36

http: Support 302 Found (arrbee did most of the work)

3658e81e

2013-03-25T14:20:07

Move crlf conversion into buf_text This adds crlf/lf conversion functions into buf_text with more efficient implementations that bypass the high level buffer functions. They attempt to minimize the number of reallocations done and they directly write the buffer data as needed if they know that there is enough memory allocated to memcpy data. Tests are added for these new functions. The crlf.c code is updated to use the new functions. Removed the include of buf_text.h from filter.h and just include it more narrowly in the places that need it.

4a15ea86

2013-03-21T14:02:25

don't convert CRLF to CRCRLF

9733e80c

2013-03-22T10:44:45

Add has_cr_in_index check to CRLF filter This adds a check to the drop_crlf filter path to check it the file in the index already has a CR in it, in which case this will not drop the CRs from the workdir file contents. This uncovered a "bug" in `git_blob_create_fromworkdir` where the full path to the file was passed to look up the attributes instead of the relative path from the working directory root. This meant that the check in the index for a pre-existing entry of the same name was failing.

13640d1b

2013-03-25T21:39:11

oid: Do not parse OIDs longer than 40

1f107478

2013-03-25T13:26:50

Merge pull request #1428 from xavier-l/nul-terminated-oid Nul terminated oid

f5e28202

2013-03-25T13:38:43

opts: allow configuration of odb cache size Currently, the odb cache has a fixed size of 128 slots as defined by GIT_DEFAULT_CACHE_SIZE. Allow users to set the size of the cache via git_libgit2_opts(). Fixes #1035.

33a59401

2013-03-22T20:22:39

graph: make the ahead-behind docs clearer Explain it in local-upstream branch terms so it's easier to grasp than with the `one` and `two` naming from the merge-base code.

1e7b7523

2013-03-21T12:30:08

git_oid_fromstrn already sets a maximum on the length of the string

0c8efb38

2013-03-21T11:59:01

Added an oid function that accepts nul-terminated strings

cd01dd5d

2013-03-19T15:43:34

Fix dumb mistake in the comparison function

bef2a12c

2013-03-19T15:35:26

Convert enqueue_object to a function

799f9a04

2013-03-19T14:56:45

Reduce the number of unnecessary objects in pushed packs

65025cb8

2013-03-18T17:24:13

Three submodule status bug fixes 1. Fix sort order problem with submodules where "mod" was sorting after "mod-plus" because they were being sorted as "mod/" and "mod-plus/". This involved pushing the "contains a .git entry" test significantly lower in the stack. 2. Reinstate behavior that a directory which contains a .git entry will be treated as a submodule during iteration even if it is not yet added to the .gitmodules. 3. Now that any directory containing .git is reported as submodule, we have to be more careful checking for GIT_EEXISTS when we do a submodule lookup, because that is the error code that is returned by git_submodule_lookup when you try to look up a directory containing .git that has no record in gitmodules or the index.

5b27bf7e

2013-03-18T16:17:14

Merge pull request #1417 from arrbee/opts-for-paths Implement opts interface for global/system file search paths

32460251

2013-03-18T15:54:35

Fixes and cleanups Get rid of some dead code, tighten things up a bit, and fix a bug with core::env test.

41954a49

2013-03-18T14:19:35

Switch search paths to classic delimited strings This switches the APIs for setting and getting the global/system search paths from using git_strarray to using a simple string with GIT_PATH_LIST_SEPARATOR delimited paths, just as the environment PATH variable would contain. This makes it simpler to get and set the value. I also added code to expand "$PATH" when setting a new value to embed the old value of the path. This means that I no longer require separate actions to PREPEND to the value.

50eb8520

2013-03-18T14:05:31

Merge pull request #1420 from KindDragon/static-code-analyzer-warnings Several warnings detected by static code analyzer fixed

677dce8a

2013-03-18T14:00:09

Merge pull request #1080 from carlosmn/config-set-null Failing config related test

10c06114

2013-03-17T04:46:46

Several warnings detected by static code analyzer fixed Implicit type conversion argument of function to size_t type Suspicious sequence of types castings: size_t -> int -> size_t Consider reviewing the expression of the 'A = B == C' kind. The expression is calculated as following: 'A = (B == C)' Unsigned type is never < 0

5540d947

2013-03-15T16:39:00

Implement global/system file search paths The goal of this work is to expose the search logic for "global", "system", and "xdg" files through the git_libgit2_opts() interface. Behind the scenes, I changed the logic for finding files to have a notion of a git_strarray that represents a search path and to store a separate search path for each of the three tiers of config file. For each tier, I implemented a function to initialize it to default values (generally based on environment variables), and then general interfaces to get it, set it, reset it, and prepend new directories to it. Next, I exposed these interfaces through the git_libgit2_opts interface, reusing the GIT_CONFIG_LEVEL_SYSTEM, etc., constants for the user to control which search path they were modifying. There are alternative designs for the opts interface / argument ordering, so I'm putting this phase out for discussion. Additionally, I ended up doing a little bit of clean up regarding attr.h and attr_file.h, adding a new attrcache.h so the other two files wouldn't have to be included in so many places.

a5f61384

2013-03-15T12:24:20

odb_pack: Unused functions

f16fb099

2013-03-15T12:11:02

pool: Internal struct name

5b229e20

2013-03-15T04:06:31

Merge pull request #1413 from arrbee/more-iterator-refactor Further tree_iterator refactoring

55e0f53d

2013-03-14T15:09:29

Fix various build warnings This fixes various build warnings on Mac and Windows (64-bit).

14bedad9

2013-03-14T15:08:04

Added pool freelist struct for readability This adds a git_pool_freelist_item struct that makes it a little easier to follow what's going on with the pool free list block management code. It is functionally neutral.

d85296ab

2013-03-14T13:50:54

Fix valgrind issues (and mmap fallback for diff) This fixes a number of issues identified by valgrind - mostly missed free calls. Inside valgrind, mmap() may fail which causes some of the diff tests to fail. This adds a fallback code path to diff_output.c:get_workdir_content() where is the mmap() fails the code will now try to read the file data directly into allocated memory (which is what it would do if the data needed to be filtered anyhow).

0c468633

2013-03-14T13:40:15

Improved tree iterator internals This updates the tree iterator internals to be more efficient. The tree_iterator_entry objects are now kept as pointers that are allocated from a git_pool, so that we may use git__tsort_r for sorting (which is better than qsort, given that the tree is likely mostly ordered already). Those tree_iterator_entry objects now keep direct pointers to the data they refer to instead of keeping indirect index values. This simplifies a lot of the data structure traversal code. This also adds bsearch to find the start item position for range- limited tree iterators, and is more explicit about using git_path_cmp instead of reimplementing it. The git_path_cmp changed a bit to make it easier for tree_iterators to use it (but it was barely being used previously, so not a big deal). This adds a git_pool_free_array function that efficiently frees a list of pool allocated pointers (which the tree_iterator keeps). Also, added new tests for the git_pool free list functionality that was not previously being tested (or used).

bbb13646

2013-03-13T14:59:51

Fix workdir iterator bugs This fixes two bugs with the workdir iterator depth check: first that the depth was not being decremented and second that empty directories were counting against the depth even though a frame was not being created for them. This also fixes a bug with the ENOTFOUND return code for workdir iterators when you attempt to advance_into an empty directory. Actually, that works correctly, but it was incorrectly being propogated into regular advance() calls in some circumstances. Added new tests for the above that create a huge hierarchy on the fly and try using the workdir iterator to traverse it.

ad003763

2013-03-12T20:36:35

MSVC: What could possibly be the size of a void*?

f5898324

2013-03-12T15:31:14

Style: Reverse lhs and rhs of == comparisons

b8c32580

2013-03-12T15:19:32

Advertise and support side-band-64k when calling receive-pack

1ac10aae

2013-03-12T09:23:53

Merge pull request #1408 from arrbee/refactor-iterators Refactor iterators

62beacd3

2013-03-11T16:43:58

Sorting function cleanup and MinGW fix Clean up some sorting function stuff including fixing qsort_r on MinGW, common function pointer type for comparison, and basic insertion sort implementation (which we, regrettably, fall back on for MinGW).

b70bf922

2013-03-11T14:35:49

Merge pull request #1406 from cpthamilton/local_push Implemented push on the local transport

20858f6e

2013-02-19T06:22:58

Implemented push on the local transport

a5eea2d7

2013-03-11T11:31:50

Stabilize order for equiv tree iterator entries Given a group of case-insensitively equivalent tree iterator entries, this ensures that the case-sensitively first trees will be used as the representative items. I.e. if you have conflicting entries "A/B/x", "a/b/x", and "A/b/x", this change ensures that the earliest entry "A/B/x" will be returned. The actual choice is not that important, but it is nice to have it stable and to have it been either the first or last item, as opposed to a random item from within the equivalent span.

aa408cbf

2013-03-11T11:18:00

handle small files in similarity metrics

aec4f663

2013-03-11T10:37:12

Fix tree iterator advance using wrong name compare Tree iterator advance was moving forward without taking the filemode of the entries into account, equating "a" and "a/". This makes the tree entry comparison code more easily reusable and fixes the problem.

thodg/libgit2/src

src

Log