Commit Graph

4488 Commits

Author SHA1 Message Date
Carlos Martín Nieto
c0f4a0118d pack: introduce a delta base cache
Many delta bases are re-used. Cache them to avoid inflating the same
data repeatedly.

This version doesn't limit the amount of entries to store, so it can
end up using a considerable amound of memory.
2013-01-11 16:55:37 +01:00
Carlos Martín Nieto
2086e1baef tests: plug a couple of leaks 2013-01-11 16:54:57 +01:00
nulltoken
a379e65212 refspec: prevent git_refspec__free() from segfaulting
Fix libgit2/libgit2sharp#247
2013-01-11 16:14:17 +01:00
Sebastian Bauer
976d9e136f regex: Fixed warnings about unused parameter values.
There are different solutions to the problem. In this change, we
define an UNUSED macro that maps to __attribute__((unused)) when
compiling with gcc. Otherwise it is a NOOP. We apply this macro
in all function headers for each parameter value that is not used
within the function body.

The change is local to regex.
2013-01-11 11:03:48 +01:00
Sebastian Bauer
d2f14df8c1 regex: Fixed several warnings about signed/unsigned conversions. 2013-01-11 11:03:48 +01:00
Sascha Cunz
1265b51f5b Add missing git_buf_free 2013-01-11 03:10:23 +01:00
Sascha Cunz
88aef76635 Implement analog for 'git checkout --branch xxx ...' 2013-01-11 03:10:19 +01:00
Sascha Cunz
132c2db6a9 Fix possible free'ing of unitialized pointer in error case 2013-01-11 02:18:27 +01:00
Vicent Martí
3a5e8faee7 Merge pull request #1221 from arrbee/checkout-without-pathspec-match
Add GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH
2013-01-10 15:18:49 -08:00
Russell Belfer
40342bd2b6 Add GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH
This adds an option to checkout a la the diff option to turn off
fnmatch evaluation for pathspec entries.  This can be useful to
make sure your "pattern" in really interpretted as an exact file
match only.
2013-01-10 15:15:37 -08:00
Vicent Martí
404880b1ba Merge pull request #1206 from ben/stock-auth
Expose stock user/pass credential utility
2013-01-10 11:24:09 -08:00
Vicent Martí
48de3061d1 Merge pull request #1220 from ethomson/reuc_empty_sides
REUC needs to handle empty sides
2013-01-10 10:04:53 -08:00
Edward Thomson
eb3c247a78 REUC needs to handle empty sides 2013-01-10 11:56:02 -06:00
Vicent Martí
7bacc2c8c5 Merge pull request #1182 from libgit2/odb-file-refresh
Sane refresh logic for #1180
2013-01-10 08:15:10 -08:00
Vicent Martí
3f31ce8d95 Merge pull request #1218 from sba1/amiga.2
Libgit2 for AmigaOS4
2013-01-10 08:13:02 -08:00
Vicent Marti
8fe6bc5c47 odb: Refresh on exists query too 2013-01-10 15:43:08 +01:00
Vicent Marti
891a4681eb dat errorcode 2013-01-10 15:34:56 +01:00
Vicent Marti
4a863c0666 Sane refresh logic
All the ODB backends have a specific refresh interface. When reading an
object, first we attempt every single backend: if the read fails, then
we refresh all the backends and retry the read one more time to see if
the object has appeared.
2013-01-10 15:34:56 +01:00
Vicent Martí
a22ad9fd1f Merge pull request #1219 from sba1/fetch-example-return-fix
Don't call pthread_exit() in the callback of the fetch example
2013-01-10 06:01:00 -08:00
Sebastian Bauer
cea994b902 Don't call pthread_exit() in the callback.
Compilers that are not aware that pthread_exit() does not return
issue a warning when compiling the present code. This change
exchanges the call to pthread_exit() with a simple return
statement. According to the pthread specification this is
equivalent.
2013-01-10 12:39:17 +01:00
Sebastian Bauer
ccd298bb22 Ignore build-amiga 2013-01-10 10:05:39 +01:00
Sebastian Bauer
b41e24a65c Add -fPIC only if BUILD_SHARED_LIBS is ON 2013-01-10 09:20:43 +01:00
Sebastian Bauer
707ede8633 Compile regexp dependency when AMIGA is defined.
Before it was compiled when CMake was actually run on AmigaOS.
2013-01-10 09:19:11 +01:00
Sebastian Bauer
c57c4af327 Disable SSL when compiling for AmigaOS for now. 2013-01-10 09:16:39 +01:00
Sebastian Bauer
e9bb730c36 Added missing curly brackets and fixed compiler warnings. 2013-01-10 09:16:14 +01:00
Ben Straub
520dcc1c00 Move credential helpers to their own (optional) header 2013-01-09 13:31:17 -08:00
Ben Straub
ffb02b1630 Expose stock user/pass credential utility 2013-01-09 13:31:17 -08:00
Philip Kelley
fcc48d1fce Add a failing test for autocrlf filters 2013-01-09 12:37:22 -05:00
Vicent Martí
252b24049c Merge pull request #1214 from schu/push-handle-tags
push: properly handle tags
2013-01-09 08:43:19 -08:00
Michael Schubert
abeefbbe18 push: properly handle tags
Currently, push doesn't really handle tags when queueing objects. Fix
it.
2013-01-09 17:05:21 +01:00
Michael Schubert
f85b62840a tests-clar/network: remove unused CREATE_BLOB 2013-01-09 16:44:12 +01:00
Jameson Miller
087f64d3e3 Relax refspecs accepted by push 2013-01-09 16:15:58 +01:00
Vicent Martí
11fccddcb5 Merge pull request #1212 from arrbee/fix-diff-empty-file
Resolve crash with diff against empty file
2013-01-08 17:16:47 -08:00
Russell Belfer
de59055017 Resolve crash with diff against empty file
It is not legal inside our `p_mmap` function to mmap a zero length
file.  This adds a test that exercises that case inside diff and
fixes the code path where we would try to do that.

The fix turns out not to be a lot of code since our default file
content is already initialized to "" which works in this case.

Fixes #1210
2013-01-08 17:11:11 -08:00
Vicent Martí
f7e4a7c2d5 Merge pull request #1209 from ethomson/update_copyright
update copyrights
2013-01-08 15:34:55 -08:00
Edward Thomson
359fc2d241 update copyrights 2013-01-08 17:31:27 -06:00
Vicent Martí
d63dc61dd7 Merge pull request #1208 from ethomson/ppc_sha1_asm_deadness
remove ppc sha1 asm
2013-01-08 15:04:05 -08:00
Edward Thomson
8f09f46498 remove ppc sha1 asm 2013-01-08 16:55:16 -06:00
Vicent Martí
d4df288ddc Merge pull request #1207 from ethomson/cmake_comment_len_sanity
keep comments at < 80 chars
2013-01-08 14:41:25 -08:00
Edward Thomson
d335e73a6a keep comments at < 80 chars 2013-01-08 16:37:19 -06:00
Vicent Martí
368a2b4e3e Merge pull request #1204 from arrbee/diff-blob-to-buffer
Have diff blob to buffer share code (and add tests)
2013-01-07 18:33:50 -08:00
Russell Belfer
f2b7f7a6cb Share git_diff_blobs/git_diff_blob_to_buffer code
This moves the implementation of these two APIs into common code
that will be shared between the two.  Also, this adds tests for
the `git_diff_blob_to_buffer` API.  Lastly, this adds some extra
`const` to a few places that can use it.
2013-01-07 15:44:22 -08:00
Ignacio Casal Quinteiro
f6234cd994 Introduce git_diff_blob_to_buffer 2013-01-07 14:13:18 -08:00
Vicent Martí
7dfc5c3c6c Merge pull request #1203 from phkelley/reverse_dak
Revert changes from git/git diff-delta.c by dak@gnu.org, proski@gnu.org
2013-01-07 07:34:34 -08:00
Philip Kelley
8e89839d29 Merge pull request #1202 from martinwoodward/add-florian
Add Florian Forster to hall of fame
2013-01-07 07:06:18 -08:00
Philip Kelley
f6ed5e2d05 Revert changes from git/git diff-delta.c by dak@gnu.org, proski@gnu.org 2013-01-07 09:53:43 -05:00
Martin Woodward
32f59bfb18 Add Florian Forster to hall of fame
Permission recieved from Florian Forster on Jan 07 2013 to include
any changes of his from core Git into LibGit2.
2013-01-07 14:52:42 +00:00
Vicent Martí
05e9fc5835 Merge pull request #1200 from ethomson/merge_cleanup
merge cleanup should actually cleanup and the test should actually test
2013-01-06 18:56:40 -08:00
Edward Thomson
c31ae146b4 merge cleanup should actually cleanup and the test should actually test 2013-01-06 18:38:29 -06:00
Kevin Sawicki
7eb222fc7d Correct typos in documentation 2013-01-06 10:39:35 -08:00