|
56c1cda2
|
2013-11-01T19:22:43
|
|
Clarify parsing issues and errors
|
|
|
7e035908
|
2013-11-01T15:29:25
|
|
Streamline url-parsing logic.
|
|
567649f2
|
2013-11-01T09:38:34
|
|
Merge pull request #1916 from libgit2/simplify-examples
Fix examples to make the important stuff more obvious
|
|
948f00b4
|
2013-11-01T09:38:03
|
|
Merge pull request #1933 from libgit2/vmg/gcc-warnings
Warnings for Windows x64 (MSVC) and GCC on Linux
|
|
73342386
|
2013-11-01T16:55:01
|
|
array: Wrap `array_alloc` as a single statement
|
|
|
51a3dfb5
|
2013-11-01T16:31:02
|
|
pack: `__object_header` always returns unsigned values
|
|
|
d3ed2106
|
2013-11-01T17:08:32
|
|
clar: Fix warnings in GCC/Linux
|
|
|
0bfa7323
|
2013-11-01T17:07:44
|
|
iconv: Do not fake an API when iconv is not available
|
|
|
95352b70
|
2013-11-01T16:55:20
|
|
checkout: Remove unused vector
|
|
3343b5ff
|
2013-10-31T22:59:42
|
|
Fix warning on win64
|
|
|
ac5e507c
|
2013-11-01T09:31:52
|
|
Merge pull request #1918 from libgit2/cmn/indexer-naming
indexer: remove the stream infix
|
|
|
b22593fb
|
2013-11-01T17:28:59
|
|
config_file: Style fixes
|
|
|
653ec420
|
2013-11-01T17:25:32
|
|
Merge remote-tracking branch 'drodriguez/fix-remote-save' into development
|
|
|
4f62d559
|
2013-11-01T05:39:21
|
|
Fix typos
|
|
|
ab44c62e
|
2013-11-01T04:22:12
|
|
Merge pull request #1928 from libgit2/parse-bad-urls
Improve bad URL handling
|
|
c44820c6
|
2013-10-31T23:42:50
|
|
A few formatting changes for rocco
I'm not too happy about manually inserting < and > but those get
output as html tags otherwise.
|
|
376454d0
|
2013-10-31T23:42:04
|
|
Set new multivar values using unmatcheable regexp.
Seems that regexp in Mac OS X and Linux were behaving
differently: while in OS X the empty string didn't
match any value, in Linux it was matching all of them,
so the the second fetch refspec was overwritting the
first one, instead of creating a new one.
Using an unmatcheable regular expression solves the
problem (and seems to be portable).
|
|
|
a71331eb
|
2013-10-31T23:41:48
|
|
Fix memory leaks.
|
|
|
3793fa9b
|
2013-10-31T01:08:50
|
|
Fix saving remotes with several fetch/push ref specs.
At some moment git_config_delete_entry lost the ability to delete one entry of
a multivar configuration. The moment you had more than one fetch or push
ref spec for a remote you will not be able to save that remote anymore. The
changes in network::remote::remotes::save show that problem.
I needed to create a new git_config_delete_multivar because I was not able to
remove one or several entries of a multivar config with the current API.
Several tries modifying how git_config_set_multivar(..., NULL) behaved were
not successful.
git_config_delete_multivar is very similar to git_config_set_multivar, and
delegates into config_delete_multivar of config_file. This function search
for the cvar_t that will be deleted, storing them in a temporal array, and
rebuilding the linked list. After calling config_write to delete the entries,
the cvar_t stored in the temporal array are freed.
There is a little fix in config_write, it avoids an infinite loop when using
a regular expression (case for the multivars). This error was found by the
test network::remote::remotes::tagopt.
|
|
|
76120863
|
2013-10-31T14:48:41
|
|
Update examples/README.md
|
|
|
85c6730c
|
2013-10-31T14:35:32
|
|
Format comments for use with docco
|
|
|
048f837b
|
2013-10-31T13:30:22
|
|
Prevent another segfault from bad URL
|
|
|
887df99f
|
2013-10-31T13:29:16
|
|
Test another bad URL
|
|
|
151b3218
|
2013-10-31T13:16:04
|
|
Prevent segfault with a badly-formed URL
|
|
|
7be5104d
|
2013-10-31T13:15:49
|
|
Add tests for badly-formed URLs
|
|
|
f93f3790
|
2013-10-31T06:35:01
|
|
Merge pull request #1924 from linquize/gmtime
Use gmtime() instead of gmtime_t()
|
|
|
864e7271
|
2013-10-31T20:58:00
|
|
Use gmtime() instead of gmtime_t()
The latter is not available on Windows
|
|
|
ff0ef88c
|
2013-10-30T18:54:39
|
|
Test more kinds of bad url
|
|
|
29b77446
|
2013-10-30T15:38:52
|
|
Initialize variables
|
|
|
dbdb22b3
|
2013-10-30T13:20:08
|
|
Clean up showindex sample
|
|
|
b9d02460
|
2013-10-30T13:07:58
|
|
Reorganize rev-parse example
|
|
|
784b3abb
|
2013-10-30T12:34:03
|
|
rev-list.c example: use common utils, reorganize
|
|
|
cc745341
|
2013-10-30T09:27:36
|
|
Merge pull request #1919 from libgit2/cmn/multi-ack-detailed
protocol: basic support for multi_ack_detailed
|
|
|
1d37da33
|
2013-10-30T16:25:49
|
|
merge: any non-zero return from the user is an error
This fixes #1703.
|
|
|
2f8c481c
|
2013-10-08T16:22:21
|
|
protocol: basic support for multi_ack_detailed
This tells the server that we speak it, but we don't make use of its
extra information to determine if there's a better place to stop
negotiating.
In a somewhat-related change, reorder the capabilities so we ask for
them in the same order as git does.
Also take this opportunity to factor out a fairly-indented portion of
the negotiation logic.
|
|
|
9d83d368
|
2013-10-30T07:21:36
|
|
cat-file.c example: deploy helpers, reorg
|
|
|
dbfd2833
|
2013-10-30T07:21:12
|
|
add.c: proper frontmatter
|
|
|
97d32abb
|
2013-10-30T15:09:32
|
|
Remove leftover function declaration
|
|
|
a6154f21
|
2013-10-30T15:00:05
|
|
indexer: remove the stream infix
It was there to keep it apart from the one which read in from a file on
disk. This other indexer does not exist anymore, so there is no need for
anything other than git_indexer to refer to it.
While here, rename _add() function to _append() and _finalize() to
_commit(). The former change is cosmetic, while the latter avoids
talking about "finalizing", which OO languages use to mean something
completely different.
|
|
|
7cc3c9bf
|
2013-10-30T06:09:08
|
|
init.c example: deploy more helpers
|
|
|
e568bedf
|
2013-10-30T06:08:54
|
|
add.c example: deploy helpers, reorg
|
|
|
04e0c2b2
|
2013-10-30T14:00:44
|
|
pack-objects: Depth can be negative
|
|
|
a8422f92
|
2013-10-30T05:38:12
|
|
init example: deploy helpers, reorg
|
|
|
66902d47
|
2013-10-29T18:30:49
|
|
Extract common example helpers and reorg examples
This reorganizes a few of the examples so that the main function
comes first with the argument parsing extracted into a helper
that can come at the end of the file (so the example focuses more
on the use of libgit2 instead of command line support). This also
creates a shared examples/common.[ch] so that useful helper funcs
can be shared across examples instead of repeated.
|
|
|
5c50f22a
|
2013-10-28T09:25:44
|
|
Merge pull request #1891 from libgit2/cmn/fix-thin-packs
Add support for thin packs
|
|
|
064e6e81
|
2013-10-28T07:05:13
|
|
Merge pull request #1912 from ethomson/push_err_messages
Test for failure, but don't test the error message
|
|
|
5565f3cd
|
2013-10-28T07:04:58
|
|
Merge pull request #1904 from libgit2/cmn/ssh-naming
Rename the ssh credentials
|
|
|
8f4a8b09
|
2013-10-28T06:20:28
|
|
Merge pull request #1802 from libgit2/cmn/reflog-backend
Make reflog part of refdb
|
|
|
a1efa596
|
2013-10-28T04:38:08
|
|
Merge pull request #1915 from zcbenz/common-h-before-config-h
The "common.h" should be included before "config.h".
|
|
157cef10
|
2013-10-28T12:57:15
|
|
The "common.h" should be included before "config.h".
When building libgit2 for ia32 architecture on a x64 machine, including
"config.h" without a "common.h" would result the following error:
C:\Program Files\Microsoft SDKs\Windows\v7.1\include\winbase.h(2288): error C2373: 'InterlockedIncrement' : redefinition; different type modifiers [C:\cygwin\home\zcbenz\codes\git-utils\build\libgit2.vcxproj]
C:\Program Files\Microsoft SDKs\Windows\v7.1\include\winbase.h(2295): error C2373: 'InterlockedDecrement' : redefinition; different type modifiers [C:\cygwin\home\zcbenz\codes\git-utils\build\libgit2.vcxproj]
C:\Program Files\Microsoft SDKs\Windows\v7.1\include\winbase.h(2303): error C2373: 'InterlockedExchange' : redefinition; different type modifiers [C:\cygwin\home\zcbenz\codes\git-utils\build\libgit2.vcxproj]
C:\Program Files\Microsoft SDKs\Windows\v7.1\include\winbase.h(2314): error C2373: 'InterlockedExchangeAdd' : redefinition; different type modifiers [C:\cygwin\home\zcbenz\codes\git-utils\build\libgit2.vcxproj]
|
|
|
d4831b71
|
2013-10-26T04:34:23
|
|
Merge pull request #1913 from nvloff/remove_fedora_spec
remove rpm spec file and readme
|
|
dbc45b88
|
2013-10-26T09:13:29
|
|
remove rpm spec
Fedora provides a rpm package for libgit2 -
https://apps.fedoraproject.org/packages/libgit2.
|
|
9d41984c
|
2013-10-25T14:14:22
|
|
Test for failure, but don't test the error message
|
|
|
8607286b
|
2013-10-25T10:38:30
|
|
Merge pull request #1910 from ethomson/disable_winhttp
Allow -DWINHTTP=OFF to disable WinHTTP
|
|
|
8f2fe55e
|
2013-10-25T10:37:37
|
|
Merge pull request #1911 from ethomson/http_headers
Use two calls to set two headers
|
|
|
df9fc82e
|
2013-10-25T13:33:42
|
|
Use two calls to set two headers
|
|
|
1bfe7133
|
2013-10-25T13:23:46
|
|
Allow -DWINHTTP=OFF to disable WinHTTP
|
|
|
fd5d80d2
|
2013-10-24T07:45:54
|
|
Merge pull request #1907 from nikai3d/patch-1
fix typos in README.md
|
|
63d1fad4
|
2013-10-24T15:30:31
|
|
fix typos in README.md
|
|
474c8cf8
|
2013-10-23T22:49:52
|
|
Really fix the pc file
It turns out that variables have function scope by default. Let's
really set -liconv and add a few libraries that were forgotten in
the previous commit.
We also need to special-case OSX, as they ship zlib but do not provide
a pkg-config file for it.
|
|
|
3fcb1d83
|
2013-10-23T08:18:56
|
|
Merge pull request #1905 from libgit2/cmn/list-deps
Be explicit about dependencies
|
|
|
9a5f2118
|
2013-10-23T08:17:56
|
|
Merge pull request #1906 from libgit2/cmn/net-cb-errors
transport: let the progress output return an error
|
|
|
5cb13670
|
2013-10-23T15:45:29
|
|
transport: let the progress output return an error
There are any number of issues that can come up in the progress
callback, and we should let the user cancel at that point as well.
|
|
|
ab46b1d8
|
2013-10-23T15:08:18
|
|
indexer: include the delta stats
The user is unable to derive the number of deltas in the pack, as that
would require them to capture the stats exactly in the moment between
download and final processing, which is abstracted away in the fetch.
Capture these numbers for the user and expose them in the progress
struct. The clone and fetch examples now also present this information
to the user.
|
|
|
ebbd48f0
|
2013-10-23T14:22:44
|
|
examples: show used local objects in fetch
Show how many local objects were used to fix the thin pack in our fetch
example.
|
|
|
2baee9f8
|
2013-10-23T13:17:51
|
|
README: add a note about the optional dependencies
|
|
|
1ecda61e
|
2013-10-23T12:58:56
|
|
Set the correct dependencies in the pkg-config file
When linking statically, the including project needs to know what the
current library build depends on so they can link to it. Store this
information in the pkg-config file.
While here, remove claims that users need to link to zlib or libcrypto.
|
|
|
70a8c78f
|
2013-10-23T12:08:54
|
|
Rename the ssh credentials
The names from libssh2 are somewhat obtuse for us. We can simplify the
usual key/passphrase credential's name, as well as make clearer what the
custom signature function is.
|
|
|
1c74686e
|
2013-10-22T11:55:54
|
|
Merge pull request #1897 from libgit2/split-patch-from-diff
RFC: Proposed reworking of diff APIs
|
|
|
7ce60099
|
2013-10-22T11:12:44
|
|
Fix typo
|
|
|
98fec8a9
|
2013-10-22T16:05:47
|
|
Implement `git_odb_object_dup`
|
|
|
5de4ec81
|
2013-10-21T15:36:38
|
|
Implement patience and minimal diff flags
It seems that to implement these options, we just have to pass
the appropriate flags through to the libxdiff code taken from
core git. So let's do it (and add a test).
|
|
|
623460ab
|
2013-10-21T14:16:53
|
|
Fix warnings for win64
|
|
|
3b5f7954
|
2013-10-21T13:42:42
|
|
Create git_diff_line and extend git_diff_hunk
Instead of having functions with so very many parameters to pass
hunk and line data, this takes the existing git_diff_hunk struct
and extends it with more hunk data, plus adds a git_diff_line.
Those structs are used to pass back hunk and line data instead of
the old APIs that took tons of parameters.
Some work that was previously only being done for git_diff_patch
creation (scanning the diff content for exact line counts) is now
done for all callbacks, but the performance difference should not
be noticable.
|
|
|
86774742
|
2013-10-21T13:06:27
|
|
Merge pull request #1903 from ethomson/ssh
Allowed credential types should be a bitfield
|
|
2648dc1a
|
2013-10-21T11:03:31
|
|
Allowed credential types should be a bitfield
|
|
|
74a627f0
|
2013-10-21T09:07:19
|
|
Tweak to git_diff_delta structure for nfiles
While the base git_diff_delta structure always contains two files,
when we introduce conflict data, it will be helpful to have an
indicator when an additional file is involved.
|
|
|
901c34f2
|
2013-10-18T10:00:26
|
|
Merge pull request #1900 from haneefmubarak/patch-1
license clarification + formatting all over
|
|
caf93341
|
2013-10-17T16:01:43
|
|
slightly clarified the "license" portion of `README.md" + formatting all over
fixed typo `can can` -> `can`
|
|
|
e5e2710b
|
2013-10-17T01:52:20
|
|
slightly clarified the "license" portion of `README.md" + formatting all over
added the second change suggested by @nulltoken (with two extra words :) )
|
|
|
20b5d300
|
2013-10-17T00:28:08
|
|
slightly clarified the "license" portion of `README.md" + formatting all over
There are commercial open source applications, hence proprietary seems to be a better term.
Also:
- Trimmed header `=`'s to match text length
- made libgit2 stand out everywhere
- pretty printing links
- irc link for those with the correct setup
|
|
|
b2c9e41a
|
2013-10-16T13:51:24
|
|
Merge pull request #1702 from ethomson/checkout_merge
Checkout merge
|
|
|
c929d6b7
|
2013-10-09T18:26:42
|
|
Move path prefixed help to path.h
|
|
|
7fa73de1
|
2013-09-23T17:52:40
|
|
Move functions in checkout_conflicts to checkout.c
It seemed exceptionally silly to have a split there
where no split needed to be.
|
|
|
216f97e4
|
2013-09-23T09:47:47
|
|
Two-step conflict checkout (load / perform)
Move conflict handling into two steps: load the conflicts and
then apply the conflicts. This is more compatible with the
existing checkout implementation and makes progress reporting
more sane.
|
|
|
cfae7f85
|
2013-08-09T20:23:36
|
|
Honor UPDATE_ONLY bit when checking out conflicts
|
|
|
6f8cc7bb
|
2013-08-05T20:06:09
|
|
Fix warning, fix memory leak
|
|
|
e47f859d
|
2013-08-08T16:46:49
|
|
Don't overwrite ~ files checking out conflicts
If a D/F conflict or rename 2->1 conflict occurs,
we write the file sides as filename~branchname. If
a file with that name already exists in the working
directory, write as filename~branchname_0 instead.
(Incrementing 0 until a unique filename is found.)
|
|
|
fc36800e
|
2013-08-08T13:16:13
|
|
Get rid of some quick hacks
|
|
|
96d799aa
|
2013-07-23T15:32:42
|
|
checkout rename conflicts
rename conflict tests for checkout conflicts, don't suffix filenames
when checking out with USE_OURS or USE_THEIRS
|
|
|
4f7897ab
|
2013-07-22T08:51:29
|
|
Prevent checkout_tree when conflicts exist, clear NAME on checkout tree
Prevent checkout tree when unresolved changes exist (unless FORCE flag
is specified). Clear NAME table when checking out, to avoid
checkout_conflicts from attempting to manipulate it. Ensure that NAME
is also cleared at reset.
|
|
|
629b661c
|
2013-07-17T09:49:56
|
|
checkout (from index) can write conflicts
|
|
|
3acf44d6
|
2013-07-17T09:43:32
|
|
tests for checkout index with conflicts
|
|
|
10672e3e
|
2013-10-15T15:10:07
|
|
Diff API cleanup
This lays groundwork for separating formatting options from diff
creation options. This groups the formatting flags separately
from the diff list creation flags and reorders the options. This
also tweaks some APIs to further separate code that uses patches
from code that just looks at git_diffs.
|
|
|
3ff1d123
|
2013-10-11T14:51:54
|
|
Rename diff objects and split patch.h
This makes no functional change to diff but renames a couple of
the objects and splits the new git_patch (formerly git_diff_patch)
into a new header file.
|
|
|
2c2b0ebb
|
2013-10-11T09:47:05
|
|
Merge pull request #1562 from libgit2/cmn/refs-namespace-lookup
Provide the user with a more useful error code when a looking up a reference which name points to a namepace
|
|
|
893055f2
|
2013-10-11T17:24:29
|
|
indexer: clearer stats for thin packs
Don't increase the number of total objects, as it can produce
suprising progress output. The only addition compared to pre-thin is
the addition of local_objects to allow an output similar to git's
"completed with %d local objects".
|
|
|
7c9f5bec
|
2013-08-17T07:11:31
|
|
futils: return GIT_ENOTFOUND when trying to read a directory
This lets the reference code return not-found when the user asks to
look up a reference when in fact they pass a namespace.
|
|
|
4d43e630
|
2013-10-10T15:29:57
|
|
Merge pull request #1898 from arthurschreiber/patch-2
Fix a typo in the rpm build instructions.
|
|
84c46981
|
2013-10-11T00:06:08
|
|
Fix a typo in the rpm build instructions.
|