]> git.proxmox.com Git - libgit2.git/log
libgit2.git
10 years agoDocumentation fixes
Carlos Martín Nieto [Tue, 8 Jul 2014 07:56:16 +0000 (09:56 +0200)]
Documentation fixes

Fixup git_attr_value's comment to be recognised as documentation, and
include the definitions needed for clang to parse reset.h such that
it shows up in the documentation.

This fixes #2430.

10 years agoMerge remote-tracking branch 'origin/cmn/update-zlib'
Vicent Marti [Fri, 4 Jul 2014 16:49:24 +0000 (18:49 +0200)]
Merge remote-tracking branch 'origin/cmn/update-zlib'

10 years agoMerge pull request #2461 from jacquesg/ssh2-warnings
Carlos Martín Nieto [Fri, 4 Jul 2014 07:18:01 +0000 (09:18 +0200)]
Merge pull request #2461 from jacquesg/ssh2-warnings

Fix SSH2 warnings

10 years agoInclude libssh2.h before git2.h (transport.h)
Jacques Germishuys [Thu, 3 Jul 2014 18:20:00 +0000 (20:20 +0200)]
Include libssh2.h before git2.h (transport.h)

10 years agoFix git_cred_ssh_interactive_callback signature
Jacques Germishuys [Thu, 3 Jul 2014 18:19:16 +0000 (20:19 +0200)]
Fix git_cred_ssh_interactive_callback signature

10 years agoMerge pull request #2460 from libgit2/cmn/sched-yield
Vicent Marti [Thu, 3 Jul 2014 13:30:38 +0000 (15:30 +0200)]
Merge pull request #2460 from libgit2/cmn/sched-yield

Move yield to the tests and enable for FreeBSD

10 years agoMove yield to the tests and enable for FreeBSD
Carlos Martín Nieto [Thu, 3 Jul 2014 03:47:34 +0000 (05:47 +0200)]
Move yield to the tests and enable for FreeBSD

Move the definition of git_thread_yield() to the test which needs it and
add the correct definition for it for FreeBSD and derivatives.

Original patch adding FreeBSD and derivatives by @jacquesg.

10 years agoMerge pull request #2459 from libgit2/cmn/http-url-path
Vicent Marti [Thu, 3 Jul 2014 00:41:10 +0000 (02:41 +0200)]
Merge pull request #2459 from libgit2/cmn/http-url-path

netops: error out on url without a path

10 years agonetops: error out on url without a path
Carlos Martín Nieto [Thu, 3 Jul 2014 00:34:32 +0000 (02:34 +0200)]
netops: error out on url without a path

In order to connect to a remote server, we need to provide a path to the
repository we're interested in. Consider the lack of path in the url an
error.

10 years agoMerge pull request #2449 from libgit2/cmn/maint-21
Vicent Marti [Wed, 2 Jul 2014 14:45:02 +0000 (16:45 +0200)]
Merge pull request #2449 from libgit2/cmn/maint-21

Maint fixes for ssl initing and ssh exposure

10 years agoMerge pull request #2455 from ethomson/equal_oid
Vicent Marti [Wed, 2 Jul 2014 13:29:25 +0000 (15:29 +0200)]
Merge pull request #2455 from ethomson/equal_oid

Introduce `cl_assert_equal_oid`

10 years agoMerge pull request #2453 from ethomson/checkout_index
Vicent Marti [Wed, 2 Jul 2014 13:29:14 +0000 (15:29 +0200)]
Merge pull request #2453 from ethomson/checkout_index

git_checkout_index: checkout other indexes

10 years agoMerge pull request #2452 from libgit2/cmn/clone-custom-repo
Vicent Marti [Wed, 2 Jul 2014 13:29:05 +0000 (15:29 +0200)]
Merge pull request #2452 from libgit2/cmn/clone-custom-repo

Provide a callback to customize the repository on clone

10 years agoMerge pull request #2456 from libgit2/cmn/ssh-send-everything
Vicent Marti [Wed, 2 Jul 2014 13:28:24 +0000 (15:28 +0200)]
Merge pull request #2456 from libgit2/cmn/ssh-send-everything

ssh: libssh2_channel_write() behaves like send()

10 years agossh: libssh2_channel_write() behaves like send()
Carlos Martín Nieto [Wed, 2 Jul 2014 10:49:51 +0000 (12:49 +0200)]
ssh: libssh2_channel_write() behaves like send()

When the stream writing function was written, it assume that
libssh2_channel_write() would always write all of the data to the
wire. This is only true for the first 32k of data, which it tries to
fit into one ssh packet.

Since it can perform short writes, call it in a loop like we do for
send(), advancing the buffer offset.

10 years agoclone: remote git_clone_into{,_local} from the public API
Carlos Martín Nieto [Mon, 30 Jun 2014 19:36:38 +0000 (21:36 +0200)]
clone: remote git_clone_into{,_local} from the public API

As git_clone now has callbacks to configure the details of the
repository and remote, remove the lower-level functions from the public
API, as they lack some of the logic from git_clone proper.

10 years agoclone: add a callback for repository creation
Carlos Martín Nieto [Mon, 30 Jun 2014 18:55:32 +0000 (20:55 +0200)]
clone: add a callback for repository creation

Analogously to the remote creation callback, provide a way for the user
of git_clone() to create the repository with whichever options they
desire via callback.

10 years agogit_checkout_index: checkout other indexes
Edward Thomson [Fri, 23 May 2014 21:50:51 +0000 (14:50 -0700)]
git_checkout_index: checkout other indexes

git_checkout_index can now check out other git_index's (that are not
necessarily the repository index).  This allows checkout_index to use
the repository's index for stat cache information instead of the index
data being checked out.  git_merge and friends now check out their
indexes directly instead of trying to blend it into the running index.

10 years agorevwalk::simplify test should test
Edward Thomson [Tue, 1 Jul 2014 18:11:14 +0000 (14:11 -0400)]
revwalk::simplify test should test

The revwalk::simplify test was not actually tested the values from
the revwalk against the expected.  (Further, the expected had two
IDs transposed.)

10 years agoIntroduce cl_assert_equal_oid
Edward Thomson [Tue, 1 Jul 2014 18:09:01 +0000 (14:09 -0400)]
Introduce cl_assert_equal_oid

10 years agoMerge pull request #2451 from libgit2/rb/round-up-pool-allocations
Vicent Marti [Tue, 1 Jul 2014 11:26:02 +0000 (13:26 +0200)]
Merge pull request #2451 from libgit2/rb/round-up-pool-allocations

Round up pool alloc sizes for alignment

10 years agossh: always declare the libssh2 types
Carlos Martín Nieto [Mon, 30 Jun 2014 21:18:37 +0000 (23:18 +0200)]
ssh: always declare the libssh2 types

This lets a user decide they do want to use keyboard-interactive after
they've compiled.

10 years agoRound up pool alloc sizes for alignment
Russell Belfer [Mon, 30 Jun 2014 19:05:25 +0000 (12:05 -0700)]
Round up pool alloc sizes for alignment

To make sure that items returned from pool allocations are aligned
on nice boundaries, this rounds up all pool allocation sizes to a
multiple of 8.  This adds a small amount of overhead to each item.

The rounding up could be made optional with an extra parameter to
the pool initialization that turned on rounding only for pools
where item alignment actually matters, but I think for the extra
code and complexity that would be involved, that it makes sense
just to burn a little bit of extra memory and enable this all the
time.

10 years agoMerge pull request #2440 from phkelley/transports
Vicent Marti [Mon, 30 Jun 2014 15:35:42 +0000 (17:35 +0200)]
Merge pull request #2440 from phkelley/transports

Improvements to git_transport extensibility

10 years agossh: create the right callback signature based on build options
Carlos Martín Nieto [Mon, 30 Jun 2014 08:03:36 +0000 (10:03 +0200)]
ssh: create the right callback signature based on build options

When linking against libssh2, create the transport.h such that it
contains its definition for custom crypto and keyboard-interactive
callbacks.

If we don't link against libssh2, create an equivalent signature which
has void pointers instead of pointers to libssh2 structures.

This would be one way to fix #2438.

10 years agossl: init only once without threads
Carlos Martín Nieto [Mon, 30 Jun 2014 07:19:05 +0000 (09:19 +0200)]
ssl: init only once without threads

The OpenSSL library-loading functions do not expect to be called
multiple times. Add a flag in the non-threaded libgit2 init so we only
call once.

This fixes #2446.

10 years agoMerge pull request #2447 from phkelley/pkt_assert
Vicent Marti [Fri, 27 Jun 2014 16:11:06 +0000 (18:11 +0200)]
Merge pull request #2447 from phkelley/pkt_assert

Fix assert when receiving uncommon sideband packet

10 years agoFix assert when receiving uncommon sideband packet
Philip Kelley [Fri, 27 Jun 2014 15:51:35 +0000 (11:51 -0400)]
Fix assert when receiving uncommon sideband packet

10 years agoImprovements to git_transport extensibility
Philip Kelley [Wed, 25 Jun 2014 17:20:27 +0000 (13:20 -0400)]
Improvements to git_transport extensibility

git_remote_set_transport now takes a transport factory rather than a transport
git_clone_options now allows the caller to specify a remote creation callback

10 years agoMerge pull request #2445 from ethomson/checkout_conflict_test
Vicent Marti [Thu, 26 Jun 2014 16:24:13 +0000 (18:24 +0200)]
Merge pull request #2445 from ethomson/checkout_conflict_test

checkout::conflict tests: only test owner mode

10 years agocheckout::conflict tests: only test owner mode
Edward Thomson [Thu, 26 Jun 2014 13:16:12 +0000 (09:16 -0400)]
checkout::conflict tests: only test owner mode

The checkout::conflict type conflict tests were failing because
they were overly assertive about the resultant mode, testing
group & other bits, which failed miserably for people who had a
umask less restrictive than 022.  Only test the resultant owner bits.

10 years agoMerge pull request #2444 from libgit2/phkelley/flexarray
Philip Kelley [Thu, 26 Jun 2014 12:01:01 +0000 (08:01 -0400)]
Merge pull request #2444 from libgit2/phkelley/flexarray

Fixes #2443 Zero size arrays are an extension

10 years agoFixes #2443 Zero size arrays are an extension
Philip Kelley [Thu, 26 Jun 2014 11:48:09 +0000 (07:48 -0400)]
Fixes #2443 Zero size arrays are an extension

10 years agoMerge pull request #2442 from libgit2/cmn/leaks
Vicent Marti [Wed, 25 Jun 2014 19:43:52 +0000 (21:43 +0200)]
Merge pull request #2442 from libgit2/cmn/leaks

Fix a couple of leaks

10 years agopack: clean up error returns
Carlos Martín Nieto [Wed, 25 Jun 2014 19:35:58 +0000 (21:35 +0200)]
pack: clean up error returns

Set a message when we fail to lock.

Also make the put function void, since it's called from free, which
cannot report errors. The only errors we can experience here are
internal state corruption, so we assert that we are trying to put a
pack which we have previously got.

10 years agotree: free in error conditions
Carlos Martín Nieto [Wed, 25 Jun 2014 19:25:44 +0000 (21:25 +0200)]
tree: free in error conditions

As reported by coverity, we would leak some memory in error conditions.

10 years agopack: free the new pack struct if we fail to insert
Carlos Martín Nieto [Wed, 25 Jun 2014 19:20:39 +0000 (21:20 +0200)]
pack: free the new pack struct if we fail to insert

If we fail to insert the packfile in the map, make sure to free it.

This makes the free function only attempt to remove its mwindows from
the global list if we have opened the packfile to avoid accessing the
list unlocked.

10 years agotravis: build the master branch
Carlos Martín Nieto [Wed, 25 Jun 2014 15:12:44 +0000 (17:12 +0200)]
travis: build the master branch

We need to tell Travis to build the master branch or it won't build it
or the pull requests.

10 years agoMerge pull request #2435 from ethomson/text_attr
Vicent Marti [Wed, 25 Jun 2014 13:14:20 +0000 (15:14 +0200)]
Merge pull request #2435 from ethomson/text_attr

Update text=auto / core.autocrlf=false behavior

10 years agoMerge pull request #2439 from ethomson/revert_export
Vicent Marti [Wed, 25 Jun 2014 13:14:14 +0000 (15:14 +0200)]
Merge pull request #2439 from ethomson/revert_export

Export git_revert_commit

10 years agoExport git_revert_commit
Edward Thomson [Wed, 25 Jun 2014 13:11:07 +0000 (09:11 -0400)]
Export git_revert_commit

10 years agoUpdate text=auto / core.autocrlf=false behavior
Edward Thomson [Wed, 18 Jun 2014 21:54:32 +0000 (16:54 -0500)]
Update text=auto / core.autocrlf=false behavior

Git for Windows 1.9.4 changed the behavior when the text=auto
attribute is specified and core.autocrlf=false.  Previous observed
behavior would *not* filter files when going into the working
directory, the new behavior *does* filter.  Update our behavior to match.

10 years agoAdd CHANGELOG entry for mixed-EOL fix
Carlos Martín Nieto [Tue, 24 Jun 2014 15:56:27 +0000 (17:56 +0200)]
Add CHANGELOG entry for mixed-EOL fix

10 years agoMerge remote-tracking branch 'upstream/cmn/mixed-eol-passthrough'
Carlos Martín Nieto [Tue, 24 Jun 2014 15:55:15 +0000 (17:55 +0200)]
Merge remote-tracking branch 'upstream/cmn/mixed-eol-passthrough'

10 years agoAdd CHANGELOG entry for treebuilder map
Carlos Martín Nieto [Tue, 24 Jun 2014 15:52:52 +0000 (17:52 +0200)]
Add CHANGELOG entry for treebuilder map

10 years agoMerge remote-tracking branch 'upstream/cmn/treebuilder-perf'
Carlos Martín Nieto [Tue, 24 Jun 2014 15:51:45 +0000 (17:51 +0200)]
Merge remote-tracking branch 'upstream/cmn/treebuilder-perf'

10 years agoAdd CHANGELOG entry for shared packs
Carlos Martín Nieto [Tue, 24 Jun 2014 15:37:41 +0000 (17:37 +0200)]
Add CHANGELOG entry for shared packs

10 years agoMerge branch 'cmn/global-mwf'
Carlos Martín Nieto [Tue, 24 Jun 2014 15:35:14 +0000 (17:35 +0200)]
Merge branch 'cmn/global-mwf'

10 years agoMerge pull request #2434 from libgit2/rb/contributing-updates
Vicent Marti [Tue, 24 Jun 2014 15:30:47 +0000 (17:30 +0200)]
Merge pull request #2434 from libgit2/rb/contributing-updates

Update CONTRIBUTING and PROJECTS

10 years agocrlf: pass-through mixed EOL buffers from LF->CRLF
Carlos Martín Nieto [Thu, 19 Jun 2014 09:45:46 +0000 (11:45 +0200)]
crlf: pass-through mixed EOL buffers from LF->CRLF

When checking out files, we're performing conversion into the user's
native line endings, but we only want to do it for files which have
consistent line endings. Refuse to perform the conversion for mixed-EOL
files.

The CRLF->LF filter is left as-is, as that conversion is considered to be
normalization by git and should force a conversion of the line endings.

10 years agoShare packs across repository instances
Carlos Martín Nieto [Wed, 18 Jun 2014 15:13:12 +0000 (17:13 +0200)]
Share packs across repository instances

Opening the same repository multiple times will currently open the same
file multiple times, as well as map the same region of the file multiple
times. This is not necessary, as the packfile data is immutable.

Instead of opening and closing packfiles directly, introduce an
indirection and allocate packfiles globally. This does mean locking on
each packfile open, but we already use this lock for the global mwindow
list so it doesn't introduce a new contention point.

10 years agoAdd a CHANGELOG entry for the filebuf change
Carlos Martín Nieto [Mon, 23 Jun 2014 16:02:59 +0000 (18:02 +0200)]
Add a CHANGELOG entry for the filebuf change

10 years agoMerge remote-tracking branch 'upstream/cmn/filebuf-atomic-unlock'
Carlos Martín Nieto [Mon, 23 Jun 2014 15:32:30 +0000 (17:32 +0200)]
Merge remote-tracking branch 'upstream/cmn/filebuf-atomic-unlock'

10 years agomissing paren
Russell Belfer [Fri, 20 Jun 2014 17:15:03 +0000 (10:15 -0700)]
missing paren

10 years agoUpdate CONTRIBUTING and PROJECTS
Russell Belfer [Fri, 20 Jun 2014 17:10:38 +0000 (10:10 -0700)]
Update CONTRIBUTING and PROJECTS

This updates CONTRIBUTING to reflect the changes to use the
master branch and make explicit recommendations about updating
CHANGELOG.md and providing test coverage.  Also, this includes
some old updates to PROJECTS.md that I wrote to expand the list
of projects, pulling in things from old feature requests.

10 years agolibgit2 v0.21.0
Vicent Marti [Fri, 20 Jun 2014 12:42:16 +0000 (14:42 +0200)]
libgit2 v0.21.0

10 years agoMerge pull request #2425 from libgit2/cmn/clone-auth-change
Vicent Marti [Mon, 16 Jun 2014 09:11:40 +0000 (11:11 +0200)]
Merge pull request #2425 from libgit2/cmn/clone-auth-change

Don't use read-write accounts for the tests

10 years agoMerge pull request #2421 from libgit2/cmn/init-ssl-once
Vicent Marti [Sat, 14 Jun 2014 10:58:03 +0000 (12:58 +0200)]
Merge pull request #2421 from libgit2/cmn/init-ssl-once

netops: init OpenSSL once under lock

10 years agotest: remove assembla clone test
Carlos Martín Nieto [Fri, 13 Jun 2014 20:27:46 +0000 (22:27 +0200)]
test: remove assembla clone test

The assembla failure we were seeing referred to a private repository,
which is not what is there at the moment.

This reverts 1fd21b0342f

10 years agotest: use read-only account
Carlos Martín Nieto [Fri, 13 Jun 2014 20:24:43 +0000 (22:24 +0200)]
test: use read-only account

Don't write in plaintext the password of an account which has full
control over the repository. Instead use an account with read-only
access.

10 years agohttp: fix typo in credentials logic
Carlos Martín Nieto [Fri, 13 Jun 2014 00:35:33 +0000 (02:35 +0200)]
http: fix typo in credentials logic

We want to check whether the credentials callback is NULL, not whether
the payload is.

10 years agossl: init everything all the time
Carlos Martín Nieto [Thu, 12 Jun 2014 14:20:52 +0000 (16:20 +0200)]
ssl: init everything all the time

Bring together all of the OpenSSL initialization to
git_threads_init() so it's together and doesn't need locks.

Moving it here also gives us libssh2 thread safety (when built against
openssl).

10 years agossl: init also without threads
Carlos Martín Nieto [Thu, 12 Jun 2014 12:50:08 +0000 (14:50 +0200)]
ssl: init also without threads

10 years agossl: cargo-cult thread safety
Carlos Martín Nieto [Thu, 12 Jun 2014 01:20:34 +0000 (03:20 +0200)]
ssl: cargo-cult thread safety

OpenSSL's tests init everything in the main thread, so let's do that.

10 years agossl: use locking
Carlos Martín Nieto [Wed, 11 Jun 2014 21:19:48 +0000 (23:19 +0200)]
ssl: use locking

When using in a multithreaded context, OpenSSL needs to lock, and leaves
it up to application to provide said locks.

We were not doing this, and it's just luck that's kept us from crashing
up to now.

10 years agoremote: update documentation
Carlos Martín Nieto [Wed, 11 Jun 2014 19:14:45 +0000 (21:14 +0200)]
remote: update documentation

Add docs for git_clone_local_t and move the docs for the
git_clone_options to each field.

10 years agonetops: init OpenSSL once under lock
Carlos Martín Nieto [Wed, 11 Jun 2014 18:52:15 +0000 (20:52 +0200)]
netops: init OpenSSL once under lock

The OpenSSL init functions are not reentrant, which means that running
multiple fetches in parallel can cause us to crash.

Use a mutex to init OpenSSL, and since we're adding this extra checks,
init it only once.

10 years agoMerge pull request #2417 from libgit2/cmn/revwalk-array-fix
Vicent Marti [Wed, 11 Jun 2014 16:56:24 +0000 (18:56 +0200)]
Merge pull request #2417 from libgit2/cmn/revwalk-array-fix

revwalk: more sensible array handling

10 years agozlib: disable warning 4142 on MSVC
Carlos Martín Nieto [Wed, 11 Jun 2014 16:22:46 +0000 (18:22 +0200)]
zlib: disable warning 4142 on MSVC

This is about benign redefinition of types. We're not interested in it.

10 years agozlib: get rid of compress.c and uncompr.c
Carlos Martín Nieto [Wed, 11 Jun 2014 16:15:04 +0000 (18:15 +0200)]
zlib: get rid of compress.c and uncompr.c

10 years agozlib: get rid of gz*
Carlos Martín Nieto [Wed, 11 Jun 2014 16:10:04 +0000 (18:10 +0200)]
zlib: get rid of gz*

10 years agozlib: add a few missing defines
Carlos Martín Nieto [Wed, 11 Jun 2014 16:03:37 +0000 (18:03 +0200)]
zlib: add a few missing defines

10 years agoMerge branch 'cmn/zlib-update' into cmn/update-zlib
Carlos Martín Nieto [Wed, 11 Jun 2014 14:36:34 +0000 (16:36 +0200)]
Merge branch 'cmn/zlib-update' into cmn/update-zlib

10 years agoMerge branch 'cmn/zlib-128' into cmn/zlib-update
Carlos Martín Nieto [Wed, 11 Jun 2014 14:36:08 +0000 (16:36 +0200)]
Merge branch 'cmn/zlib-128' into cmn/zlib-update

Conflicts:
deps/zlib/crc32.c
deps/zlib/crc32.h
deps/zlib/zconf.h

10 years agoUpdate zlib to 1.2.8
Carlos Martín Nieto [Wed, 11 Jun 2014 14:10:00 +0000 (16:10 +0200)]
Update zlib to 1.2.8

10 years agorevwalk: more sensible array handling
Carlos Martín Nieto [Tue, 10 Jun 2014 22:06:44 +0000 (00:06 +0200)]
revwalk: more sensible array handling

Instead of using a sentinel empty value to detect the last commit, let's
check for when we get a NULL from popping the stack, which lets us know
when we're done.

The current code causes us to read uninitialized data, although only on
RHEL/CentOS 6 in release mode. This is a readability win overall.

10 years agotreentry: no need for manual size book-keeping
Carlos Martín Nieto [Mon, 9 Jun 2014 20:59:32 +0000 (22:59 +0200)]
treentry: no need for manual size book-keeping

We can simply ask the hasmap.

10 years agotreebuilder: don't keep removed entries around
Carlos Martín Nieto [Mon, 9 Jun 2014 20:45:23 +0000 (22:45 +0200)]
treebuilder: don't keep removed entries around

If the user wants to keep a copy for themselves, they should make a
copy. It adds unnecessary complexity to make sure the returned entries
are valid until the builder is cleared.

10 years agotreebuilder: use a map instead of vector to store the entries
Carlos Martín Nieto [Mon, 9 Jun 2014 02:38:22 +0000 (04:38 +0200)]
treebuilder: use a map instead of vector to store the entries

Finding a filename in a vector means we need to resort it every time we
want to read from it, which includes every time we want to write to it
as well, as we want to find duplicate keys.

A hash-map fits what we want to do much more accurately, as we do not
care about sorting, but just the particular filename.

We still keep removed entries around, as the interface let you assume
they were going to be around until the treebuilder is cleared or freed,
but in this case that involves an append to a vector in the filter case,
which can now fail.

The only time we care about sorting is when we write out the tree, so
let's make that the only time we do any sorting.

10 years agoMerge pull request #2416 from libgit2/cmn/treebuilder-insert-sorted
Vicent Marti [Tue, 10 Jun 2014 10:56:11 +0000 (12:56 +0200)]
Merge pull request #2416 from libgit2/cmn/treebuilder-insert-sorted

treebuilder: insert sorted

10 years agopathspec: use C guards in header
Carlos Martín Nieto [Tue, 10 Jun 2014 01:53:26 +0000 (03:53 +0200)]
pathspec: use C guards in header

10 years agotreebuilder: insert sorted
Carlos Martín Nieto [Mon, 9 Jun 2014 21:23:53 +0000 (23:23 +0200)]
treebuilder: insert sorted

By inserting in the right position, we can keep the vector sorted,
making entry insertion almost twice as fast.

10 years agoremote: fix rename docs
Carlos Martín Nieto [Mon, 9 Jun 2014 17:35:41 +0000 (19:35 +0200)]
remote: fix rename docs

10 years agoMerge branch 'cmn/soversion' into development
Carlos Martín Nieto [Sun, 8 Jun 2014 18:01:45 +0000 (20:01 +0200)]
Merge branch 'cmn/soversion' into development

10 years agoBump version to 0.21.0
Carlos Martín Nieto [Sun, 8 Jun 2014 18:01:02 +0000 (20:01 +0200)]
Bump version to 0.21.0

Bump library version to 0.21.0 and SONAME to 21

10 years agoChange SOVERSION at API breaks
Carlos Martín Nieto [Sun, 8 Jun 2014 17:42:54 +0000 (19:42 +0200)]
Change SOVERSION at API breaks

Since the SOVERSION doesn't need to follow the library's version and
simply needs to be monotonically increasing whenever we release
something that breaks the ABI, we can set some number and allow multiple
versions of the library to be installed side-by-side.

We start here with the minor version as that's what we release for now,
and it allows to backport this change to earlier versions.

10 years agoMerge pull request #2407 from libgit2/cmn/remote-rename-more
Vicent Marti [Sun, 8 Jun 2014 14:44:32 +0000 (16:44 +0200)]
Merge pull request #2407 from libgit2/cmn/remote-rename-more

More remote rename fixes

10 years agoMerge pull request #2409 from phkelley/win32_thread_fixes
Vicent Marti [Sun, 8 Jun 2014 14:44:14 +0000 (16:44 +0200)]
Merge pull request #2409 from phkelley/win32_thread_fixes

Win32: Fix object::cache::threadmania test on x64

10 years agoReact to review feedback
Philip Kelley [Sat, 7 Jun 2014 17:56:39 +0000 (13:56 -0400)]
React to review feedback

10 years agoWin32: Fix object::cache::threadmania test on x64
Philip Kelley [Sat, 7 Jun 2014 16:51:48 +0000 (12:51 -0400)]
Win32: Fix object::cache::threadmania test on x64

10 years agoMerge pull request #2408 from phkelley/win32_test_fixes
Philip Kelley [Sat, 7 Jun 2014 16:37:49 +0000 (12:37 -0400)]
Merge pull request #2408 from phkelley/win32_test_fixes

Win32 test fixes

10 years agoWin32: Fix diff::workdir::submodules test #2361
Philip Kelley [Sat, 7 Jun 2014 16:18:56 +0000 (12:18 -0400)]
Win32: Fix diff::workdir::submodules test #2361

10 years agoWin32: Fix failing clone_mirror test
Philip Kelley [Sat, 7 Jun 2014 16:18:24 +0000 (12:18 -0400)]
Win32: Fix failing clone_mirror test

10 years agoremote: don't free the remote on delete
Carlos Martín Nieto [Fri, 6 Jun 2014 20:55:34 +0000 (22:55 +0200)]
remote: don't free the remote on delete

This was a bad idea. Don't free except in the free function.

10 years agoremote: handle symrefs when renaming
Carlos Martín Nieto [Fri, 6 Jun 2014 20:38:26 +0000 (22:38 +0200)]
remote: handle symrefs when renaming

A symref inside the namespace gets renamed, we should make it point to
the target's new name.

This is for the origin/HEAD -> origin/master type of situations.

10 years agoremote: failing test for renaming with a symref
Carlos Martín Nieto [Fri, 6 Jun 2014 20:01:35 +0000 (22:01 +0200)]
remote: failing test for renaming with a symref

10 years agoremote: return problem refspecs instead of using a callback
Carlos Martín Nieto [Fri, 6 Jun 2014 14:33:54 +0000 (16:33 +0200)]
remote: return problem refspecs instead of using a callback

There is no reason why we need to use a callback here. A string array
fits better with the usage, as this is not an event and we don't need
anything from the user.

10 years agoremote: make sure the name stays valid on rename
Carlos Martín Nieto [Fri, 6 Jun 2014 13:57:37 +0000 (15:57 +0200)]
remote: make sure the name stays valid on rename

We must make sure that the name pointer remains valid, so make sure to
allocate the new one before freeing the old one and swap them so the
user never sees an invalid pointer.

10 years agoremote: remove rename code for anonymous remotes
Carlos Martín Nieto [Fri, 6 Jun 2014 13:54:42 +0000 (15:54 +0200)]
remote: remove rename code for anonymous remotes

We don't allow renames of anonymous remotes, so there's no need to
handle them.

A remote is always associated with a repository, so there's no need to
check for that.

10 years agoMerge pull request #2404 from libgit2/cmn/remote-rename-fixes
Vicent Marti [Fri, 6 Jun 2014 11:37:22 +0000 (13:37 +0200)]
Merge pull request #2404 from libgit2/cmn/remote-rename-fixes

Remote rename fixes