6351 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Carlos Martín Nieto	9af14886a9	MSVC is silly	2014-03-10 18:20:47 +01:00
Vicent Marti	fc78488b3d	Merge pull request #2175 from Yogu/submodule-resolve-url ... Add git_submodule_resolve_url()	2014-03-10 18:16:56 +01:00
Jan Melcher	52fba18f4e	Add git_submodule_resolve_url()	2014-03-10 18:16:10 +01:00
Paul Betts	4a8692f633	Merge pull request #2177 from shiftkey/typo-fix ... corrected typo in error message	2014-03-09 21:07:18 -07:00
Brendan Forster	0782c89ed5	corrected typo in error message	2014-03-10 14:40:07 +11:00
Vicent Marti	6de018bbf1	Merge pull request #2170 from ethomson/clar ... Update clar to e1990d6	2014-03-07 20:00:20 +01: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
Russell Belfer	5a6de908f6	Merge pull request #2153 from mekishizufu/tag_example ... Add a tag example	2014-03-07 09:13:43 -08:00
Vicent Marti	628edd6b1b	Merge pull request #2167 from mekishizufu/memory_access_fixes ... Fun with memory access	2014-03-07 16:26:58 +01:00
Vicent Marti	0d95f6ec76	Merge pull request #2169 from libgit2/valgrind ... Plug leaks	2014-03-07 16:26:51 +01:00
Carlos Martín Nieto	ae32c54e58	Plug a few leaks in the tests	2014-03-07 16:03:15 +01:00
Carlos Martín Nieto	a07b169834	branch: fix leak when checking against HEAD ... We look up a reference in order to figure out if it's the current branch, which we need to free once we're done with the check. As a bonus, only perform the check when we're passed the force flag, as it's a useless check otherwise.	2014-03-07 16:03:10 +01:00
Carlos Martín Nieto	7c1ee212b7	commit: simplify and correct refcounting in nth_gen_ancestor ... We can make use of git_object_dup to use refcounting instead of pointer comparison to make sure we don't free the caller's object. This also lets us simplify the case for '~0' which is now just an assignment instead of looking up the object we have at hand.	2014-03-07 16:03:10 +01:00
Carlos Martín Nieto	5187b609ba	local transport: catch double-opens ... Combinations of connect + fetch can call local_open multiple times. Detect this and skip the initialization stage.	2014-03-07 16:03:10 +01:00
Jiri Pospisil	79aa03020d	blame: Fix compare function's data types ... Previously the hunk_byfinalline_search_cmp function was called with different data types (size_t and uint32_t) for the key argument but expected only the former resulting in an invalid memory access when passed the latter on a 64 bit machine. The following patch makes sure that the function is called and works with the same type (size_t).	2014-03-07 15:52:34 +01:00
Jiri Pospisil	00258cc0b6	git_oid_fromstrn: Simplify the implementation and fix memory access issues	2014-03-07 15:52:27 +01:00
Vicent Marti	c81e4adfd7	Merge pull request #2168 from ethomson/clar ... Update clar to a0b00f0	2014-03-07 14:00:59 +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
Vicent Marti	4a759bfbcf	Merge pull request #2165 from libgit2/revert-1997 ... Revert pull request #1997	2014-03-06 16:08:36 +01:00
Vicent Marti	2ab6d2cd47	Revert pull request #1997	2014-03-06 16:08:17 +01:00
Vicent Marti	4d116c3413	Merge pull request #1997 from mgbowen/merge-options-init-fix ... Fix GIT_MERGE_OPTS_INIT on MSVC.	2014-03-06 16:08:12 +01:00
Vicent Marti	efc822ef0d	Merge pull request #2014 from mgbowen/cpp-options-init ... Function-based options initializers	2014-03-06 13:14:15 +01:00
Ben Straub	a5139485f7	Merge pull request #2162 from sunheehnus/dev ... examples/diff:Add the shortstat flag to examples/diff.c	2014-03-05 19:50:23 -08:00
Sun He	6246de93b6	Merge completed: resolve the conflict with the upstream	2014-03-06 11:16:36 +08: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
Russell Belfer	26875825df	Check short OID len in odb, not in backends	2014-03-05 13:06:22 -08:00
Vicent Marti	a62ad3c353	Merge pull request #2164 from libgit2/cmn/refs-delete-iteration ... refdb: catch a directory disappearing	2014-03-05 21:07:20 +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
Carlos Martín Nieto	a213a7bfa8	refdb: catch a directory disappearing ... If a directory disappears between the time we look up the entries of its parent and the time when we go to look at it, we should ignore the error and move forward. This fixes #2046.	2014-03-05 21:00:15 +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
Jiri Pospisil	feebe6150f	Move all variable declarations to the top of the block	2014-03-05 20:31:15 +01:00
Jiri Pospisil	a53b858417	Add tag example	2014-03-05 20:31:15 +01:00
Jiri Pospisil	4ae4a9bbd1	Fix typo	2014-03-05 20:31:15 +01:00
Sun He	8384a50a21	fix the output format of diff	2014-03-05 20:33:20 +08:00
Sun He	45d2e8dc46	Add the --shortstat flag to examples/diff.c	2014-03-05 20:13:34 +08:00
Vicent Marti	68581754f3	Merge pull request #2160 from modocache/examples-diff-add-patience-and-minimal ... examples/diff: Add minimal, patience diff options.	2014-03-05 11:42:50 +01:00
Vicent Marti	d2b7841d66	Merge pull request #2161 from softwarenerd/softwarenerd ... Fixed missing error check on call to git_remote_download	2014-03-05 11:37:08 +01:00
Brian Lambert	06a8f5c3b2	Fixed missing error check on call to git_remote_download in git_remote_fetch. Moved error check to statement following git_remote_disconnect so that the disconnect happens regardless of the result of the download call.	2014-03-05 00:00:41 -05:00
Brian Gesiak	0d3c8a9d92	examples/diff: Add minimal, patience diff options. ... - Add minimal, patience diff options to diff example. libgit2 `diff_xdiff.git_xdiff_init` already supports these flags, so no additional change is necessary. - Remove minimal and patience flag addition from project list.	2014-03-05 13:06:31 +09: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
Vicent Marti	66d9e0461c	Merge pull request #2157 from libgit2/cmn/write-object-mem ... pack-objects: free memory safely	2014-03-04 21:01:39 +01:00
Carlos Martín Nieto	a14aa1e789	pack-objects: free memory safely ... A few fixes have accumulated in this area which have made the freeing of data a bit muddy. Make sure to free the data only when needed and once. When we are going to write a delta to the packfile, we need to free the data, otherwise leave it. The current version of the code mixes up the checks for po->data and po->delta_data.	2014-03-04 20:11:50 +01:00
Russell Belfer	0a62caf4e4	Merge pull request #2155 from jacquesg/stash-save-remove-ignored ... Remove ignored files from the working directory if they were stashed	2014-03-04 10:21:41 -08:00
Jacques Germishuys	4636ca9391	Remove ignored files from the working directory if they were stashed	2014-03-04 12:22:27 +02:00