Jiri Pospisil 
							
						 
					 
					
						
						
						
						
							
						
						
							eb46fb2ba9 
							
						 
					 
					
						
						
							
							Add failing test for git_object_short_id  
						
						
						
					 
					
						2014-03-10 11:35:14 -07:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							8949907887 
							
						 
					 
					
						
						
							
							Fix a number of git_odb_exists_prefix bugs  
						
						... 
						
						
						
						The git_odb_exists_prefix API was not dealing correctly when a
later backend returned GIT_ENOTFOUND even if an earlier backend
had found the object.
Additionally, the unit tests were not properly exercising the API
and had a couple mistakes in checking the results.
Lastly, since the backends are not expected to behavior correctly
unless all bytes of the short id are zero except for the prefix,
this makes the ODB prefix APIs explicitly clear out the extra
bytes so the user doesn't have to be as careful. 
						
					 
					
						2014-03-10 11:34:50 -07:00 
						 
				 
			
				
					
						
							
							
								Edward Thomson 
							
						 
					 
					
						
						
						
						
							
						
						
							dd954a3735 
							
						 
					 
					
						
						
							
							Update clar to e1990d6  
						
						
						
					 
					
						2014-03-07 10:53:00 -08:00 
						 
				 
			
				
					
						
							
							
								Vicent Marti 
							
						 
					 
					
						
						
						
						
							
						
						
							041cd4a23f 
							
						 
					 
					
						
						
							
							Merge pull request  #2028  from libgit2/options-names  
						
						... 
						
						
						
						Rename options structures 
						
					 
					
						2014-03-07 19:02:58 +01:00 
						 
				 
			
				
					
						
							
							
								Carlos Martín Nieto 
							
						 
					 
					
						
						
						
						
							
						
						
							ae32c54e58 
							
						 
					 
					
						
						
							
							Plug a few leaks in the tests  
						
						
						
					 
					
						2014-03-07 16:03:15 +01:00 
						 
				 
			
				
					
						
							
							
								Edward Thomson 
							
						 
					 
					
						
						
						
						
							
						
						
							806571f352 
							
						 
					 
					
						
						
							
							Update clar to a0b00f0  
						
						
						
					 
					
						2014-03-07 00:28:18 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							aa17c3c63c 
							
						 
					 
					
						
						
							
							git_revert_opts -> git_revert_options  
						
						
						
					 
					
						2014-03-06 09:44:52 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							6affd71f33 
							
						 
					 
					
						
						
							
							git_checkout_opts -> git_checkout_options  
						
						
						
					 
					
						2014-03-06 09:44:51 -08:00 
						 
				 
			
				
					
						
							
							
								Carlos Martín Nieto 
							
						 
					 
					
						
						
						
						
							
						
						
							8e52472037 
							
						 
					 
					
						
						
							
							tests: MSVC compat  
						
						... 
						
						
						
						MSVC doesn't like declaring variables in the middle of a block, so make
sure we only declare variables at the beginning of a block. 
						
					 
					
						2014-03-06 16:56:46 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Bowen 
							
						 
					 
					
						
						
						
						
							
						
						
							b9f819978c 
							
						 
					 
					
						
						
							
							Added function-based initializers for every options struct.  
						
						... 
						
						
						
						The basic structure of each function is courtesy of arrbee. 
						
					 
					
						2014-03-05 21:49:23 -05:00 
						 
				 
			
				
					
						
							
							
								Vicent Marti 
							
						 
					 
					
						
						
						
						
							
						
						
							a064dc2d0b 
							
						 
					 
					
						
						
							
							Merge pull request  #2159  from libgit2/rb/odb-exists-prefix  
						
						... 
						
						
						
						Add ODB API to check for existence by prefix and object id shortener 
						
					 
					
						2014-03-06 00:47:05 +01:00 
						 
				 
			
				
					
						
							
							
								Vicent Marti 
							
						 
					 
					
						
						
						
						
							
						
						
							967d3f2e3e 
							
						 
					 
					
						
						
							
							Merge pull request  #2163  from ethomson/nobackend_odb_write  
						
						... 
						
						
						
						ODB writing fails gracefully when unsupported 
						
					 
					
						2014-03-05 21:06:59 +01:00 
						 
				 
			
				
					
						
							
							
								Edward Thomson 
							
						 
					 
					
						
						
						
						
							
						
						
							7bd2f40154 
							
						 
					 
					
						
						
							
							ODB writing fails gracefully when unsupported  
						
						... 
						
						
						
						If no ODB backends support writing, we should fail gracefully. 
						
					 
					
						2014-03-05 11:35:47 -08:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							13f7ecd7b9 
							
						 
					 
					
						
						
							
							Add git_object_short_id API to get short id string  
						
						... 
						
						
						
						This finds a short id string that will unambiguously select the
given object, starting with the core.abbrev length (usually 7)
and growing until it is no longer ambiguous. 
						
					 
					
						2014-03-04 16:23:28 -08:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							f5753999e4 
							
						 
					 
					
						
						
							
							Add exists_prefix to ODB backend and ODB API  
						
						
						
					 
					
						2014-03-04 15:34:23 -08:00 
						 
				 
			
				
					
						
							
							
								Jacques Germishuys 
							
						 
					 
					
						
						
						
						
							
						
						
							4636ca9391 
							
						 
					 
					
						
						
							
							Remove ignored files from the working directory if they were stashed  
						
						
						
					 
					
						2014-03-04 12:22:27 +02:00 
						 
				 
			
				
					
						
							
							
								Matthias Bartelmeß 
							
						 
					 
					
						
						
						
						
							
						
						
							d113791d8f 
							
						 
					 
					
						
						
							
							Added a test, that fails for  #2133  
						
						
						
					 
					
						2014-03-03 16:10:29 +01:00 
						 
				 
			
				
					
						
							
							
								Vicent Marti 
							
						 
					 
					
						
						
						
						
							
						
						
							ebb3c506fd 
							
						 
					 
					
						
						
							
							features: Rename _HAS_ to _FEATURE_  
						
						
						
					 
					
						2014-03-03 12:40:25 +01:00 
						 
				 
			
				
					
						
							
							
								Vicent Marti 
							
						 
					 
					
						
						
						
						
							
						
						
							c9f5298b0e 
							
						 
					 
					
						
						
							
							caps: Rename to features to avoid confusion  
						
						
						
					 
					
						2014-03-03 12:10:36 +01:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							494be429ad 
							
						 
					 
					
						
						
							
							Merge pull request  #2144  from linquize/branch-f-current  
						
						... 
						
						
						
						Do not allow git_branch_create() to force update branch 
						
					 
					
						2014-03-02 09:00:00 -06:00 
						 
				 
			
				
					
						
							
							
								Linquize 
							
						 
					 
					
						
						
						
						
							
						
						
							1d08b72e4f 
							
						 
					 
					
						
						
							
							Add unit test to show git_branch_create() fails if attempt to force create current branch  
						
						
						
					 
					
						2014-03-02 19:14:20 +08:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							6789b7a75d 
							
						 
					 
					
						
						
							
							Add buffer to buffer diff and patch APIs  
						
						... 
						
						
						
						This adds `git_diff_buffers` and `git_patch_from_buffers`.  This
also includes a bunch of internal refactoring to increase the
shared code between these functions and the blob-to-blob and
blob-to-buffer APIs, as well as some higher level assert helpers
in the tests to also remove redundancy. 
						
					 
					
						2014-02-27 14:13:22 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							1574d3884f 
							
						 
					 
					
						
						
							
							Merge pull request  #2137  from jru/blame-first-parent  
						
						... 
						
						
						
						Blame first-parent history 
						
					 
					
						2014-02-26 16:58:20 -05:00 
						 
				 
			
				
					
						
							
							
								Juan Rubén 
							
						 
					 
					
						
						
						
						
							
						
						
							0276f0f55b 
							
						 
					 
					
						
						
							
							Reset num_parents to 1 only for merge commits  
						
						... 
						
						
						
						Also, correct test case to account for the boundary flag 
						
					 
					
						2014-02-26 19:25:07 +01:00 
						 
				 
			
				
					
						
							
							
								Edward Thomson 
							
						 
					 
					
						
						
						
						
							
						
						
							83634d38be 
							
						 
					 
					
						
						
							
							Move system directory cache out of utils  
						
						
						
					 
					
						2014-02-24 17:52:38 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							0d8265c8af 
							
						 
					 
					
						
						
							
							Staticize file-local variables  
						
						
						
					 
					
						2014-02-24 05:32:05 -08:00 
						 
				 
			
				
					
						
							
							
								Juan Rubén 
							
						 
					 
					
						
						
						
						
							
						
						
							9e3b901aeb 
							
						 
					 
					
						
						
							
							Add unit test  
						
						
						
					 
					
						2014-02-24 00:09:29 +01:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							72556cc63b 
							
						 
					 
					
						
						
							
							Address PR comments  
						
						... 
						
						
						
						* Make GIT_INLINE an internal definition so it cannot be used in
  public headers
* Fix language in CONTRIBUTING
* Make index caps API use signed instead of unsigned values 
						
					 
					
						2014-02-20 14:27:10 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							9bda5fb8c1 
							
						 
					 
					
						
						
							
							Improve error propagation in shallow call  
						
						
						
					 
					
						2014-02-18 14:05:30 -08:00 
						 
				 
			
				
					
						
							
							
								Edward Thomson 
							
						 
					 
					
						
						
						
						
							
						
						
							2a528bc088 
							
						 
					 
					
						
						
							
							Fix filter test for CRLF->LF issues  
						
						
						
					 
					
						2014-02-11 19:05:52 -06:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							5d195cf76b 
							
						 
					 
					
						
						
							
							Merge pull request  #2110  from libgit2/ed/crlf_input  
						
						... 
						
						
						
						Handle `core.autocrlf=input` when checking out 
						
					 
					
						2014-02-11 15:56:04 -08:00 
						 
				 
			
				
					
						
							
							
								Carlos Martín Nieto 
							
						 
					 
					
						
						
						
						
							
						
						
							15284a2c5a 
							
						 
					 
					
						
						
							
							refs: move current_id before the reflog parameters  
						
						... 
						
						
						
						Keep the reflog parameters as the last two, as they're the optional
parameters. 
						
					 
					
						2014-02-10 14:52:28 +01:00 
						 
				 
			
				
					
						
							
							
								Edward Thomson 
							
						 
					 
					
						
						
						
						
							
						
						
							9780020b18 
							
						 
					 
					
						
						
							
							Tests for crlf filtering into the repository  
						
						
						
					 
					
						2014-02-09 13:45:39 -08:00 
						 
				 
			
				
					
						
							
							
								Edward Thomson 
							
						 
					 
					
						
						
						
						
							
						
						
							f77127da12 
							
						 
					 
					
						
						
							
							Tests for core.autocrlf and .gitattributes  
						
						
						
					 
					
						2014-02-09 13:45:38 -08:00 
						 
				 
			
				
					
						
							
							
								Edward Thomson 
							
						 
					 
					
						
						
						
						
							
						
						
							fb6f4539d1 
							
						 
					 
					
						
						
							
							Close files on file diff failure  
						
						... 
						
						
						
						Not closing the files on a diff failure ensures that clar
cleanup will fail on win32 because we still have the file open. 
						
					 
					
						2014-02-09 13:45:36 -08:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							80c29fe93e 
							
						 
					 
					
						
						
							
							Add git_commit_amend API  
						
						... 
						
						
						
						This adds an API to amend an existing commit, basically a shorthand
for creating a new commit filling in missing parameters from the
values of an existing commit.  As part of this, I also added a new
"sys" API to create a commit using a callback to get the parents.
This allowed me to rewrite all the other commit creation APIs so
that temporary allocations are no longer needed. 
						
					 
					
						2014-02-07 16:17:59 -08:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							2d9291943c 
							
						 
					 
					
						
						
							
							Merge pull request  #2099  from libgit2/bs/more-reflog-stuff  
						
						... 
						
						
						
						More reflogness 
						
					 
					
						2014-02-07 16:14:17 -08:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							57c47af107 
							
						 
					 
					
						
						
							
							Merge pull request  #2042  from libgit2/cmn/conditional-ref  
						
						... 
						
						
						
						refs: conditional ref updates 
						
					 
					
						2014-02-07 16:05:19 -08:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							3158e2febe 
							
						 
					 
					
						
						
							
							Fix some Windows warnings  
						
						... 
						
						
						
						This fixes a number of warnings with the Windows 64-bit build
including a test failure in test_repo_message__message where an
invalid pointer to a git_buf was being used. 
						
					 
					
						2014-02-07 15:43:37 -08:00 
						 
				 
			
				
					
						
							
							
								Vicent Marti 
							
						 
					 
					
						
						
						
						
							
						
						
							c4ee3b54f8 
							
						 
					 
					
						
						
							
							Merge pull request  #2100  from libgit2/rb/update-pqueue  
						
						... 
						
						
						
						Replace priority queue code with implementation from hashsig 
						
					 
					
						2014-02-07 18:32:06 +01:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							db55bb73ff 
							
						 
					 
					
						
						
							
							Correct default reflog message for git_remote_fetch  
						
						
						
					 
					
						2014-02-06 11:18:10 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							5dae3ffe25 
							
						 
					 
					
						
						
							
							Only run clone-failure test on private repo  
						
						
						
					 
					
						2014-02-05 19:27:27 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							78ee7e81f5 
							
						 
					 
					
						
						
							
							More merge.conflictstyle fixes  
						
						
						
					 
					
						2014-02-05 14:10:19 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							3094102f69 
							
						 
					 
					
						
						
							
							Avoid crash when skipping remote test  
						
						
						
					 
					
						2014-02-05 14:05:18 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							fe45922d77 
							
						 
					 
					
						
						
							
							Fix broken clone test  
						
						
						
					 
					
						2014-02-05 13:41:12 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							a2ce19ca68 
							
						 
					 
					
						
						
							
							Prevent user's merge.conflictstyle from breaking tests  
						
						
						
					 
					
						2014-02-05 13:35:26 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							5c8be32559 
							
						 
					 
					
						
						
							
							Fix a few references to changed function signatures  
						
						
						
					 
					
						2014-02-05 13:32:45 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							0de2c4e3a3 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'libgit2/development' into bs/more-reflog-stuff  
						
						
						
					 
					
						2014-02-05 13:15:57 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							629ba7f105 
							
						 
					 
					
						
						
							
							Merge pull request  #2027  from libgit2/rb/only-windows-is-windows  
						
						... 
						
						
						
						Some tests of paths that can't actually be written to disk 
						
					 
					
						2014-02-05 13:07:46 -08:00 
						 
				 
			
				
					
						
							
							
								Carlos Martín Nieto 
							
						 
					 
					
						
						
						
						
							
						
						
							d18209eef9 
							
						 
					 
					
						
						
							
							revwalk: add a test for pushing all references  
						
						... 
						
						
						
						This used to be broken, let's make sure we don't break this use-case. 
						
					 
					
						2014-02-05 12:16:44 +01:00 
						 
				 
			
				
					
						
							
							
								Carlos Martín Nieto 
							
						 
					 
					
						
						
						
						
							
						
						
							d465e4e980 
							
						 
					 
					
						
						
							
							revwalk: ignore wrong object type in glob pushes  
						
						... 
						
						
						
						Pushing a whole namespace can cause us to attempt to push non-committish
objects. Catch this situation and special-case it for ignoring this. 
						
					 
					
						2014-02-05 12:16:44 +01:00 
						 
				 
			
				
					
						
							
							
								Carlos Martín Nieto 
							
						 
					 
					
						
						
						
						
							
						
						
							b4ef67d5eb 
							
						 
					 
					
						
						
							
							revwalk: add a failing test for pushing "tags"  
						
						... 
						
						
						
						This shows that pusing a whole namespace can be problematic. 
						
					 
					
						2014-02-05 12:16:37 +01:00 
						 
				 
			
				
					
						
							
							
								Carlos Martín Nieto 
							
						 
					 
					
						
						
						
						
							
						
						
							5367ec4b84 
							
						 
					 
					
						
						
							
							refs: add an unconditional delete  
						
						... 
						
						
						
						Add it under the git_reference_remove() name, letting the user pass the
repo and name, analogous to unconditional setting/creation. 
						
					 
					
						2014-02-05 12:07:57 +01:00 
						 
				 
			
				
					
						
							
							
								Carlos Martín Nieto 
							
						 
					 
					
						
						
						
						
							
						
						
							b7ae71ecf2 
							
						 
					 
					
						
						
							
							refs: catch cases where the ref type has changed  
						
						... 
						
						
						
						If the type of the on-disk reference has changed, the old value
comparison should fail. 
						
					 
					
						2014-02-05 12:07:57 +01:00 
						 
				 
			
				
					
						
							
							
								Carlos Martín Nieto 
							
						 
					 
					
						
						
						
						
							
						
						
							f44fd59ed7 
							
						 
					 
					
						
						
							
							refs: check the ref's old value when deleting  
						
						... 
						
						
						
						Recognize when the reference has changed since we loaded it. 
						
					 
					
						2014-02-05 12:07:57 +01:00 
						 
				 
			
				
					
						
							
							
								Carlos Martín Nieto 
							
						 
					 
					
						
						
						
						
							
						
						
							878fb66f57 
							
						 
					 
					
						
						
							
							refs: bring conditional symbolic updates to the frontend  
						
						... 
						
						
						
						Bring the race detection goodness to symbolic references as well. 
						
					 
					
						2014-02-05 12:07:57 +01:00 
						 
				 
			
				
					
						
							
							
								Carlos Martín Nieto 
							
						 
					 
					
						
						
						
						
							
						
						
							d6236cf662 
							
						 
					 
					
						
						
							
							refs: add tests for conditional updates  
						
						
						
					 
					
						2014-02-05 12:07:56 +01:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							010cec3ac2 
							
						 
					 
					
						
						
							
							Add reflog params to git_repository_detach_head  
						
						
						
					 
					
						2014-02-04 20:50:40 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							c3ab1e5af4 
							
						 
					 
					
						
						
							
							Add reflog parameters to remote apis  
						
						... 
						
						
						
						Also added a test for git_remote_fetch. 
						
					 
					
						2014-02-04 20:38:13 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							491cecfe8c 
							
						 
					 
					
						
						
							
							Add reflog parameters to git_push_update_tips  
						
						
						
					 
					
						2014-02-04 20:27:44 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							0adb06065b 
							
						 
					 
					
						
						
							
							Fix reflog message when creating commits  
						
						
						
					 
					
						2014-02-04 15:32:57 -08:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							43709ca878 
							
						 
					 
					
						
						
							
							Fix typo setting sorted flag when reloading index  
						
						... 
						
						
						
						This fixes a typo I made for setting the sorted flag on the index
after a reload.  That typo didn't actually cause any test failures
so I'm also adding a test that explicitly checks that the index is
correctly sorted after a reload when ignoring case and when not. 
						
					 
					
						2014-02-04 10:33:30 -08:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							882c774271 
							
						 
					 
					
						
						
							
							Convert pqueue to just be a git_vector  
						
						... 
						
						
						
						This updates the git_pqueue to simply be a set of specialized
init/insert/pop functions on a git_vector.
To preserve the pqueue feature of having a fixed size heap, I
converted the "sorted" field in git_vectors to a more general
"flags" field so that pqueue could mix in it's own flag.  This
had a bunch of ramifications because a number of places were
directly looking at the vector "sorted" field - I added a couple
new git_vector helpers (is_sorted, set_sorted) so the specific
representation of this information could be abstracted. 
						
					 
					
						2014-02-04 10:01:37 -08:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							af4bc6615d 
							
						 
					 
					
						
						
							
							Add some priority queue tests  
						
						... 
						
						
						
						I forgot that I wrote some tests for the new priority queue code. 
						
					 
					
						2014-02-03 21:04:40 -08:00 
						 
				 
			
				
					
						
							
							
								Edward Thomson 
							
						 
					 
					
						
						
						
						
							
						
						
							bb13d39162 
							
						 
					 
					
						
						
							
							Test that emulates a strange filter implementation  
						
						
						
					 
					
						2014-02-03 19:56:34 -08:00 
						 
				 
			
				
					
						
							
							
								Edward Thomson 
							
						 
					 
					
						
						
						
						
							
						
						
							16eb8b7c06 
							
						 
					 
					
						
						
							
							Tests merging staged files identical to result  
						
						
						
					 
					
						2014-02-03 19:56:34 -08:00 
						 
				 
			
				
					
						
							
							
								Edward Thomson 
							
						 
					 
					
						
						
						
						
							
						
						
							b60149eced 
							
						 
					 
					
						
						
							
							Tests merge when changes exist in workdir/index  
						
						
						
					 
					
						2014-02-03 19:56:33 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							86746b4b3a 
							
						 
					 
					
						
						
							
							Add reset tests for reflog  
						
						
						
					 
					
						2014-02-03 15:06:47 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							eec2761f06 
							
						 
					 
					
						
						
							
							Fix warning  
						
						
						
					 
					
						2014-02-03 15:06:32 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							586be3b889 
							
						 
					 
					
						
						
							
							Add reflog parameters to git_reset  
						
						
						
					 
					
						2014-02-03 15:05:55 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							0d847a3159 
							
						 
					 
					
						
						
							
							Reset helpers: use revparse instead  
						
						
						
					 
					
						2014-02-03 14:08:40 -08:00 
						 
				 
			
				
					
						
							
							
								Vicent Marti 
							
						 
					 
					
						
						
						
						
							
						
						
							3b6a5bac20 
							
						 
					 
					
						
						
							
							Merge pull request  #2095  from libgit2/update-head-reflog  
						
						... 
						
						
						
						Correct "new" id for reattached-HEAD reflog entry 
						
					 
					
						2014-02-03 10:36:04 -08:00 
						 
				 
			
				
					
						
							
							
								Arthur Schreiber 
							
						 
					 
					
						
						
						
						
							
						
						
							50ad7cc208 
							
						 
					 
					
						
						
							
							Add git_reference_is_note.  
						
						
						
					 
					
						2014-02-02 18:20:38 +01:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							7ac1b89942 
							
						 
					 
					
						
						
							
							Add failing test case  
						
						
						
					 
					
						2014-02-01 11:46:15 -08:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							7be88b4c4d 
							
						 
					 
					
						
						
							
							Update to latest clar  
						
						
						
					 
					
						2014-01-31 13:44:09 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							db092c1955 
							
						 
					 
					
						
						
							
							Allow tests to run without user config  
						
						
						
					 
					
						2014-01-30 16:10:18 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							a1710a28f6 
							
						 
					 
					
						
						
							
							Enhance testing of signature parameters  
						
						
						
					 
					
						2014-01-30 15:53:52 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							59bb1126e0 
							
						 
					 
					
						
						
							
							Provide good default reflog messages in branch api  
						
						
						
					 
					
						2014-01-30 15:53:52 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							e871d89b28 
							
						 
					 
					
						
						
							
							Ensure moving a branch updates the reflog  
						
						
						
					 
					
						2014-01-30 15:52:14 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							ccf6ce5c89 
							
						 
					 
					
						
						
							
							Ensure renaming a reference updates the reflog  
						
						
						
					 
					
						2014-01-30 15:52:13 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							540c1809f4 
							
						 
					 
					
						
						
							
							Add reflog parameters to git_branch_move  
						
						
						
					 
					
						2014-01-30 15:52:13 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							48110f67e4 
							
						 
					 
					
						
						
							
							Deleting a branch deletes its reflog  
						
						
						
					 
					
						2014-01-30 15:52:13 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							1cc974ab62 
							
						 
					 
					
						
						
							
							Augment clone API with reflog parameters  
						
						
						
					 
					
						2014-01-30 15:52:13 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							b31ebfbc66 
							
						 
					 
					
						
						
							
							Add reflog params to git_branch_create  
						
						
						
					 
					
						2014-01-30 15:52:13 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							67c4716f74 
							
						 
					 
					
						
						
							
							Add passing reflog tests  
						
						
						
					 
					
						2014-01-30 15:51:00 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							2952a9d0f4 
							
						 
					 
					
						
						
							
							Ensure creating HEAD creates its reflog  
						
						
						
					 
					
						2014-01-30 15:51:00 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							a2311f92c2 
							
						 
					 
					
						
						
							
							Ensure updating HEAD updates reflog  
						
						
						
					 
					
						2014-01-30 15:51:00 -08:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							94f263f59b 
							
						 
					 
					
						
						
							
							Add reflog params to set-head calls  
						
						
						
					 
					
						2014-01-30 15:51:00 -08:00 
						 
				 
			
				
					
						
							
							
								Vicent Marti 
							
						 
					 
					
						
						
						
						
							
						
						
							8646b0a068 
							
						 
					 
					
						
						
							
							Merge pull request  #2085  from libgit2/rb/index-tree-blob-collision  
						
						... 
						
						
						
						Index tree-bob collision 
						
					 
					
						2014-01-30 15:10:39 -08:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							8606f33bea 
							
						 
					 
					
						
						
							
							Expand zstream tests and fix off-by-one error  
						
						
						
					 
					
						2014-01-30 10:00:00 -08:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							d9b04d78a3 
							
						 
					 
					
						
						
							
							Reorganize zstream API and fix wrap problems  
						
						... 
						
						
						
						There were some confusing issues mixing up the number of bytes
written to the zstream output buffer with the number of bytes
consumed from the zstream input.  This reorganizes the zstream
API and makes it easier to deflate an arbitrarily large input
while still using a fixed size output. 
						
					 
					
						2014-01-30 09:59:59 -08:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							3cf11eef17 
							
						 
					 
					
						
						
							
							Misc cleanups  
						
						
						
					 
					
						2014-01-30 09:59:59 -08:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							c0644c3fbb 
							
						 
					 
					
						
						
							
							Make submodule fetchRecurse match other options  
						
						... 
						
						
						
						This removes the fetchRecurse compiler warnings and makes the
behavior match the other submodule options (i.e. the in-memory
setting can be reset to the on-disk value). 
						
					 
					
						2014-01-30 09:59:59 -08:00 
						 
				 
			
				
					
						
							
							
								Edward Thomson 
							
						 
					 
					
						
						
						
						
							
						
						
							bae8bea051 
							
						 
					 
					
						
						
							
							More index collision tests  
						
						
						
					 
					
						2014-01-29 13:15:53 -08:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							95fbedcd8e 
							
						 
					 
					
						
						
							
							Add test for blob/tree name collisions in index  
						
						
						
					 
					
						2014-01-29 13:15:50 -08:00 
						 
				 
			
				
					
						
							
							
								Edward Thomson 
							
						 
					 
					
						
						
						
						
							
						
						
							96f12e709b 
							
						 
					 
					
						
						
							
							Don't strcmp a git_buf, strcmp its char *  
						
						
						
					 
					
						2014-01-29 12:50:42 -08:00 
						 
				 
			
				
					
						
							
							
								Arthur Schreiber 
							
						 
					 
					
						
						
						
						
							
						
						
							e7c16943f4 
							
						 
					 
					
						
						
							
							Add git_graph_descendant_of.  
						
						
						
					 
					
						2014-01-28 19:39:14 +01:00 
						 
				 
			
				
					
						
							
							
								Vicent Marti 
							
						 
					 
					
						
						
						
						
							
						
						
							a1a9d0bd48 
							
						 
					 
					
						
						
							
							Merge pull request  #2066  from libgit2/rb/builtin-diff-drivers  
						
						... 
						
						
						
						Add built in diff drivers 
						
					 
					
						2014-01-27 15:35:39 -08:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							daebb59869 
							
						 
					 
					
						
						
							
							Add PHP tests and fix bug in PHP builtin driver  
						
						
						
					 
					
						2014-01-27 14:57:03 -08:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							082e82dba5 
							
						 
					 
					
						
						
							
							Update Javascript userdiff driver and tests  
						
						... 
						
						
						
						Writing a sample Javascript driver pointed out some extra
whitespace handling that needed to be done in the diff driver.
This adds some tests with some sample javascript code that I
pulled off of GitHub just to see what would happen.  Also, to
clean up the userdiff test data, I did a "git gc" and packed
up the test objects. 
						
					 
					
						2014-01-27 11:45:06 -08:00 
						 
				 
			
				
					
						
							
							
								Vicent Marti 
							
						 
					 
					
						
						
						
						
							
						
						
							93954245e0 
							
						 
					 
					
						
						
							
							Merge pull request  #2075  from libgit2/cmn/leftover-oid  
						
						... 
						
						
						
						Leftover OID -> ID changes 
						
					 
					
						2014-01-27 09:39:36 -08:00 
						 
				 
			
				
					
						
							
							
								Vicent Marti 
							
						 
					 
					
						
						
						
						
							
						
						
							46e7fc1853 
							
						 
					 
					
						
						
							
							Merge pull request  #2077  from libgit2/cmn/buf-out  
						
						... 
						
						
						
						Buff up returning strings 
						
					 
					
						2014-01-27 09:36:24 -08:00 
						 
				 
			
				
					
						
							
							
								Carlos Martín Nieto 
							
						 
					 
					
						
						
						
						
							
						
						
							66d585c6b3 
							
						 
					 
					
						
						
							
							MSVC doesn't like modern code  
						
						
						
					 
					
						2014-01-27 04:58:23 +01:00 
						 
				 
			
				
					
						
							
							
								Carlos Martín Nieto 
							
						 
					 
					
						
						
						
						
							
						
						
							bf522e0811 
							
						 
					 
					
						
						
							
							refspec: move to git_buf for outputting strings  
						
						
						
					 
					
						2014-01-27 04:44:06 +01:00 
						 
				 
			
				
					
						
							
							
								Carlos Martín Nieto 
							
						 
					 
					
						
						
						
						
							
						
						
							e1d7f0035e 
							
						 
					 
					
						
						
							
							messsage: use git_buf in prettify()  
						
						... 
						
						
						
						A lot of the tests were checking for overflow, which we don't have
anymore, so we can remove them. 
						
					 
					
						2014-01-27 04:44:06 +01:00 
						 
				 
			
				
					
						
							
							
								Carlos Martín Nieto 
							
						 
					 
					
						
						
						
						
							
						
						
							b25d87c9cd 
							
						 
					 
					
						
						
							
							branch: move to git_buf when outputting newly-allocated strings  
						
						... 
						
						
						
						Internally we already did everything with git_bufs, so this is just
exposing those functions with public names. 
						
					 
					
						2014-01-27 04:44:05 +01:00 
						 
				 
			
				
					
						
							
							
								Carlos Martín Nieto 
							
						 
					 
					
						
						
						
						
							
						
						
							7a3bd1e732 
							
						 
					 
					
						
						
							
							repository: move to use a git_buf for outputting strings  
						
						... 
						
						
						
						Since we now export that type, we can avoid making the user guess a
size. 
						
					 
					
						2014-01-27 04:44:05 +01:00 
						 
				 
			
				
					
						
							
							
								Arthur Schreiber 
							
						 
					 
					
						
						
						
						
							
						
						
							991b2840eb 
							
						 
					 
					
						
						
							
							Make sure git_remote_dup copies a remote's refspecs correctly.  
						
						
						
					 
					
						2014-01-26 19:35:02 +01:00 
						 
				 
			
				
					
						
							
							
								Edward Thomson 
							
						 
					 
					
						
						
						
						
							
						
						
							58582cd0b0 
							
						 
					 
					
						
						
							
							Merge pull request  #2057  from GrahamDennis/local-file-url-push-fix  
						
						... 
						
						
						
						Fix local push to file:// URL. 
						
					 
					
						2014-01-26 06:31:38 -08:00 
						 
				 
			
				
					
						
							
							
								Carlos Martín Nieto 
							
						 
					 
					
						
						
						
						
							
						
						
							a1bbc0ce20 
							
						 
					 
					
						
						
							
							merge: rename _oid() -> id()  
						
						... 
						
						
						
						Following the rest of the series, use 'id' when refering to the value. 
						
					 
					
						2014-01-25 08:15:44 +01:00 
						 
				 
			
				
					
						
							
							
								Carlos Martín Nieto 
							
						 
					 
					
						
						
						
						
							
						
						
							9950bb4e8d 
							
						 
					 
					
						
						
							
							diff: rename the file's 'oid' to 'id'  
						
						... 
						
						
						
						In the same vein as the previous commits in this series. 
						
					 
					
						2014-01-25 08:15:44 +01:00 
						 
				 
			
				
					
						
							
							
								Carlos Martín Nieto 
							
						 
					 
					
						
						
						
						
							
						
						
							d541170c77 
							
						 
					 
					
						
						
							
							index: rename an entry's id to 'id'  
						
						... 
						
						
						
						This was not converted when we converted the rest, so do it now. 
						
					 
					
						2014-01-25 08:15:44 +01:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							027b8edac7 
							
						 
					 
					
						
						
							
							Move userdiff tests to be data driven  
						
						... 
						
						
						
						This moves the expected and actual test data along with the source
data for the userdiff tests into the tests/resources/userdiff test
repo and updates the test to use that. 
						
					 
					
						2014-01-24 15:45:49 -08:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							5d82c0df13 
							
						 
					 
					
						
						
							
							Update all tests for new pattern extraction  
						
						
						
					 
					
						2014-01-24 10:54:05 -08:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							b8e86c62f7 
							
						 
					 
					
						
						
							
							Implement matched pattern extract for fn headers  
						
						
						
					 
					
						2014-01-24 10:54:05 -08:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							9bbc53d6d4 
							
						 
					 
					
						
						
							
							Fix filemode updating in diff text  
						
						
						
					 
					
						2014-01-24 10:54:05 -08:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							2c65602e45 
							
						 
					 
					
						
						
							
							Import git drivers and test HTML driver  
						
						... 
						
						
						
						Reorganize the builtin driver table slightly so that core Git
builtin definitions can be imported verbatim.  Then take a few of
the core Git drivers and pull them in.
This also creates a test of diffs with the builtin HTML driver
which led to some small error handling fixes in the driver
selection logic. 
						
					 
					
						2014-01-24 10:51:08 -08:00 
						 
				 
			
				
					
						
							
							
								Carlos Martín Nieto 
							
						 
					 
					
						
						
						
						
							
						
						
							d0a3de720e 
							
						 
					 
					
						
						
							
							note: rename the id getter to git_note_id()  
						
						... 
						
						
						
						This was left over when we did the general switch. 
						
					 
					
						2014-01-24 11:18:51 +01:00 
						 
				 
			
				
					
						
							
							
								Vicent Marti 
							
						 
					 
					
						
						
						
						
							
						
						
							ac8949edb2 
							
						 
					 
					
						
						
							
							Merge pull request  #2073  from ethomson/zerobytes  
						
						... 
						
						
						
						Sometimes a zero byte file is just a zero byte file 
						
					 
					
						2014-01-22 15:41:25 -08:00 
						 
				 
			
				
					
						
							
							
								Edward Thomson 
							
						 
					 
					
						
						
						
						
							
						
						
							410a8e6fed 
							
						 
					 
					
						
						
							
							Sometimes a zero byte file is just a zero byte file  
						
						... 
						
						
						
						Don't go to the ODB to resolve zero byte files in the workdir 
						
					 
					
						2014-01-22 18:31:25 -05:00 
						 
				 
			
				
					
						
							
							
								Edward Thomson 
							
						 
					 
					
						
						
						
						
							
						
						
							238e814972 
							
						 
					 
					
						
						
							
							Summarize empty messages  
						
						
						
					 
					
						2014-01-22 14:41:04 -05:00 
						 
				 
			
				
					
						
							
							
								Edward Thomson 
							
						 
					 
					
						
						
						
						
							
						
						
							e8b81c698c 
							
						 
					 
					
						
						
							
							Preserve tree filemode in index during checkout  
						
						... 
						
						
						
						Don't try to determine whether the system supports file modes
when putting the tree data in the index during checkout.  The tree's
mode is canonical and did not come from stat(2) in the first place. 
						
					 
					
						2014-01-22 13:26:30 -05:00 
						 
				 
			
				
					
						
							
							
								Nicolas Hake 
							
						 
					 
					
						
						
						
						
							
						
						
							c05cd7924d 
							
						 
					 
					
						
						
							
							Drop git_patch_to_str  
						
						... 
						
						
						
						It's hard or even impossible to correctly free the string buffer
allocated by git_patch_to_str in some circumstances. Drop the function
so people have to use git_patch_to_buf instead - git_buf has a dedicated
destructor. 
						
					 
					
						2014-01-22 17:51:32 +01:00 
						 
				 
			
				
					
						
							
							
								Edward Thomson 
							
						 
					 
					
						
						
						
						
							
						
						
							0ef19fe14c 
							
						 
					 
					
						
						
							
							Merge submodules  
						
						
						
					 
					
						2014-01-20 18:07:17 -05:00 
						 
				 
			
				
					
						
							
							
								Edward Thomson 
							
						 
					 
					
						
						
						
						
							
						
						
							db3462ce77 
							
						 
					 
					
						
						
							
							Support union merges  
						
						
						
					 
					
						2014-01-20 17:15:15 -05:00 
						 
				 
			
				
					
						
							
							
								Edward Thomson 
							
						 
					 
					
						
						
						
						
							
						
						
							0e1ba46cfb 
							
						 
					 
					
						
						
							
							Remove the "merge none" flag  
						
						... 
						
						
						
						The "merge none" (don't automerge) flag was only to aide in
merge trivial tests.  We can easily determine whether merge
trivial resulted in a trivial merge or an automerge by examining
the REUC after automerge has completed. 
						
					 
					
						2014-01-20 17:15:14 -05:00 
						 
				 
			
				
					
						
							
							
								Edward Thomson 
							
						 
					 
					
						
						
						
						
							
						
						
							6891a862bb 
							
						 
					 
					
						
						
							
							Load merge.conflictstyle setting from config  
						
						
						
					 
					
						2014-01-20 17:15:13 -05:00 
						 
				 
			
				
					
						
							
							
								Edward Thomson 
							
						 
					 
					
						
						
						
						
							
						
						
							e651e8e2b5 
							
						 
					 
					
						
						
							
							Introduce diff3 mode for checking out conflicts  
						
						
						
					 
					
						2014-01-20 17:15:13 -05:00 
						 
				 
			
				
					
						
							
							
								Edward Thomson 
							
						 
					 
					
						
						
						
						
							
						
						
							6b92c99bcb 
							
						 
					 
					
						
						
							
							Don't try to merge binary files  
						
						
						
					 
					
						2014-01-20 17:15:12 -05:00 
						 
				 
			
				
					
						
							
							
								Edward Thomson 
							
						 
					 
					
						
						
						
						
							
						
						
							c1d648c5c6 
							
						 
					 
					
						
						
							
							merge_file should use more aggressive levels  
						
						... 
						
						
						
						The default merge_file level was XDL_MERGE_MINIMAL, which will
produce conflicts where there should not be in the case where
both sides were changed identically.  Change the defaults to be
more aggressive (XDL_MERGE_ZEALOUS) which will more aggressively
compress non-conflicts.  This matches git.git's defaults.
Increase testing around reverting a previously reverted commit to
illustrate this problem. 
						
					 
					
						2014-01-20 17:15:11 -05:00 
						 
				 
			
				
					
						
							
							
								Edward Thomson 
							
						 
					 
					
						
						
						
						
							
						
						
							b554ca5dc1 
							
						 
					 
					
						
						
							
							"Uninitialized" submodules are "unmodified"  
						
						... 
						
						
						
						Extend the "unmodified" submodule workdir test to include
uninitialized submodules, to prevent reporting submodules as
modified when they're not in the workdir at all. 
						
					 
					
						2014-01-20 17:09:31 -05:00 
						 
				 
			
				
					
						
							
							
								Patrick Reynolds 
							
						 
					 
					
						
						
						
						
							
						
						
							abdaf93662 
							
						 
					 
					
						
						
							
							add unit tests for git_buf_join corner cases  
						
						
						
					 
					
						2014-01-20 11:42:12 -06:00 
						 
				 
			
				
					
						
							
							
								Graham Dennis 
							
						 
					 
					
						
						
						
						
							
						
						
							c7015424cc 
							
						 
					 
					
						
						
							
							Fix a compile warning.  
						
						
						
					 
					
						2014-01-18 08:54:19 +11:00 
						 
				 
			
				
					
						
							
							
								Graham Dennis 
							
						 
					 
					
						
						
						
						
							
						
						
							194d077c4f 
							
						 
					 
					
						
						
							
							Add test for pushing to a local file:// URL.  
						
						
						
					 
					
						2014-01-18 08:43:29 +11:00 
						 
				 
			
				
					
						
							
							
								Carlos Martín Nieto 
							
						 
					 
					
						
						
						
						
							
						
						
							0b28217bda 
							
						 
					 
					
						
						
							
							refs: remove the _with_log differentiation  
						
						... 
						
						
						
						Any well-behaved program should write a descriptive message to the
reflog whenever it updates a reference. Let's make this more prominent
by removing the version without the reflog parameters. 
						
					 
					
						2014-01-15 13:32:43 +01:00 
						 
				 
			
				
					
						
							
							
								Arthur Schreiber 
							
						 
					 
					
						
						
						
						
							
						
						
							40ef47dd46 
							
						 
					 
					
						
						
							
							Add git_remote_dup.  
						
						
						
					 
					
						2014-01-14 21:03:01 +01:00 
						 
				 
			
				
					
						
							
							
								Ben Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							426d8456ea 
							
						 
					 
					
						
						
							
							Merge pull request  #2033  from xtao/blame_orig_commit  
						
						... 
						
						
						
						Add orig_commit. 
						
					 
					
						2014-01-08 19:43:31 -08:00 
						 
				 
			
				
					
						
							
							
								XTao 
							
						 
					 
					
						
						
						
						
							
						
						
							b92b434f5a 
							
						 
					 
					
						
						
							
							Add orig & final commit test.  
						
						
						
					 
					
						2014-01-09 11:18:38 +08:00 
						 
				 
			
				
					
						
							
							
								Edward Thomson 
							
						 
					 
					
						
						
						
						
							
						
						
							6adcaab70c 
							
						 
					 
					
						
						
							
							Handle git_buf's from users more liberally  
						
						
						
					 
					
						2014-01-08 10:08:23 -08:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							79ccb92178 
							
						 
					 
					
						
						
							
							Further tree building tests with hard paths  
						
						
						
					 
					
						2014-01-03 14:26:02 -08:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							97bbf61e90 
							
						 
					 
					
						
						
							
							Tree accessor tests with hard path names  
						
						
						
					 
					
						2014-01-03 12:14:22 -08:00 
						 
				 
			
				
					
						
							
							
								Vicent Marti 
							
						 
					 
					
						
						
						
						
							
						
						
							f3a302ad8e 
							
						 
					 
					
						
						
							
							Merge pull request  #2019  from linquize/recurse-on-demand  
						
						... 
						
						
						
						Accept 'submodule.*.fetchRecurseSubmodules' config 'on-demand' value 
						
					 
					
						2014-01-02 05:10:04 -08:00 
						 
				 
			
				
					
						
							
							
								Marek Šuppa 
							
						 
					 
					
						
						
						
						
							
						
						
							f38cb9815f 
							
						 
					 
					
						
						
							
							Updated fetch.c test to pass.  
						
						... 
						
						
						
						I am not sure why there was 6 in the first place. 
						
					 
					
						2013-12-31 11:27:32 +01:00 
						 
				 
			
				
					
						
							
							
								Linquize 
							
						 
					 
					
						
						
						
						
							
						
						
							41ceab2522 
							
						 
					 
					
						
						
							
							Update test related to fetchRecurseSubmodules  
						
						
						
					 
					
						2013-12-31 07:34:40 +08:00 
						 
				 
			
				
					
						
							
							
								Vicent Marti 
							
						 
					 
					
						
						
						
						
							
						
						
							4e1f517c61 
							
						 
					 
					
						
						
							
							Merge pull request  #1920  from libgit2/cmn/ref-with-log  
						
						... 
						
						
						
						Reference operations with log 
						
					 
					
						2013-12-18 09:33:45 -08:00 
						 
				 
			
				
					
						
							
							
								Edward Thomson 
							
						 
					 
					
						
						
						
						
							
						
						
							bf4a577c69 
							
						 
					 
					
						
						
							
							Overwrite ignored directories on checkout  
						
						
						
					 
					
						2013-12-13 10:10:32 -05:00 
						 
				 
			
				
					
						
							
							
								Edward Thomson 
							
						 
					 
					
						
						
						
						
							
						
						
							81a2012d99 
							
						 
					 
					
						
						
							
							Overwrite ignored files on checkout  
						
						
						
					 
					
						2013-12-13 09:29:55 -05:00 
						 
				 
			
				
					
						
							
							
								Vicent Marti 
							
						 
					 
					
						
						
						
						
							
						
						
							7a16d54b54 
							
						 
					 
					
						
						
							
							pool: Agh, this test doesn't really apply in 32-bit machines  
						
						... 
						
						
						
						The size_t is 32-bit already, so it overflows before going into the
function. The `-1` test should handle this gracefully in both cases
anyway. 
						
					 
					
						2013-12-13 12:47:51 +01:00 
						 
				 
			
				
					
						
							
							
								Vicent Marti 
							
						 
					 
					
						
						
						
						
							
						
						
							437f7d69b2 
							
						 
					 
					
						
						
							
							pool: Correct overflow checks  
						
						... 
						
						
						
						Ok, scrap the previous commit. This is the right overflow check that
takes care of 64 bit overflow **and** 32-bit overflow, which needs to be
considered because the pool malloc can only allocate 32-bit elements in
one go. 
						
					 
					
						2013-12-13 12:41:22 +01:00 
						 
				 
			
				
					
						
							
							
								Russell Belfer 
							
						 
					 
					
						
						
						
						
							
						
						
							452c7de668 
							
						 
					 
					
						
						
							
							Add git_treebuilder_insert test and clarify doc  
						
						... 
						
						
						
						This wasn't being tested and since it has a callback, I fixed it
even though the return value of this callback is not treated like
any of the other callbacks in the API. 
						
					 
					
						2013-12-12 14:16:40 -08:00