]>
git.proxmox.com Git - libgit2.git/log
Vicent Marti [Wed, 5 Dec 2012 20:06:54 +0000 (21:06 +0100)]
tests: MSVC fix
Vicent Marti [Wed, 5 Dec 2012 19:56:27 +0000 (20:56 +0100)]
versions: MSVC build fixes
Vicent Marti [Wed, 5 Dec 2012 19:54:03 +0000 (20:54 +0100)]
common: Silly vmg.
Vicent Marti [Wed, 5 Dec 2012 19:50:19 +0000 (20:50 +0100)]
common: Silly MSVC
Vicent Martí [Wed, 5 Dec 2012 19:47:19 +0000 (11:47 -0800)]
Merge pull request #1115 from ben/struct-versions
Version info for public structs
Ben Straub [Wed, 5 Dec 2012 16:22:28 +0000 (08:22 -0800)]
Fix erroneous whitespace guideline
Edward Thomson [Tue, 4 Dec 2012 22:59:34 +0000 (16:59 -0600)]
indentation fix
Vicent Martí [Tue, 4 Dec 2012 22:47:25 +0000 (14:47 -0800)]
Merge pull request #1119 from ethomson/symlink_cast_ouch
Hey that's not an int!
Edward Thomson [Tue, 4 Dec 2012 22:40:09 +0000 (16:40 -0600)]
hey don't stomp on my memory!
Russell Belfer [Mon, 3 Dec 2012 21:20:39 +0000 (13:20 -0800)]
Merge pull request #1111 from ethomson/conflictstatus
status should ignore conflicts entries in the index
Edward Thomson [Thu, 29 Nov 2012 04:43:55 +0000 (22:43 -0600)]
status should ignore conflicts entries in the index
Ben Straub [Mon, 3 Dec 2012 20:45:15 +0000 (12:45 -0800)]
Don't unconstify when casting
Ben Straub [Mon, 3 Dec 2012 20:41:50 +0000 (12:41 -0800)]
Remove GIT_SIGNATURE_VERSION and friends
Ben Straub [Mon, 3 Dec 2012 20:41:38 +0000 (12:41 -0800)]
Remove GIT_CRED_VERSION and friends
Vicent Martí [Mon, 3 Dec 2012 15:38:58 +0000 (07:38 -0800)]
Merge pull request #1112 from barrbrain/odb-pack-read-header
odb-pack: resurrect pack_backend__read_header
Vicent Marti [Mon, 3 Dec 2012 15:04:39 +0000 (16:04 +0100)]
Vade retro satana
Vicent Martí [Mon, 3 Dec 2012 14:26:41 +0000 (06:26 -0800)]
Merge pull request #1063 from nulltoken/topic/invalid-name
EINVALIDSPEC
David Michael Barr [Sun, 2 Dec 2012 23:36:32 +0000 (10:36 +1100)]
odb-pack: resurrect pack_backend__read_header
David Michael Barr [Fri, 30 Nov 2012 02:33:30 +0000 (13:33 +1100)]
pack: add git_packfile_resolve_header
To paraphrase @peff:
You can get both size and type from a packed object reasonably cheaply.
If you have:
* An object that is not a delta; both type and size are available in the
packfile header.
* An object that is a delta. The packfile type will be OBJ_*_DELTA, and
you have to resolve back to the base to find the real type. That means
potentially a lot of packfile index lookups, but each one is
relatively cheap. For the size, you inflate the first few bytes of the
delta, whose header will tell you the resulting size of applying the
delta to the base.
For simplicity, we just decompress the whole delta for now.
nulltoken [Mon, 19 Nov 2012 18:00:46 +0000 (19:00 +0100)]
revparse: Deploy EINVALIDSPEC usage
nulltoken [Sun, 18 Nov 2012 22:20:35 +0000 (14:20 -0800)]
revparse: remove timezone setup in tests
nulltoken [Mon, 19 Nov 2012 17:49:25 +0000 (18:49 +0100)]
object: refine git_object_peel() error report
nulltoken [Mon, 12 Nov 2012 19:47:32 +0000 (20:47 +0100)]
branch: Deploy EINVALIDSPEC usage
nulltoken [Mon, 12 Nov 2012 14:55:38 +0000 (15:55 +0100)]
tag: Deploy EINVALIDSPEC usage
nulltoken [Mon, 12 Nov 2012 15:49:29 +0000 (16:49 +0100)]
reflog: Deploy EINVALIDSPEC usage
nulltoken [Mon, 12 Nov 2012 16:25:55 +0000 (17:25 +0100)]
refs: cover git_reference_name_to_oid() unfound behavior
nulltoken [Mon, 12 Nov 2012 14:42:15 +0000 (15:42 +0100)]
refs: Deploy EINVALIDSPEC usage
nulltoken [Mon, 12 Nov 2012 13:19:37 +0000 (14:19 +0100)]
tests: drop unused variables
nulltoken [Mon, 12 Nov 2012 13:06:13 +0000 (14:06 +0100)]
refs: Fix error clearing
nulltoken [Mon, 12 Nov 2012 11:32:31 +0000 (12:32 +0100)]
remote: deploy EINVALIDSPEC usage
nulltoken [Mon, 12 Nov 2012 10:29:48 +0000 (11:29 +0100)]
errors: Introduce EINVALIDSPEC error code
nulltoken [Thu, 29 Nov 2012 20:33:31 +0000 (21:33 +0100)]
Fix compilation warnings
Ben Straub [Sat, 1 Dec 2012 04:35:01 +0000 (20:35 -0800)]
Make constant name all-caps
Ben Straub [Sat, 1 Dec 2012 04:34:50 +0000 (20:34 -0800)]
Deploy GIT_INIT_STRUCTURE
David Michael Barr [Sat, 1 Dec 2012 03:50:20 +0000 (14:50 +1100)]
delta-apply: add git__delta_read_header
Ben Straub [Sat, 1 Dec 2012 00:31:42 +0000 (16:31 -0800)]
Deploy GITERR_CHECK_VERSION
Ben Straub [Fri, 30 Nov 2012 20:52:42 +0000 (12:52 -0800)]
Deploy GIT_SIGNATURE_INIT
Ben Straub [Fri, 30 Nov 2012 04:47:37 +0000 (20:47 -0800)]
Deploy versioned git_transport structure
Ben Straub [Fri, 30 Nov 2012 04:12:59 +0000 (20:12 -0800)]
Deploy GIT_STATUS_OPTIONS_INIT
Ben Straub [Fri, 30 Nov 2012 04:06:23 +0000 (20:06 -0800)]
Deploy GIT_REPOSITORY_INIT_OPTIONS_INIT
Ben Straub [Fri, 30 Nov 2012 04:01:24 +0000 (20:01 -0800)]
Deploy GIT_REMOTE_CALLBACKS_INIT
Ben Straub [Fri, 30 Nov 2012 03:59:18 +0000 (19:59 -0800)]
Deploy versioned git_odb_backend structure
Ben Straub [Thu, 29 Nov 2012 23:16:19 +0000 (15:16 -0800)]
Deploy GIT_DIFF_FIND_OPTIONS_INIT
Ben Straub [Thu, 29 Nov 2012 23:05:04 +0000 (15:05 -0800)]
Deploy GIT_DIFF_OPTIONS_INIT
Ben Straub [Thu, 29 Nov 2012 22:07:50 +0000 (14:07 -0800)]
Deploy git_config_backend version
Ben Straub [Thu, 29 Nov 2012 22:06:40 +0000 (14:06 -0800)]
Deploy GIT_CHECKOUT_OPTS_INIT
Ben Straub [Thu, 29 Nov 2012 20:26:40 +0000 (12:26 -0800)]
Cleanup nitpicky things
Ben Straub [Thu, 29 Nov 2012 20:26:09 +0000 (12:26 -0800)]
Add version fields and init macros for public input structs.
Carlos Martín Nieto [Fri, 30 Nov 2012 14:26:45 +0000 (15:26 +0100)]
graph: plug leak
Carlos Martín Nieto [Fri, 30 Nov 2012 14:23:20 +0000 (15:23 +0100)]
valgrind: ignore leaks from OpenSSL
Carlos Martín Nieto [Fri, 30 Nov 2012 14:17:05 +0000 (15:17 +0100)]
buf test: make sure we always set the bom variable
Russell Belfer [Fri, 30 Nov 2012 06:53:34 +0000 (22:53 -0800)]
Merge pull request #1108 from libgit2/ahead-behind-count
Add API to calculate ahead/behind count
Scott J. Goldman [Fri, 30 Nov 2012 01:38:37 +0000 (17:38 -0800)]
Fixup ahead/behind tests
Fix a typo that caused a failing test, and use cl_assert_equal
instead of cl_assert.
Scott J. Goldman [Fri, 30 Nov 2012 01:34:41 +0000 (17:34 -0800)]
Fix error condition typo
Russell Belfer [Fri, 30 Nov 2012 01:02:27 +0000 (17:02 -0800)]
Fix function name and add real error check
`revwalk.h:commit_lookup()` -> `git_revwalk__commit_lookup()`
and make `git_commit_list_parse()` do real error checking that
the item in the list is an actual commit object. Also fixed an
apparent typo in a test name.
Vicent Martí [Thu, 29 Nov 2012 20:18:05 +0000 (12:18 -0800)]
Merge pull request #1110 from libgit2/features/push_rebased
Push! By schu, phkelley, and congyiwu
Philip Kelley [Thu, 29 Nov 2012 15:34:16 +0000 (10:34 -0500)]
Remove more sample hooks from test repo for push
Philip Kelley [Thu, 29 Nov 2012 13:37:32 +0000 (08:37 -0500)]
Remove sample hooks from test repo for push
Philip Kelley [Thu, 29 Nov 2012 13:35:21 +0000 (08:35 -0500)]
Leverage the min macro from util.h
Philip Kelley [Thu, 29 Nov 2012 13:29:26 +0000 (08:29 -0500)]
Remove casts of return values of type void *
Philip Kelley [Thu, 29 Nov 2012 13:22:15 +0000 (08:22 -0500)]
Remove git_object_oid2type
Vicent Martí [Thu, 29 Nov 2012 10:05:46 +0000 (02:05 -0800)]
Merge pull request #1090 from arrbee/ignore-invalid-by-default
Ignore invalid entries by default
Vicent Martí [Thu, 29 Nov 2012 09:29:50 +0000 (01:29 -0800)]
Merge pull request #1083 from nulltoken/fix/tracking
Fix git_branch_tracking() for branches with empty merge and/or remote config entries
Vicent Martí [Thu, 29 Nov 2012 09:02:08 +0000 (01:02 -0800)]
Merge pull request #1102 from nulltoken/topic/fetch-test-coverage
fetch: enhance test coverage
Vicent Martí [Thu, 29 Nov 2012 09:01:44 +0000 (01:01 -0800)]
Merge pull request #1107 from nulltoken/fix/diff-null-tree-against-workdir
Enhance diff test coverage between a null Tree and the Workdir
Vicent Martí [Thu, 29 Nov 2012 08:00:32 +0000 (00:00 -0800)]
Merge pull request #1088 from arrbee/consolidate-text-functions
Consolidate text buffer functions
Scott J. Goldman [Thu, 29 Nov 2012 02:48:22 +0000 (18:48 -0800)]
graph.c: prune includes
Scott J. Goldman [Thu, 29 Nov 2012 02:27:43 +0000 (18:27 -0800)]
Rename git_count_ahead_behind -> git_graph_ahead_behind
Moved it into graph.{c,h} which i created for the new "graph"
functions namespace. Also adjusted the function prototype
to use `size_t` and `const git_oid *`.
Scott J. Goldman [Thu, 29 Nov 2012 02:07:08 +0000 (18:07 -0800)]
fix coding style: while( -> while (
Scott J. Goldman [Wed, 28 Nov 2012 07:27:41 +0000 (23:27 -0800)]
Add the ahead/behind test that Carlos suggested
Adds a repo with a more complex topology to test the ahead-behind
count.
Scott J. Goldman [Wed, 28 Nov 2012 00:37:11 +0000 (16:37 -0800)]
Add tests for ahead-behind count
Scott J. Goldman [Wed, 28 Nov 2012 00:36:50 +0000 (16:36 -0800)]
Add initial implementation of ahead-behind count
nulltoken [Sat, 24 Nov 2012 18:05:39 +0000 (19:05 +0100)]
fetch: enhance test coverage
nulltoken [Tue, 27 Nov 2012 19:24:56 +0000 (20:24 +0100)]
diff: enhance test coverage against the workdir
nulltoken [Sun, 18 Nov 2012 06:09:55 +0000 (22:09 -0800)]
tracking: fix retrieval of the tracking ref of branch with empty merge and/or remote entry
nulltoken [Sun, 18 Nov 2012 06:07:30 +0000 (22:07 -0800)]
tracking: remove code duplication in test
nulltoken [Wed, 28 Nov 2012 18:35:26 +0000 (19:35 +0100)]
Fix MSVC compilation warning
Russell Belfer [Wed, 28 Nov 2012 17:58:48 +0000 (09:58 -0800)]
Consolidate text buffer functions
There are many scattered functions that look into the contents of
buffers to do various text manipulations (such as escaping or
unescaping data, calculating text stats, guessing if content is
binary, etc). This groups all those functions together into a
new file and converts the code to use that.
This has two enhancements to existing functionality. The old
text stats function is significantly rewritten and the BOM
detection code was extended (although largely we can't deal with
anything other than a UTF8 BOM).
Philip Kelley [Wed, 28 Nov 2012 16:42:37 +0000 (11:42 -0500)]
Push! By schu, phkelley, and congyiwu, et al
Vicent Martí [Wed, 28 Nov 2012 12:14:24 +0000 (04:14 -0800)]
Merge pull request #1109 from scunz/uninitialized
Fix uninitialized variable
Sascha Cunz [Wed, 28 Nov 2012 11:43:12 +0000 (12:43 +0100)]
Fix uninitialized variable
clang-SVN HEAD kindly provided my the info, that sm_repo maybe
uninitialized when we want to free it (If the expression in line 358 or
359/360 evaluate to true, we jump to "cleanup", where we'd use sm_repo
uninitialized).
Vicent Marti [Wed, 28 Nov 2012 10:47:38 +0000 (11:47 +0100)]
object: Raise proper code on invalid object type
Vicent Marti [Wed, 28 Nov 2012 09:47:10 +0000 (10:47 +0100)]
odb: Add `git_odb_add_disk_alternate`
Loads a disk alternate by path to the ODB. Mimics the
`GIT_ALTERNATE_OBJECT_DIRECTORIES` shell var.
Ben Straub [Wed, 28 Nov 2012 02:59:22 +0000 (18:59 -0800)]
Merge pull request #1087 from libgit2/great-renaming
The Great Renaming of 2012
Russell Belfer [Tue, 27 Nov 2012 23:28:48 +0000 (15:28 -0800)]
Various minor commenting fixes
Russell Belfer [Tue, 27 Nov 2012 23:00:49 +0000 (15:00 -0800)]
Make git_odb_foreach_cb take const param
This makes the first OID param of the ODB callback a const pointer
and also propogates that change all the way to the backends.
Russell Belfer [Tue, 27 Nov 2012 23:00:28 +0000 (15:00 -0800)]
Clarify git_message_prettify comments
Russell Belfer [Tue, 27 Nov 2012 22:47:39 +0000 (14:47 -0800)]
Remove git_note_data structure
Ben Straub [Tue, 27 Nov 2012 22:18:51 +0000 (14:18 -0800)]
API updates for transport.h
Ben Straub [Tue, 27 Nov 2012 22:13:03 +0000 (14:13 -0800)]
Typedef enums.
Ben Straub [Tue, 27 Nov 2012 22:06:56 +0000 (14:06 -0800)]
API updates for stash.h
Ben Straub [Tue, 27 Nov 2012 22:03:53 +0000 (14:03 -0800)]
API updates for signature.h
Ben Straub [Tue, 27 Nov 2012 22:01:24 +0000 (14:01 -0800)]
API updates for revwalk.h
Ben Straub [Tue, 27 Nov 2012 21:44:49 +0000 (13:44 -0800)]
API updates for repository.h
Ben Straub [Tue, 27 Nov 2012 21:30:04 +0000 (13:30 -0800)]
Fix warning
Ben Straub [Tue, 27 Nov 2012 21:15:43 +0000 (13:15 -0800)]
API updates for remote.h
Includes typedef for git_direction, and renames for
GIT_DIR_[FETCH|PUSH] to GIT_DIRECTION_(\1).
Ben Straub [Tue, 27 Nov 2012 20:45:44 +0000 (12:45 -0800)]
API updates for oid.h
Ben Straub [Tue, 27 Nov 2012 20:33:58 +0000 (12:33 -0800)]
API updates for odb_backend.h
Ben Straub [Tue, 27 Nov 2012 17:49:16 +0000 (09:49 -0800)]
API updates for odb.h
Ben Straub [Tue, 27 Nov 2012 04:09:38 +0000 (20:09 -0800)]
API updates for notes.h/c.