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
Jeff Hostetler
7e9b21aa2a
Fix p_ftruncate to handle big files for git_clone
2015-03-03 08:47:44 -05:00
Carlos Martín Nieto
41513659de
Update CHANGELOG with the reflog ident changes
2015-03-03 14:40:51 +01:00
Carlos Martín Nieto
4e498646b6
repository: remove log message override for switching the active branch
...
We want to use the "checkout: moving from ..." message in order to let
git know when a change of branch has happened. Make the convenience
functions for this goal write this message.
2015-03-03 14:40:50 +01:00
Carlos Martín Nieto
412a380888
push: remove reflog message override
...
We always use "update by push".
2015-03-03 14:40:50 +01:00
Carlos Martín Nieto
6bfb990dc7
branch: don't accept a reflog message override
...
This namespace is about behaving like git's branch command, so let's do
exactly that instead of taking a reflog message.
This override is still available via the reference namespace.
2015-03-03 14:40:50 +01:00
Carlos Martín Nieto
23a17803b6
reset: remove reflog message override
...
This function is meant to simulate what git does in the reset command,
so we should include the reflog message in that.
2015-03-03 14:40:50 +01:00
Carlos Martín Nieto
659cf2029f
Remove the signature from ref-modifying functions
...
The signature for the reflog is not something which changes
dynamically. Almost all uses will be NULL, since we want for the
repository's default identity to be used, making it noise.
In order to allow for changing the identity, we instead provide
git_repository_set_ident() and git_repository_ident() which allow a user
to override the choice of signature.
2015-03-03 14:40:50 +01:00
Carlos Martín Nieto
fe477951be
Merge pull request #2885 from JIghtuse/master
...
describe example: function to add commits to opts
2015-03-03 14:35:10 +01:00
Carlos Martín Nieto
99b68a2aec
Merge pull request #2908 from ethomson/safe_create
...
Allow checkout to handle newly cloned repositories, remove `GIT_CHECKOUT_SAFE_CREATE`
2015-03-03 13:47:13 +01:00
Carlos Martín Nieto
31bc6c0440
branch: do capture the error code
...
We want to ignore GIT_ENOTFOUND, but for that we need to capture the
error code from the reflog deletion.
2015-03-03 13:25:40 +01:00
Carlos Martín Nieto
5ac2b7cb2a
Merge pull request #2937 from git-up/branch_delete_reflog
...
git_branch_delete() should ignore errors from non-existing reflogs
2015-03-03 13:03:54 +01:00
Carlos Martín Nieto
bf410446dd
Merge pull request #2935 from ethomson/dll_patchlevel
...
win32: add the patch level to the .dll fileversion
2015-03-02 21:03:57 +01:00
Pierre-Olivier Latour
7986391719
git_branch_delete() should ignore errors from non-existing reflogs
2015-03-02 10:24:54 -08:00
Edward Thomson
bf1476f190
win32: add the patch level to the .dll fileversion
...
Win32 DLLs have four fields for the version number (major, minor,
teeny, patch). If a consumer wants to build a custom DLL, it may
be useful to set the patchlevel version number in the DLL.
This value only affects the DLL version number, it does not affect
the resultant "version number", which remains major.minor.teeny.
2015-03-02 10:35:26 -05:00