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