Alan Rogers
35b1471f01
Move the UNREADABLE enums to the correct group.
2014-07-22 11:17:42 +10:00
Alan Rogers
4edd1a036b
Merge remote-tracking branch 'origin/development' into fix-git-status-list-new-unreadable-folder
2014-07-10 19:17:34 -07:00
Carlos Martín Nieto
76f76162b2
remote: update documentation
...
Add docs for git_clone_local_t and move the docs for the
git_clone_options to each field.
2014-06-11 21:20:23 +02:00
Carlos Martín Nieto
17fbf852a5
pathspec: use C guards in header
2014-06-10 03:53:26 +02:00
Carlos Martín Nieto
281da0043c
remote: fix rename docs
2014-06-09 19:35:41 +02:00
Carlos Martín Nieto
4fb32a44f9
Bump version to 0.21.0
...
Bump library version to 0.21.0 and SONAME to 21
2014-06-08 20:01:02 +02:00
Carlos Martín Nieto
9980767205
Change SOVERSION at API breaks
...
Since the SOVERSION doesn't need to follow the library's version and
simply needs to be monotonically increasing whenever we release
something that breaks the ABI, we can set some number and allow multiple
versions of the library to be installed side-by-side.
We start here with the minor version as that's what we release for now,
and it allows to backport this change to earlier versions.
2014-06-08 19:42:54 +02:00
Carlos Martín Nieto
231f350d91
remote: don't free the remote on delete
...
This was a bad idea. Don't free except in the free function.
2014-06-06 22:55:34 +02:00
Carlos Martín Nieto
72bca13e5d
remote: return problem refspecs instead of using a callback
...
There is no reason why we need to use a callback here. A string array
fits better with the usage, as this is not an event and we don't need
anything from the user.
2014-06-06 21:43:04 +02:00
Alan Rogers
9e2d2f30de
Whitespace wibbles.
2014-06-04 15:41:48 -07:00
Alan Rogers
dc49e1b5b3
Merge remote-tracking branch 'origin/development' into fix-git-status-list-new-unreadable-folder
...
Conflicts:
include/git2/diff.h
2014-06-04 15:36:28 -07:00
Alan Rogers
7b491a7dea
GIT_DIFF_INCLUDE_UNREADABLE_AS_UNTRACKED
2014-06-03 17:50:00 -07:00
Alan Rogers
79d5b5c916
Add GIT_STATUS_OPT_INCLUDE_UNREADABLE_AS_UNTRACKED
...
and a (failing) test for it.
2014-06-03 17:42:52 -07:00
Carlos Martín Nieto
dedfc7346b
index: split GIT_IDXENTRY into two flag enums
...
The documentation has shown this as a single enum for a long time. These
should in fact be two enums. One with the bits for the flags and another
with the bits for the extended flags.
2014-06-03 16:05:36 +02:00
Carlos Martín Nieto
11e2665e50
Formatting fixes for the docs
...
These are some issues I found while playing around with the new parser
for docurium.
2014-06-03 16:05:35 +02:00
Alan Rogers
66271925a1
Add GIT_STATUS_OPT_INCLUDE_UNREADABLE
2014-05-30 16:21:49 -07:00
Alan Rogers
a777fc3785
Remove GIT_FILEMODE_NEW as it's unused.
...
And use 0 for GIT_FILEMODE_UNREADABLE.
2014-05-30 16:21:13 -07:00
Vicent Marti
31c551528b
Merge pull request #2011 from libgit2/cmn/clone-local
...
Local clone
2014-05-29 14:50:57 +02:00
Ungureanu Marius
fda73bc5fd
[Blob] Update documentation for is_binary.
...
filter.h tells me that we check the first 8000 bytes.
2014-05-28 22:57:21 +03:00
Carlos Martín Nieto
2614819cf3
clone: allow for linking in local clone
...
If requested, git_clone_local_into() will try to link the object files
instead of copying them.
This only works on non-Windows (since it doesn't have this) when both
are on the same filesystem (which are unix semantics).
2014-05-28 15:40:47 +02:00
Carlos Martín Nieto
c1dbfcbb4a
clone: add flag not to link
2014-05-28 15:40:22 +02:00
Carlos Martín Nieto
121b26738e
clone: add flags to override whether to perform a local clone
2014-05-28 15:40:22 +02:00
Carlos Martín Nieto
4386d80be1
clone: perform a "local clone" when given a local path
...
When git is given such a path, it will perform a "local clone",
bypassing the git-aware protocol and simply copying over all objects
that exist in the source.
Copy this behaviour when given a local path.
2014-05-28 15:40:20 +02:00
Edward Thomson
eff531e103
Modify GIT_MERGE_CONFIG -> GIT_MERGE_PREFERENCE
2014-05-27 20:58:20 -05:00
Edward Thomson
a3622ba6cc
Move GIT_MERGE_CONFIG_* to its own enum
2014-05-27 20:49:20 -05:00
Edward Thomson
d362093f9e
Introduce GIT_MERGE_CONFIG_* for merge.ff settings
...
git_merge_analysis will now return GIT_MERGE_CONFIG_NO_FASTFORWARD
when merge.ff=false and GIT_MERGE_CONFIG_FASTFORWARD_ONLY when
merge.ff=true
2014-05-27 20:49:16 -05:00
Michael Anderson
31b0cb518f
Fixed miscellaneous documentation errors.
2014-05-23 15:57:20 +08:00
Alan Rogers
7c4bbbf46d
Try a value for UNREADABLE that won't get masked out?!
2014-05-23 00:27:34 +10:00
Alan Rogers
86c9d3dae2
Return GIT_FILEMODE_UNREADABLE for files that fail to stat.
2014-05-21 22:54:34 +10:00
Carlos Martín Nieto
d22db24fb7
remote: add api to guess the remote's default branch
...
If the remote supports the symref protocol extension, then we return
that, otherwise we guess with git's rules.
2014-05-21 12:12:32 +02:00
Carlos Martín Nieto
306475eb01
remote: expose the remote's symref mappings
...
Add a symref_target field to git_remote_head to expose the symref
mappings to the user.
2014-05-21 12:12:32 +02:00
Alan Rogers
61bef72dc3
Start adding GIT_DELTA_UNREADABLE and GIT_STATUS_WT_UNREADABLE.
2014-05-20 23:57:40 +10:00
Alan Rogers
9055347944
Rename GIT_ENOACCESS -> GIT_EUNREADABLE
2014-05-20 17:40:28 +10:00
Carlos Martín Nieto
49e369b29d
message: don't assume the comment char
...
The comment char is configurable and we need to provide a way for the
user to specify which comment char they chose for their message.
2014-05-18 10:06:49 +02:00
Vicent Marti
228272ef58
Merge pull request #2313 from libgit2/cmn/remote-delete
...
Remote deletion
2014-05-16 11:56:37 +02:00
Alan Rogers
158c8ba1ee
Return a specific error for EACCES.
2014-05-15 16:54:46 +10:00
Russell Belfer
b1914c3651
Minor fixes for warnings and error propagation
2014-05-12 10:24:46 -07:00
Russell Belfer
d2c4d1c63d
Merge pull request #2188 from libgit2/cmn/config-snapshot
...
Configuration snapshotting
2014-05-12 10:04:52 -07:00
Russell Belfer
45c53eb6cb
Use unsigned type for APIs with opt flag mask
2014-05-08 10:46:04 -07:00
Carlos Martín Nieto
ac99d86ba5
repository: introduce a convenience config snapshot method
...
Accessing the repository's config and immediately taking a snapshot of
it is a common operation, so let's provide a convenience function for
it.
2014-05-07 11:34:32 +02:00
Russell Belfer
5269008cf6
Add filter options and ALLOW_UNSAFE
...
Diff and status do not want core.safecrlf to actually raise an
error regardless of the setting, so this extends the filter API
with an additional options flags parameter and adds a flag so that
filters can be applied with GIT_FILTER_OPT_ALLOW_UNSAFE, indicating
that unsafe filter application should be downgraded from a failure
to a warning.
2014-05-06 16:01:49 -07:00
Russell Belfer
d2c16e9ac4
Doc fixes
2014-05-02 15:15:43 -07:00
Vicent Marti
272b462db7
Merge pull request #2308 from libgit2/rb/diff-update-index-stat-cache
...
Reduce excessive OID calculation for diff and stat
2014-05-02 09:50:15 -07:00
Russell Belfer
9862ef8ef8
Merge pull request #2310 from libgit2/cmn/commit-create-safe
...
commit: safer commit creation with reference update
2014-05-02 09:42:07 -07:00
Russell Belfer
bc91347b58
Fix remaining init_options inconsistencies
...
There were a couple of "init_opts()" functions a few more cases
of structure initialization that I somehow missed.
2014-05-02 09:21:33 -07:00
Russell Belfer
702efc891f
Make init_options fns use unsigned ints and macro
...
Use an unsigned int for the version and add a helper macro so the
code is simplified (and so the error message is a common string).
2014-05-02 09:21:33 -07:00
Russell Belfer
9c8ed49997
Remove trace / add git_diff_perfdata struct + api
2014-05-02 09:21:33 -07:00
Russell Belfer
7a2e56a3f6
Get rid of redundant git_diff_options_init fn
...
Since git_diff_init_options was introduced, remove this old fn.
2014-05-02 09:21:33 -07:00
Russell Belfer
b23b112dfe
Add payloads, bitmaps to trace API
...
This is a proposed adjustment to the trace APIs. This makes the
trace levels into a bitmask so that they can be selectively enabled
and adds a callback-level payload, plus a message-level payload.
This makes it easier for me to a GIT_TRACE_PERF callbacks that
are simply bypassed if the PERF level is not set.
2014-05-02 09:21:33 -07:00
Russell Belfer
cd424ad551
Add GIT_STATUS_OPT_UPDATE_INDEX and use trace API
...
This adds an option to refresh the stat cache while generating
status. It also rips out the GIT_PERF stuff I had an makes use
of the trace API to keep statistics about what happens during diff.
2014-05-02 09:21:33 -07:00