Russell Belfer
32770c52a8
Fix diff header comments and missing const
...
Based on the recent work to wrap diff in objective-git, this
includes a fix for a missing const and a number of clarifications
of the documentation.
2012-12-05 13:56:32 -08:00
Vicent Marti
bf192cdb43
versions: MSVC build fixes
2012-12-05 20:56:27 +01:00
Vicent Marti
43efaabd40
common: Silly vmg.
2012-12-05 20:54:03 +01:00
Vicent Marti
8ff66112d9
common: Silly MSVC
2012-12-05 20:50:19 +01:00
Vicent Martí
e05ca13f1f
Merge pull request #1115 from ben/struct-versions
...
Version info for public structs
2012-12-05 11:47:19 -08:00
Edward Thomson
05fc823fce
indentation fix
2012-12-04 16:59:34 -06:00
Edward Thomson
aab8f5af4b
hey don't stomp on my memory!
2012-12-04 16:40:09 -06:00
Edward Thomson
b241466133
status should ignore conflicts entries in the index
2012-12-03 14:51:39 -06:00
Ben Straub
ee1c33b146
Don't unconstify when casting
2012-12-03 12:45:15 -08:00
Ben Straub
de70aea6b1
Remove GIT_SIGNATURE_VERSION and friends
2012-12-03 12:41:50 -08:00
Vicent Martí
3368c520dc
Merge pull request #1112 from barrbrain/odb-pack-read-header
...
odb-pack: resurrect pack_backend__read_header
2012-12-03 07:38:58 -08:00
Vicent Marti
7ea3a79f0c
Vade retro satana
2012-12-03 16:04:39 +01:00
David Michael Barr
bfb8bcc1df
odb-pack: resurrect pack_backend__read_header
2012-12-03 10:39:17 +11:00
David Michael Barr
44f9f54797
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.
2012-12-03 10:39:17 +11:00
nulltoken
cc1466264a
revparse: Deploy EINVALIDSPEC usage
2012-12-01 08:34:31 +01:00
nulltoken
bc05f30c47
object: refine git_object_peel() error report
2012-12-01 08:34:29 +01:00
nulltoken
18d6f12040
tag: Deploy EINVALIDSPEC usage
2012-12-01 08:34:28 +01:00
nulltoken
80212ecb1c
reflog: Deploy EINVALIDSPEC usage
2012-12-01 08:34:27 +01:00
nulltoken
80d9d1df14
refs: Deploy EINVALIDSPEC usage
2012-12-01 08:34:26 +01:00
nulltoken
83458bb77f
refs: Fix error clearing
2012-12-01 08:34:24 +01:00
nulltoken
032ba9e4ad
remote: deploy EINVALIDSPEC usage
2012-12-01 08:34:23 +01:00
Ben Straub
0ab3a2ab2c
Deploy GIT_INIT_STRUCTURE
2012-11-30 20:34:50 -08:00
David Michael Barr
d1b6ea8ad1
delta-apply: add git__delta_read_header
2012-12-01 14:50:45 +11:00
Ben Straub
c7231c45fe
Deploy GITERR_CHECK_VERSION
2012-11-30 16:31:42 -08:00
Ben Straub
4ec197f304
Deploy GIT_SIGNATURE_INIT
2012-11-30 13:12:16 -08:00
Ben Straub
1071176900
Deploy versioned git_transport structure
2012-11-30 13:12:15 -08:00
Ben Straub
79cfa20d60
Deploy GIT_STATUS_OPTIONS_INIT
2012-11-30 13:12:15 -08:00
Ben Straub
b4d136527c
Deploy GIT_REPOSITORY_INIT_OPTIONS_INIT
2012-11-30 13:12:15 -08:00
Ben Straub
9267ff586f
Deploy GIT_REMOTE_CALLBACKS_INIT
2012-11-30 13:12:15 -08:00
Ben Straub
55f6f21b7d
Deploy versioned git_odb_backend structure
2012-11-30 13:12:15 -08:00
Ben Straub
ca901e7b0f
Deploy GIT_DIFF_FIND_OPTIONS_INIT
2012-11-30 13:12:15 -08:00
Ben Straub
2f8d30becb
Deploy GIT_DIFF_OPTIONS_INIT
2012-11-30 13:12:14 -08:00
Ben Straub
6917762139
Deploy git_config_backend version
2012-11-30 13:12:14 -08:00
Ben Straub
b81aa2f1de
Deploy GIT_CHECKOUT_OPTS_INIT
2012-11-30 13:12:14 -08:00
Carlos Martín Nieto
da82043736
graph: plug leak
2012-11-30 15:26:45 +01:00
Carlos Martín Nieto
9ff07c24f5
buf test: make sure we always set the bom variable
2012-11-30 15:17:05 +01:00
Russell Belfer
f684970a10
Merge pull request #1108 from libgit2/ahead-behind-count
...
Add API to calculate ahead/behind count
2012-11-29 22:53:34 -08:00
Scott J. Goldman
bdf3e6df83
Fix error condition typo
2012-11-29 17:34:41 -08:00
Russell Belfer
d5e44d8498
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.
2012-11-29 17:02:27 -08:00
Vicent Martí
f1e5c506b2
Merge pull request #1110 from libgit2/features/push_rebased
...
Push! By schu, phkelley, and congyiwu
2012-11-29 12:18:05 -08:00
Philip Kelley
4a6621fdf7
Leverage the min macro from util.h
2012-11-29 08:35:21 -05:00
Philip Kelley
6762fe087b
Remove casts of return values of type void *
2012-11-29 08:29:26 -05:00
Philip Kelley
ac22d08f2f
Remove git_object_oid2type
2012-11-29 08:22:15 -05:00
Vicent Martí
e2934db2c7
Merge pull request #1090 from arrbee/ignore-invalid-by-default
...
Ignore invalid entries by default
2012-11-29 02:05:46 -08:00
Vicent Martí
ee06fec507
Merge pull request #1083 from nulltoken/fix/tracking
...
Fix git_branch_tracking() for branches with empty merge and/or remote config entries
2012-11-29 01:29:50 -08:00
Scott J. Goldman
b994bfe339
graph.c: prune includes
2012-11-28 18:59:13 -08:00
Scott J. Goldman
0984c8768d
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 *`.
2012-11-28 18:54:57 -08:00
Scott J. Goldman
c6d03c958f
fix coding style: while( -> while (
2012-11-28 18:54:57 -08:00
Scott J. Goldman
bff53e5405
Add initial implementation of ahead-behind count
2012-11-28 18:54:56 -08:00
nulltoken
37849a8ec3
tracking: fix retrieval of the tracking ref of branch with empty merge and/or remote entry
2012-11-28 20:00:07 +01:00
