|
7c3834d1
|
2015-03-24T10:18:44
|
|
Merge pull request #3010 from ethomson/checkout_invalid_path_err
checkout: report correct invalid path
|
|
3cda9cf2
|
2015-03-23T11:30:30
|
|
checkout: report correct invalid path
|
|
|
2a0f67f0
|
2015-03-21T21:48:03
|
|
git: make sure to close the network stream
In case of a bad url or other error during the connection setup, we
close the stream via free.
|
|
a3f693e9
|
2015-03-20T16:57:32
|
|
Merge pull request #3003 from shawnl/master
fix changelog
|
|
b8c50808
|
2015-03-20T10:18:12
|
|
fix changelog
|
|
|
8311db0c
|
2015-03-19T15:10:58
|
|
Merge pull request #3000 from libgit2/vmg/mkdir-ext
mkdir-ext: Assume directories don't exist; fix all race cases
|
|
d88e6e9b
|
2015-03-19T18:38:13
|
|
mkdir-ext: Retry lstat on EEXIST race
|
|
|
2c4e90f3
|
2015-03-19T01:03:41
|
|
Merge pull request #2996 from ethomson/dll_comments
win32 resource: allow custom comments field in DLL
|
|
|
523526e5
|
2015-03-18T18:25:14
|
|
win32 resource: allow custom comments field in DLL
|
|
|
89ba9f1a
|
2015-03-18T13:17:04
|
|
Merge pull request #2967 from jacquesg/merge-whitespace
Allow merges of files (and trees) with whitespace problems/fixes
|
|
|
7568bdf4
|
2015-03-18T05:04:50
|
|
Merge pull request #2993 from ethomson/clar_update
clar: update to 08f434d
|
|
|
03b51b5d
|
2015-03-18T05:04:12
|
|
Merge pull request #2955 from git-up/update_tips_fixes
Update tips fixes
|
|
|
83ad46f7
|
2015-03-18T04:59:16
|
|
Merge remote-tracking branch 'ethomson/submodule_8dot3'
|
|
|
4c2e6b1e
|
2015-03-17T23:35:52
|
|
Merge pull request #2985 from claudiuolteanu/patch-1
Lower case the include directive of windows header
|
|
|
fa8a38a4
|
2015-03-17T22:22:38
|
|
Merge pull request #2983 from jeffhostetler/jeffhostetler/perf_merge_lazy_binary_check
PERF: In MERGE, lazily compute is_binary
|
|
|
08c29c44
|
2015-03-17T19:04:48
|
|
clar: update to 08f434d
|
|
|
f0593a6b
|
2015-03-17T18:35:28
|
|
Merge pull request #2991 from sba1/fix-uninitialized-data-access-remote-update-tips
Initialize refs vector in git_remote_update_tips().
|
|
cdedef40
|
2015-03-17T21:38:58
|
|
Initialize refs vector in git_remote_update_tips().
Otherwise, bailing out early when ls_to_vector() fails accesses
uninitialized memory.
|
|
70b0f128
|
2015-03-17T16:34:36
|
|
Added changelog entries for whitespace and patience merges.
|
|
|
9bbc8f35
|
2015-03-17T10:21:28
|
|
Merge pull request #2962 from libgit2/cmn/reflog-annotated
Add annotated versions of ref-modying functions
|
|
|
7800048a
|
2015-03-17T10:06:50
|
|
Merge pull request #2972 from libgit2/cmn/pack-objects-walk
[WIP] Smarter pack-building
|
|
|
828e5959
|
2015-03-17T09:44:56
|
|
Merge pull request #2982 from libgit2/cmn/stream-check-ec
Don't ask for a stream's certificate unless it's encrypted
|
|
|
c07d0206
|
2015-03-17T09:44:25
|
|
Merge pull request #2977 from pks-t/submodule-sync-url-fix
Fix git_submodule_sync writing URL to wrong key.
|
|
118e6fdc
|
2015-03-16T23:08:16
|
|
Lower case the include directive of windows header
Since the Linux platform has a case sensitive file system, the header name should be lower case for cross compiling purposes. (On Linux, the mingw header is called ```windows.h```).
|
|
fea24c53
|
2015-03-16T15:54:53
|
|
PERF: In MERGE, lazily compute is_binary
|
|
|
84d83b8e
|
2015-03-16T19:41:50
|
|
http: do not try to use the cert callback on unencrypted streams
When the user has a certificate check callback set, we still have to
check whether the stream we're using is even capable of providing a
certificate.
In the case of an unencrypted certificate, do not ask for it from the
stream, and do not call the callback.
|
|
|
29e7ae5d
|
2015-03-16T19:39:05
|
|
Add failing test for cert callback with non-ecrypted stream
When we have an HTTP stream and have set the certificatre check
callback, we currently fail as we ask the unencrypted stream for its
certificate.
|
|
|
8acf058f
|
2015-03-07T12:09:41
|
|
CHANGELOG: add notes about the annotated ref-modifying functions
|
|
|
a5815a2a
|
2015-03-07T00:30:40
|
|
Add tests for the annotated versions of ref-modifying functions
This also brings the soft-reset tests back to life. The function name
was missing an underscore, meaning they had not been running.
|
|
|
62dd4d71
|
2015-03-07T00:06:02
|
|
annotated_commit: provide a constructor from a revspec
This extra constructor will be useful for the annotated versions of
ref-modifying functions, as it allows us to create a commit with the
extended sha syntax which was used to retrieve it.
|
|
|
62d38a1d
|
2015-03-06T23:51:40
|
|
Add annotated commit versions of reflog-modifying functions
We do not always want to put the id directly into the reflog, but we
want to speicfy what a user typed. For this use-case we provide
annotated version of a few functions which let the caller specify what
user-friendly name was used when asking for the operation.
|
|
|
74c37c2a
|
2015-03-12T13:16:09
|
|
Added options to enable patience and minimal diff drivers
|
|
|
13de9363
|
2015-03-12T12:36:09
|
|
Collapse whitespace flags into git_merge_file_flags_t
|
|
|
f29dde68
|
2015-03-12T12:29:47
|
|
Renamed git_merge_options 'flags' to 'tree_flags'
|
|
|
0f24cac2
|
2015-03-09T17:03:03
|
|
Added tests to merge files and branches with whitespace problems and fixes
|
|
|
45a86bbf
|
2015-03-09T17:02:52
|
|
Allow for merges with whitespace discrepancies
|
|
|
d675982a
|
2015-03-15T00:24:36
|
|
Merge pull request #2975 from git-up/diff_index_retain
Avoid retaining / releasing the index more than necessary when GIT_DIFF_...
|
|
|
7c63a33f
|
2015-03-13T19:41:40
|
|
indexer: bring back the error message on duplcate commits
It turns out that erroring out on duplicate commits is the right thing
to do, but git was not hitting the bug on the server-side.
Bring back a descriptive error message in case of duplicate entries and
error out.
|
|
|
dccf59ad
|
2015-03-13T18:28:07
|
|
indexer: don't worry about duplicate objects
If a packfile includes duplicate objects, we can choose to use the
secon copy instead of the first by using the same logic as if it were
the first.
Change the error condition from 0 to -1, which indicates a bad resize,
and set the OOM message in that case.
This does mean we will leak the first copy of the object. We can deal
with that later, but making fetches work is more important.
|
|
|
a34692c4
|
2015-03-13T18:00:15
|
|
indexer: set an error message on duplicate objects in pack
While this is not even close to a fix, we can at least set an error
message so we know which error we are facing. Up to know we just
returned an error without a message.
|
|
|
e5e2c11d
|
2015-03-13T17:52:07
|
|
Put back the number of expected references to 6 from the test repo
This was but down to 5 when GitHub made a change to their server which
made them stop honouring the include-tag request.
This has recently been corrected, so we can bring it back up to six.
|
|
|
12e1fff7
|
2015-03-12T18:04:25
|
|
Merge pull request #2973 from libgit2/cmn/local-pack-threading
local: create pack with multiple threads
|
|
e6903ea2
|
2015-03-12T16:05:07
|
|
Fix git_submodule_sync writing URL to wrong key.
Currently git_submodule_sync writes the submodule's URL to the
key 'branch.<REMOTE_NAME>.remote' while the reference
implementation of `git submodule sync` writes to
'remote.<REMOTE_NAME>.url', which is the intended behavior
according to git-submodule(1).
|
|
8a3934e4
|
2015-03-11T19:29:36
|
|
Avoid retaining / releasing the index more than necessary when GIT_DIFF_UPDATE_INDEX is enabled
|
|
|
1034f1b5
|
2015-03-05T23:06:31
|
|
Fixed active refspecs not reset by git_remote_upload()
|
|
|
e22ffb42
|
2015-03-05T22:13:54
|
|
Fixed update_tips callback called for failed pushed references
The current implementation does not set 'fire_callback' back to 0 for failed updates so the callback still fires.
Instead of adding yet another condition check to set 'fire_callback' to 0 if needed, considering this function should be a no-op for failed updates anyway, the best fix is to simplify its logic to check upfront if the update is a failed one.
|
|
|
15f58174
|
2015-03-11T17:55:39
|
|
Merge commit 'refs/pull/2879/head' of ssh://github.com/libgit2/libgit2
|
|
|
0ef54a63
|
2015-03-11T17:16:39
|
|
local: create pack with multiple threads
The default behaviour for the packbuilder is to perform the work in a
single thread, which is fine for the public API, but we currently have
no way for a user to determine the number of threads to use when
creating the packfile, which makes our clone behaviour over the
filesystem quite a bit slower than what git offers.
This is a very particular scenario, in which we avoid spawning git by
being ourselves the server-side, so it's probably ok to auto-set the
threading, as the upload-pack process would do if we were talking to
git.
|
|
|
61ccba0d
|
2015-03-11T16:13:31
|
|
Merge pull request #2969 from adrienthebo/remote_add_invalid_refspec
refspec: report errors when parsing an invalid refspec
|
|
|
522df1cf
|
2015-03-11T03:03:54
|
|
Merge pull request #2970 from ethomson/inmemory_bare
"In-memory" repos are bare by default
|
|
|
e68b31a1
|
2015-03-04T20:57:52
|
|
local: let the packbuilder perform smarter object insertion
Currently we use the most naïve and inefficient method for figuring out
which objects to send to the remote whereby we end up trying to insert
subdirs which have not changed multiple times.
Instead, make use of the packbuilder's built-in more efficient method
which uses the walk to feed the object list and avoids inserting an
object and its descendants.
|
|
|
04a36fef
|
2014-10-11T15:48:29
|
|
pack-objects: fill a packbuilder from a walk
Most use-cases for the object packer communicate in terms of commits
which each side has. We already have an object to specify this
relationship between commits, namely git_revwalk.
By knowing which commits we want to pack and which the other side
already has, we can perform similar optimisations to git, by marking
each tree as interesting or uninteresting only once, and not sending
those trees which we know the other side has.
|
|
|
b63b76e0
|
2014-10-12T11:42:31
|
|
Reorder some khash declarations
Keep the definitions in the headers, while putting the declarations in
the C files. Putting the function definitions in headers causes
them to be duplicated if you include two headers with them.
|
|
|
c23f9005
|
2015-03-11T02:14:22
|
|
Merge pull request #2971 from ethomson/revert_fastfail
Revert "fastfail" from the mingw PR
|
|
|
70c735e1
|
2015-03-10T16:49:24
|
|
repository_new: test its bareness
|
|
b523194d
|
2015-03-04T13:29:13
|
|
refspec: set err message on invalid refspec
If a refspec could not be parsed, the git_refspec__parse function would
return an error value but would not provide additional error information
for the callers. This commit amends that function to set a more useful
error message.
|
|
|
9a08b319
|
2015-03-10T16:08:44
|
|
Revert "add fast-fail feature for pending builds in PR's"
This reverts commit 8008ab6a4158416d095212c9782fa1622ef994a5.
|
|
|
3e329861
|
2015-03-10T16:08:34
|
|
Revert "Implement fail-fast for Travis as well"
This reverts commit ba6c53b91b1d9c9dc49b7c0d8e8efbd9842c31dc.
|
|
|
770aca94
|
2015-03-10T15:02:02
|
|
repository: in-memory repos are bare by default
|
|
|
d7c81945
|
2015-03-09T10:18:39
|
|
Merge pull request #2964 from git-up/fixes
Fixes
|
|
|
959482e1
|
2015-03-09T09:18:37
|
|
Merge pull request #2946 from tkelman/appveyor-mingw
RFC: add mingw to appveyor matrix
|
|
|
2461e0d2
|
2015-03-08T14:10:02
|
|
Removed unnecessary GIT_CHECKOUT_SKIP_UNMERGED for GIT_RESET_HARD
|
|
|
b5ab878f
|
2015-03-08T14:09:50
|
|
Fixed build warning
|
|
|
d77a4f94
|
2015-03-08T19:58:51
|
|
Merge pull request #2963 from libgit2/cmn/rename-reflog
refdb: use the same id for old and new when renaming a reference
|
|
|
d578b45f
|
2015-03-08T16:46:33
|
|
refdb: use the same id for old and new when renaming a reference
When we rename a reference, we want the old and new ids to be the same
one (as we did not change it). The normal code path looks up the old id
from the current value of the brtanch, but by the time we look it up, it
does not exist anymore and thus we write a zero id.
Pass the old id explicitly instead.
|
|
|
01c3b184
|
2015-03-06T16:52:07
|
|
Merge pull request #2961 from ethomson/filter_relative_paths
Filter relative paths
|
|
|
91de1b09
|
2015-03-06T22:44:15
|
|
Merge pull request #2950 from libgit2/ntk/reflog_branch_create
branch: fix generated reflog message upon creation
|
|
|
6a2edc5a
|
2015-03-06T15:16:40
|
|
filter: accept relative paths in apply_to_file
|
|
|
0b3dd8fb
|
2015-03-06T15:16:05
|
|
filter::file tests: test filter_list_apply_to_file
Test that filter_list_apply_to_file works and can accept repo-relative
paths.
|
|
78c34af0
|
2015-03-06T12:23:14
|
|
Use secure API if available.
|
|
04c5a9c0
|
2015-03-05T19:42:54
|
|
Add some missing definitions for mingw.org
these shouldn't be necessary if _WIN32_WINNT >= _WIN32_WINNT_VISTA
|
|
|
1a7ea63d
|
2015-03-05T17:11:17
|
|
Move definitions of strcasecmp and strncasecmp to msvc-compat.h
should cut down on compiler warnings with mingw
|
|
|
9a823bad
|
2015-03-06T14:37:34
|
|
filter: drop old TODO
|
|
|
2326ea68
|
2015-03-05T16:14:17
|
|
Allow failures on mingw for now
|
|
|
06353282
|
2015-03-05T15:48:08
|
|
Only run -ionline tests IF (WINHTTP OR OPENSSL_FOUND)
|
|
|
4c88fd7c
|
2015-03-04T11:31:24
|
|
Add MinGW-w64 to matrix
cache mingw-w64 downloads
quiet curl and 7zip
run appveyor steps in cmd for mingw
|
|
05e644dd
|
2015-03-04T22:01:39
|
|
Drop trailing whitespaces
|
|
|
7eb76734
|
2015-03-04T22:01:20
|
|
branch: fix generated reflog message upon renaming
|
|
|
015d4b7b
|
2015-03-04T21:48:54
|
|
branch: fix generated reflog message upon creation
|
|
|
ba6c53b9
|
2015-03-03T21:07:12
|
|
Implement fail-fast for Travis as well
|
|
|
8008ab6a
|
2015-03-03T17:03:07
|
|
add fast-fail feature for pending builds in PR's
|
|
|
ac5fad27
|
2015-03-03T10:53:26
|
|
add mingw to appveyor matrix
use MSYS makefiles generator
add bash script for running mingw on appveyor
add --login and fix run paths
use msys style path to appveyor-mingw.sh
add mingw path to /etc/fstab
|
|
|
bdf0e734
|
2015-03-04T14:55:56
|
|
Merge pull request #2932 from jeffhostetler/jeffhostetler/big_clone_crash
Fix crash in git_clone on extremely large repos
|
|
|
107958d7
|
2015-03-04T14:53:02
|
|
Merge branch 'tls_data'
|
|
|
8e851c1e
|
2015-03-03T16:41:59
|
|
libgit2_shutdown: free TLS data (win32)
Free TLS data on thread exit (win32)
|
|
|
83fe60fa
|
2015-03-03T14:10:50
|
|
libgit2_shutdown: clear err message on shutdown
Clear the error message on git_libgit2_shutdown for all versions of
the library (no threads and Win32 threads). Drop the giterr_clear
in clar, as that shouldn't be necessary.
|
|
3a8b69d1
|
2015-02-26T11:47:07
|
|
Fix leak of TLS error message in shutdown (ptherad version)
|
|
|
814d86bf
|
2015-03-04T14:32:23
|
|
Merge pull request #2886 from jeffhostetler/jeffhostetler/clar_trace
Set up git_trace in clar test suite.
|
|
|
c69c042e
|
2015-03-04T12:47:59
|
|
Merge pull request #2945 from ethomson/empty_hashsig_heap
diff_tform: don't compare empty hashsig_heaps
|
|
|
f78d9b6c
|
2015-03-03T23:56:54
|
|
diff_tform: account for whitespace options
When comparing seemingly blank files, take whitespace options into
account.
|
|
|
fe21d708
|
2015-03-04T00:29:37
|
|
Plug a few leaks
|
|
|
a212716f
|
2015-03-03T18:19:42
|
|
diff_tform: don't compare empty hashsig_heaps
Don't try to compare two empty hashsig_heaps.
|
|
|
9ce97782
|
2015-03-03T17:59:44
|
|
Merge pull request #2941 from libgit2/cmn/http-enforce-cred
http: enforce the credential types
|
|
|
f438dbe1
|
2015-03-03T17:59:20
|
|
Merge pull request #2771 from libgit2/cmn/config-borrow-entry
Borrowing configuration entries
|
|
|
d8be5087
|
2015-03-03T13:35:10
|
|
Change ifdef for MINGW32.
|
|
|
9a97f49e
|
2014-12-21T15:31:03
|
|
config: borrow refcounted references
This changes the get_entry() method to return a refcounted version of
the config entry, which you have to free when you're done.
This allows us to avoid freeing the memory in which the entry is stored
on a refresh, which may happen at any time for a live config.
For this reason, get_string() has been forbidden on live configs and a
new function get_string_buf() has been added, which stores the string in
a git_buf which the user then owns.
The functions which parse the string value takea advantage of the
borrowing to parse safely and then release the entry.
|
|
|
e892b6a9
|
2015-03-03T17:23:01
|
|
http: enforce the credential types
The user may decide to return any type of credential, including ones we
did not say we support. Add a check to make sure the user returned an
object of the right type and error out if not.
|
|
|
76f03418
|
2015-03-03T17:04:38
|
|
Remove swp files
|
|
|
20273e4d
|
2015-03-03T10:08:51
|
|
Merge pull request #2934 from akikoskinen/mingw_build_fix
Fix build on mingw (master branch)
|
|
|
018fdbb5
|
2015-03-03T10:08:28
|
|
Merge pull request #2913 from ethomson/stash_fixup
stash: correctly stash wd modified/index deleted
|