|
b2414661
|
2012-11-28T22:43:55
|
|
status should ignore conflicts entries in the index
|
|
3368c520
|
2012-12-03T07:38:58
|
|
Merge pull request #1112 from barrbrain/odb-pack-read-header
odb-pack: resurrect pack_backend__read_header
|
|
7ea3a79f
|
2012-12-03T16:04:39
|
|
Vade retro satana
|
|
bfb8bcc1
|
2012-12-03T10:36:32
|
|
odb-pack: resurrect pack_backend__read_header
|
|
|
44f9f547
|
2012-11-30T13:33:30
|
|
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.
|
|
cc146626
|
2012-11-19T19:00:46
|
|
revparse: Deploy EINVALIDSPEC usage
|
|
|
bc05f30c
|
2012-11-19T18:49:25
|
|
object: refine git_object_peel() error report
|
|
|
18d6f120
|
2012-11-12T15:55:38
|
|
tag: Deploy EINVALIDSPEC usage
|
|
|
80212ecb
|
2012-11-12T16:49:29
|
|
reflog: Deploy EINVALIDSPEC usage
|
|
|
80d9d1df
|
2012-11-12T15:42:15
|
|
refs: Deploy EINVALIDSPEC usage
|
|
|
83458bb7
|
2012-11-12T14:06:13
|
|
refs: Fix error clearing
|
|
|
032ba9e4
|
2012-11-12T12:32:31
|
|
remote: deploy EINVALIDSPEC usage
|
|
|
d1b6ea8a
|
2012-12-01T14:50:20
|
|
delta-apply: add git__delta_read_header
|
|
da820437
|
2012-11-30T15:26:45
|
|
graph: plug leak
|
|
|
9ff07c24
|
2012-11-30T15:17:05
|
|
buf test: make sure we always set the bom variable
|
|
f684970a
|
2012-11-29T22:53:34
|
|
Merge pull request #1108 from libgit2/ahead-behind-count
Add API to calculate ahead/behind count
|
|
bdf3e6df
|
2012-11-29T17:34:41
|
|
Fix error condition typo
|
|
|
d5e44d84
|
2012-11-29T17:02:27
|
|
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.
|
|
|
f1e5c506
|
2012-11-29T12:18:05
|
|
Merge pull request #1110 from libgit2/features/push_rebased
Push! By schu, phkelley, and congyiwu
|
|
4a6621fd
|
2012-11-29T08:35:21
|
|
Leverage the min macro from util.h
|
|
|
6762fe08
|
2012-11-29T08:29:26
|
|
Remove casts of return values of type void *
|
|
|
ac22d08f
|
2012-11-29T08:22:15
|
|
Remove git_object_oid2type
|
|
|
e2934db2
|
2012-11-29T02:05:46
|
|
Merge pull request #1090 from arrbee/ignore-invalid-by-default
Ignore invalid entries by default
|
|
|
ee06fec5
|
2012-11-29T01:29:50
|
|
Merge pull request #1083 from nulltoken/fix/tracking
Fix git_branch_tracking() for branches with empty merge and/or remote config entries
|
|
|
b994bfe3
|
2012-11-28T18:48:22
|
|
graph.c: prune includes
|
|
|
0984c876
|
2012-11-28T18:27:43
|
|
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 *`.
|
|
|
c6d03c95
|
2012-11-28T18:07:08
|
|
fix coding style: while( -> while (
|
|
|
bff53e54
|
2012-11-27T16:36:50
|
|
Add initial implementation of ahead-behind count
|
|
|
37849a8e
|
2012-11-17T22:09:55
|
|
tracking: fix retrieval of the tracking ref of branch with empty merge and/or remote entry
|
|
|
7bf87ab6
|
2012-11-28T09:58:48
|
|
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).
|
|
|
613d5eb9
|
2012-11-28T11:42:37
|
|
Push! By schu, phkelley, and congyiwu, et al
|
|
7cdad6c7
|
2012-11-28T12:43:12
|
|
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).
|
|
|
ae201891
|
2012-11-28T11:47:38
|
|
object: Raise proper code on invalid object type
|
|
|
9507a434
|
2012-11-28T10:47:10
|
|
odb: Add `git_odb_add_disk_alternate`
Loads a disk alternate by path to the ODB. Mimics the
`GIT_ALTERNATE_OBJECT_DIRECTORIES` shell var.
|
|
|
c3fb7d04
|
2012-11-27T15:00:49
|
|
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.
|
|
|
2bd5998c
|
2012-11-27T14:47:39
|
|
Remove git_note_data structure
|
|
f4a62c30
|
2012-11-27T14:13:03
|
|
Typedef enums.
|
|
|
1d8ec670
|
2012-11-27T14:06:56
|
|
API updates for stash.h
|
|
|
c9fc4a6f
|
2012-11-27T13:44:49
|
|
API updates for repository.h
|
|
|
df705148
|
2012-11-27T13:15:43
|
|
API updates for remote.h
Includes typedef for git_direction, and renames for
GIT_DIR_[FETCH|PUSH] to GIT_DIRECTION_(\1).
|
|
|
2e76b5fc
|
2012-11-27T09:49:16
|
|
API updates for odb.h
|
|
|
de5596bf
|
2012-11-26T20:09:38
|
|
API updates for notes.h/c.
|
|
|
4ff192d3
|
2012-11-26T19:47:47
|
|
Move merge functions to merge.c
In so doing, promote commit_list to git_commit_list,
with its own internal API header.
|
|
|
839c5f57
|
2012-11-26T12:04:07
|
|
API updates for indexer.h
|
|
|
a8122b5d
|
2012-11-21T15:39:03
|
|
Fix warnings on Win64 build
|
|
|
4604a654
|
2012-11-21T11:57:06
|
|
update internal index API to avoid cast
|
|
|
d574de0e
|
2012-11-21T11:53:54
|
|
API updates for status.h
|
|
|
16248ee2
|
2012-11-21T11:03:07
|
|
Fix up some missing consts in tree & index
This fixes some missed places where we can apply const-ness to
various public APIs.
There are still some index and tree APIs that cannot take const
pointers because we sort our `git_vectors` lazily and so we can't
reliably bsearch the index and tree content without applying a
`git_vector_sort()` first.
This also fixes some missed places where size_t can be used and
where const can be applied to a couple internal functions.
|
|
|
f45d51ff
|
2012-11-20T19:57:46
|
|
API updates for index.h
|
|
|
d9023dbe
|
2012-11-20T17:06:54
|
|
API updates for tag.h
|
|
|
9cd42358
|
2012-11-20T16:57:16
|
|
API updates for submodule.h
|
|
|
793c4385
|
2012-11-20T16:36:06
|
|
Update diff callback param order
This makes the diff functions that take callbacks both take
the payload parameter after the callback function pointers and
pass the payload as the last argument to the callback function
instead of the first. This should make them consistent with
other callbacks across the API.
|
|
|
54b2a37a
|
2012-11-20T16:02:25
|
|
Clean up config.h
|
|
|
eecc8050
|
2012-11-20T14:03:05
|
|
Update callback fn ptr for git_reference_foreach
As part of API review, use a typedef for the callback fn ptr.
|
|
|
e120123e
|
2012-11-20T14:01:46
|
|
API review / update for tree.h
|
|
|
824cb2d5
|
2012-11-20T12:13:52
|
|
Updates to reset.h
|
|
|
cfbe4be3
|
2012-11-17T19:54:47
|
|
More external API cleanup
Conflicts:
src/branch.c
tests-clar/refs/branches/create.c
|
|
|
2508cc66
|
2012-11-18T21:38:08
|
|
Rename ref and reflog apis for consistency
|
|
9e9aee67
|
2012-11-26T23:29:34
|
|
fix build on FreeBSD
3f9eb1e introduced support for SSL certificates issued for IP
addresses, making use of in_addr and in_addr6 structs. On FreeBSD
these are defined in (a file included in) <netinet/in.h>, so include
that file on FreeBSD and get the build working again.
|
|
|
8404f2d6
|
2012-11-26T03:56:25
|
|
Merge pull request #1101 from csware/prevent_die
pack.c: Set p->mwf.fd to -1 on error
|
|
f2696fa4
|
2012-11-26T12:12:41
|
|
Fix invalid read reported by valgrind
|
|
fcb48e06
|
2012-11-24T15:48:17
|
|
Set p->mwf.fd to -1 on error
If p->mwf.fd is e.g. -2 then it is closed in packfile_free and an exception might be thrown.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
|
|
|
c4d8df27
|
2012-11-23T15:19:47
|
|
Merge pull request #1097 from nulltoken/topic/head_tree_error
Make `git_repository_head_tree()` return error codes
|
|
826bc4a8
|
2012-11-23T13:31:22
|
|
Remove use of English expletives
Remove words such as fuck, crap, shit etc.
Remove other potentially offensive words from comments.
Tidy up other geopolicital terms in comments.
|
|
|
5cec896a
|
2012-11-22T18:51:06
|
|
repo: Make git_repository_head_tree() return error codes
|
|
|
54be4d57
|
2012-11-20T15:02:06
|
|
Merge pull request #1092 from arrbee/legal-to-not-have-gitconfig
It is okay to not have a .gitconfig file
|
|
|
38f7d026
|
2012-11-20T14:50:36
|
|
Need to clear ignored error from config load
|
|
|
cc6b4162
|
2012-11-20T10:24:18
|
|
It is okay to not have a .gitconfig file
Opening a repo is generating an error if you don't have a
.gitconfig file in your home directory, but that should be
legal.
|
|
cf0dadcf
|
2012-11-20T01:19:31
|
|
Minor optimization in win32 do_lstat
|
|
|
2d96fce2
|
2012-11-19T23:12:20
|
|
update win32 lstat comment
|
|
|
d46b0a04
|
2012-11-19T16:34:44
|
|
Improve iterator ignoring .git file
The workdir iterator has always tried to ignore .git files, but
it turns out there were some bugs. This makes it more robust at
ignoring .git files.
This also makes iterators always check ".git" case insensitively
regardless of the properties of the system. This will make libgit2
skip ".GIT" and the like. This is different from core git, but on
systems with case insensitive but case preserving file systems,
allowing ".GIT" to be added is problematic.
|
|
|
02df42dd
|
2012-11-19T16:33:30
|
|
Set up default internal ignores
This adds "." ".." and ".git" to the internal ignores list by
default - asking about paths with these files will always say
that they are ignored.
|
|
|
52ead787
|
2012-11-19T22:30:20
|
|
Fix win32 lstat
|
|
|
cfeef7ce
|
2012-11-19T13:40:08
|
|
Minor optimization to tree entry validity check
This checks for a leading '.' before looking for the invalid
tree entry names. Even on pretty high levels of optimization,
this seems to make a measurable improvement.
I accidentally used && in the check initially instead of || and
while debugging ended up improving the error reporting of issues
with adding tree entries. I thought I'd leave those changes, too.
|
|
|
0d778b1a
|
2012-11-18T16:52:04
|
|
Catch invalid filenames in append_entry()
This prevents the index api from calling write_tree() with a
bogus tree.
|
|
|
19af78bb
|
2012-11-18T15:15:24
|
|
Prevent creating `..`, `.`, and `.git` with tree builder
As per core git.
|
|
|
4cc7342e
|
2012-11-18T09:07:35
|
|
Indexer: Avoid a possible double-deletion in error case
|
|
0066955d
|
2012-11-18T04:27:49
|
|
Fix a couple of warnings
|
|
|
b15df1d9
|
2012-11-17T18:29:51
|
|
reflog: make entry_byindex() and drop() git compliant
Passing 0 as the index now retrieves the most recent entry instead
of the oldest one.
|
|
|
270160b9
|
2012-11-17T13:39:24
|
|
config: Opening a nonexistent file returns ENOTFOUND
|
|
|
d36451c9
|
2012-11-17T12:34:15
|
|
config: Make git_config_file__ondisk() internal
|
|
|
6091457e
|
2012-11-17T07:19:14
|
|
repo: ensure is_empty() checks there are no refs
|
|
|
aa8a76ef
|
2012-11-17T05:12:14
|
|
tag: rename git_tag_type to git_tag_target_type
|
|
|
86b9dbc1
|
2012-11-17T04:50:48
|
|
Fix MSVC compilation warnings
|
|
|
e087973e
|
2012-11-16T10:27:46
|
|
Merge pull request #1075 from carlosmn/alternates-recurse
odb: recursively load alternates
|
|
|
85e7efa1
|
2012-11-14T13:35:43
|
|
odb: recursively load alternates
The maximum depth is 5, like in git
|
|
|
0cd063fd
|
2012-11-15T23:28:52
|
|
Merge pull request #1071 from arrbee/alternate-fix-strcmp
Win32 fixes for diff/checkout/reset
|
|
|
0ec11828
|
2012-11-16T02:17:57
|
|
Fix -Wmaybe-uninitialized warning
|
|
|
4a0c7f56
|
2012-11-15T10:31:11
|
|
Merge pull request #1074 from edubart/ignore_diff_filemode
Add option to ignore file mode in diffs
|
|
|
c0d5acf6
|
2012-11-15T14:43:21
|
|
Add option to ignore file mode in diffs
|
|
|
bbe6dbec
|
2012-11-14T23:29:48
|
|
Add explicit git_index ptr to diff and checkout
A number of diff APIs and the `git_checkout_index` API take a
`git_repository` object an operate on the index. This updates
them to take a `git_index` pointer explicitly and only fall back
on the `git_repository` index if the index input is NULL. This
makes it easier to operate on a temporary index.
|
|
|
bad68c0a
|
2012-11-13T14:02:59
|
|
Add iterator for git_index object
The index iterator could previously only be created from a repo
object, but this allows creating an iterator from a `git_index`
object instead (while keeping, though renaming, the old function).
|
|
|
5735bf5e
|
2012-11-13T13:58:29
|
|
Fix diff API to better parameter order
The diff API is not in the parameter order one would expect from
other libgit2 APIs. This fixes that.
|
|
|
cccacac5
|
2012-11-14T22:41:51
|
|
Add POSIX compat lstat() variant for win32
The existing p_lstat implementation on win32 is not quite POSIX
compliant when setting errno to ENOTDIR. This adds an option to
make is be compliant so that code (such as checkout) that cares
to have separate behavior for ENOTDIR can use it portably.
This also contains a couple of other minor cleanups in the
posix_w32.c implementations to avoid unnecessary work.
|
|
|
a277345e
|
2012-11-14T22:37:13
|
|
Create internal strcmp variants for function ptrs
Using the builtin strcmp and strcasecmp as function pointers is
problematic on win32. This adds internal implementations and
divorces us from the platform linkage.
|
|
|
7e9f5e65
|
2012-11-13T20:06:15
|
|
Slightly different valgrind fix
Allocate with calloc rather than conditionally memsetting a specific
part of the struct later on.
|
|
|
6132a54e
|
2012-11-13T16:13:10
|
|
Fix a few valgrind errors
|
|
|
513e794e
|
2012-11-13T14:59:18
|
|
Merge pull request #1068 from carlosmn/config-empty-value
Deal with empty and nonexsitent values in config
|
|
|
0da81d2b
|
2012-11-13T14:43:23
|
|
config: return an emtpy string when there is no value
Returning NULL for the string when we haven't signaled an error
condition is counter-intuitive and causes unnecessary edge
cases. Return an empty string when asking for a string value for a
configuration variable such as '[section] var' to avoid these edge
cases.
If the distinction between no value and an empty value is needed, this
can be retrieved from the entry directly. As a side-effect, this
change stops the int parsing functions from segfaulting on such a
variable.
|
|
|
f6c18dda
|
2012-11-13T14:17:41
|
|
http: Unrustle
|