Carlos Martín Nieto
b63b76e0b0
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.
2015-03-11 02:36:11 +01:00
Carlos Martín Nieto
c23f90053d
Merge pull request #2971 from ethomson/revert_fastfail
...
Revert "fastfail" from the mingw PR
2015-03-11 02:14:22 +01:00
Edward Thomson
70c735e190
repository_new: test its bareness
2015-03-10 16:49:24 -04:00
Adrien Thebo
b523194d21
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.
2015-03-10 13:31:26 -07:00
Edward Thomson
9a08b3196f
Revert "add fast-fail feature for pending builds in PR's"
...
This reverts commit 8008ab6a41
2015-03-10 16:08:44 -04:00
Edward Thomson
3e32986114
Revert "Implement fail-fast for Travis as well"
...
This reverts commit ba6c53b91b
2015-03-10 16:08:34 -04:00
Edward Thomson
770aca94bd
repository: in-memory repos are bare by default
2015-03-10 15:02:02 -04:00
Edward Thomson
d7c81945b0
Merge pull request #2964 from git-up/fixes
...
Fixes
2015-03-09 10:18:39 -04:00
Edward Thomson
959482e104
Merge pull request #2946 from tkelman/appveyor-mingw
...
RFC: add mingw to appveyor matrix
2015-03-09 09:18:37 -04:00
Pierre-Olivier Latour
2461e0d20f
Removed unnecessary GIT_CHECKOUT_SKIP_UNMERGED for GIT_RESET_HARD
2015-03-08 14:10:02 -07:00
Pierre-Olivier Latour
b5ab878f4c
Fixed build warning
2015-03-08 14:09:50 -07:00
Carlos Martín Nieto
d77a4f943e
Merge pull request #2963 from libgit2/cmn/rename-reflog
...
refdb: use the same id for old and new when renaming a reference
2015-03-08 19:58:51 +01:00
Carlos Martín Nieto
d578b45f3f
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.
2015-03-08 16:50:27 +01:00
Edward Thomson
01c3b184d3
Merge pull request #2961 from ethomson/filter_relative_paths
...
Filter relative paths
2015-03-06 16:52:07 -05:00
Carlos Martín Nieto
91de1b0937
Merge pull request #2950 from libgit2/ntk/reflog_branch_create
...
branch: fix generated reflog message upon creation
2015-03-06 22:44:15 +01:00
Edward Thomson
6a2edc5a11
filter: accept relative paths in apply_to_file
2015-03-06 15:16:40 -05:00
Edward Thomson
0b3dd8fbed
filter::file tests: test filter_list_apply_to_file
...
Test that filter_list_apply_to_file works and can accept repo-relative
paths.
2015-03-06 15:16:05 -05:00
Matti Virolainen
78c34af016
Use secure API if available.
2015-03-06 12:07:54 -08:00
Tony Kelman
04c5a9c083
Add some missing definitions for mingw.org
...
these shouldn't be necessary if _WIN32_WINNT >= _WIN32_WINNT_VISTA
2015-03-06 12:07:05 -08:00
Tony Kelman
1a7ea63d22
Move definitions of strcasecmp and strncasecmp to msvc-compat.h
...
should cut down on compiler warnings with mingw
2015-03-06 12:07:05 -08:00
Edward Thomson
9a823badbf
filter: drop old TODO
2015-03-06 14:37:41 -05:00
Tony Kelman
2326ea68b5
Allow failures on mingw for now
2015-03-05 18:12:32 -08:00
Tony Kelman
063532825c
Only run -ionline tests IF (WINHTTP OR OPENSSL_FOUND)
2015-03-05 15:48:08 -08:00
Tony Kelman
4c88fd7ce6
Add MinGW-w64 to matrix
...
cache mingw-w64 downloads
quiet curl and 7zip
run appveyor steps in cmd for mingw
2015-03-04 16:52:37 -08:00
nulltoken
05e644dd7e
Drop trailing whitespaces
2015-03-04 22:09:51 +01:00
nulltoken
7eb7673406
branch: fix generated reflog message upon renaming
2015-03-04 22:09:49 +01:00
nulltoken
015d4b7b38
branch: fix generated reflog message upon creation
2015-03-04 22:09:44 +01:00
Tony Kelman
ba6c53b91b
Implement fail-fast for Travis as well
2015-03-04 11:29:44 -08:00
Tony Kelman
8008ab6a41
add fast-fail feature for pending builds in PR's
2015-03-04 11:29:44 -08:00
Tony Kelman
ac5fad2780
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
2015-03-04 11:29:40 -08:00
Carlos Martín Nieto
bdf0e73450
Merge pull request #2932 from jeffhostetler/jeffhostetler/big_clone_crash
...
Fix crash in git_clone on extremely large repos
2015-03-04 14:55:56 +01:00
Carlos Martín Nieto
107958d717
Merge branch 'tls_data'
2015-03-04 14:53:02 +01:00
Edward Thomson
8e851c1e8c
libgit2_shutdown: free TLS data (win32)
...
Free TLS data on thread exit (win32)
2015-03-04 14:48:46 +01:00
Edward Thomson
83fe60fa1b
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.
2015-03-04 14:48:46 +01:00
Leo Yang
3a8b69d13d
Fix leak of TLS error message in shutdown (ptherad version)
2015-03-04 14:47:57 +01:00
Carlos Martín Nieto
814d86bfe3
Merge pull request #2886 from jeffhostetler/jeffhostetler/clar_trace
...
Set up git_trace in clar test suite.
2015-03-04 14:32:23 +01:00
Carlos Martín Nieto
c69c042e0e
Merge pull request #2945 from ethomson/empty_hashsig_heap
...
diff_tform: don't compare empty hashsig_heaps
2015-03-04 12:47:59 +01:00
Edward Thomson
f78d9b6cfe
diff_tform: account for whitespace options
...
When comparing seemingly blank files, take whitespace options into
account.
2015-03-04 00:01:34 -05:00
Carlos Martín Nieto
fe21d708b0
Plug a few leaks
2015-03-04 00:29:37 +01:00
Edward Thomson
a212716fc3
diff_tform: don't compare empty hashsig_heaps
...
Don't try to compare two empty hashsig_heaps.
2015-03-03 18:19:42 -05:00
Edward Thomson
9ce97782b4
Merge pull request #2941 from libgit2/cmn/http-enforce-cred
...
http: enforce the credential types
2015-03-03 17:59:44 -05:00
Edward Thomson
f438dbe191
Merge pull request #2771 from libgit2/cmn/config-borrow-entry
...
Borrowing configuration entries
2015-03-03 17:59:20 -05:00
Jeff Hostetler
d8be508777
Change ifdef for MINGW32.
2015-03-03 13:35:10 -05:00
Carlos Martín Nieto
9a97f49e3a
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.
2015-03-03 18:35:12 +01:00
Carlos Martín Nieto
e892b6a927
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.
2015-03-03 18:07:16 +01:00
Carlos Martín Nieto
76f034180a
Remove swp files
2015-03-03 17:04:38 +01:00
Edward Thomson
20273e4d3c
Merge pull request #2934 from akikoskinen/mingw_build_fix
...
Fix build on mingw (master branch)
2015-03-03 10:08:51 -05:00
Edward Thomson
018fdbb580
Merge pull request #2913 from ethomson/stash_fixup
...
stash: correctly stash wd modified/index deleted
2015-03-03 10:08:28 -05:00
Edward Thomson
72ca65d538
Merge pull request #2808 from libgit2/cmn/repo-ident
...
Remove the signature from ref-modifying functions
2015-03-03 10:07:36 -05:00
Jeff Hostetler
e5cf1c704c
Converted cl_perf_timer to use git__timer internally.
2015-03-03 09:57:50 -05:00
