]> git.proxmox.com Git - libgit2.git/log
libgit2.git
11 years agoAdd Brian Downing to the hall of fame
Martin Woodward [Thu, 3 Jan 2013 23:42:04 +0000 (23:42 +0000)]
Add Brian Downing to the hall of fame

11 years agoGive proper license notice to code from Android
Martin Woodward [Thu, 3 Jan 2013 22:28:59 +0000 (22:28 +0000)]
Give proper license notice to code from Android

The usage of the Android derrived code contains a full notice
which must be provided with the source code as per the terms
given at:
https://android.googlesource.com/platform/bionic/+/android-4.0.3_r1.1/libc/bionic/dirname_r.c

11 years agoAdd full license notice to bsearch code
Martin Woodward [Thu, 3 Jan 2013 22:24:10 +0000 (22:24 +0000)]
Add full license notice to bsearch code

The original BSD glibc code contains the notice as given at
http://opensource.apple.com/source/gcc/gcc-5666.3/libiberty/bsearch.c
and should be given in full along with the code.

11 years agoAdd Apache license header back to libpqueue files
Martin Woodward [Thu, 3 Jan 2013 22:16:37 +0000 (22:16 +0000)]
Add Apache license header back to libpqueue files

The original libpqueue file were licensed under Apache 2.0 so
therefore should retain their copyrights and header as per the
license terms at http://www.apache.org/licenses/LICENSE-2.0

11 years agoMerge pull request #1185 from ethomson/cleanup_merge
Vicent Martí [Thu, 3 Jan 2013 21:57:17 +0000 (13:57 -0800)]
Merge pull request #1185 from ethomson/cleanup_merge

expose merge metadata cleanup

11 years agoexpose merge metadata cleanup
Edward Thomson [Thu, 3 Jan 2013 21:53:50 +0000 (15:53 -0600)]
expose merge metadata cleanup

11 years agoMerge pull request #1181 from nvloff/allow_note_overwrite
Vicent Martí [Thu, 3 Jan 2013 15:43:27 +0000 (07:43 -0800)]
Merge pull request #1181 from nvloff/allow_note_overwrite

Allow note overwrite

11 years agoadd option to allow git note overwrite
Nikolai Vladimirov [Thu, 3 Jan 2013 14:31:36 +0000 (16:31 +0200)]
add option to allow git note overwrite

11 years agoFix git__strncasecmp
Philip Kelley [Thu, 3 Jan 2013 13:45:09 +0000 (08:45 -0500)]
Fix git__strncasecmp

11 years agonotes.c - whitespace fix
Nikolai Vladimirov [Thu, 3 Jan 2013 13:43:51 +0000 (15:43 +0200)]
notes.c - whitespace fix

11 years agoMove some clone tests to the nonetwork suite
Ben Straub [Wed, 2 Jan 2013 21:54:37 +0000 (13:54 -0800)]
Move some clone tests to the nonetwork suite

11 years agoMerge pull request #1152 from ben/clone-api-structification
Vicent Martí [Wed, 2 Jan 2013 21:50:41 +0000 (13:50 -0800)]
Merge pull request #1152 from ben/clone-api-structification

Segregate in-memory and persisted remotes

11 years agoInclude checkout options inline
Ben Straub [Wed, 2 Jan 2013 21:43:54 +0000 (13:43 -0800)]
Include checkout options inline

11 years agoRemove `inmem` flag, use NULL name instead
Ben Straub [Wed, 2 Jan 2013 20:48:17 +0000 (12:48 -0800)]
Remove `inmem` flag, use NULL name instead

11 years agoMove `url` to last place in parameter list
Ben Straub [Wed, 2 Jan 2013 20:44:47 +0000 (12:44 -0800)]
Move `url` to last place in parameter list

11 years agopath: ifdef GIT_WIN32 looks_like_network_computer_name()
Michael Schubert [Wed, 2 Jan 2013 15:27:22 +0000 (16:27 +0100)]
path: ifdef GIT_WIN32 looks_like_network_computer_name()

11 years agoMerge pull request #1177 from arrbee/update-example-showindex
Vicent Martí [Sat, 29 Dec 2012 12:08:58 +0000 (04:08 -0800)]
Merge pull request #1177 from arrbee/update-example-showindex

Update showindex example

11 years agoUpdate showindex example
Russell Belfer [Sat, 29 Dec 2012 06:00:24 +0000 (22:00 -0800)]
Update showindex example

I find the showindex example to be pretty useful on occasion, but
there were are couple of output tweaks I wanted, plus I wanted the
ability to specify a path to an actual index file instead of having
to open the whole repository.  This makes those changes and expands
the example slightly.

11 years agoMerge pull request #1176 from arrbee/fix-iter-memleak
Vicent Martí [Fri, 28 Dec 2012 18:34:35 +0000 (10:34 -0800)]
Merge pull request #1176 from arrbee/fix-iter-memleak

Alternative fix for iterator memory leak

11 years agoMerge pull request #1171 from csware/fix-compilation-vs2012
Vicent Martí [Fri, 28 Dec 2012 15:18:55 +0000 (07:18 -0800)]
Merge pull request #1171 from csware/fix-compilation-vs2012

Fixed compilation with =>VS2010

11 years agoFixed compilation with VS >= 2010
Sven Strickroth [Fri, 28 Dec 2012 12:29:16 +0000 (13:29 +0100)]
Fixed compilation with VS >= 2010

Starting with VS2010 MS ships a stdint.h.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
11 years agoInvalid ref name normalization leaked memory
Russell Belfer [Fri, 28 Dec 2012 07:23:12 +0000 (23:23 -0800)]
Invalid ref name normalization leaked memory

When normalizing a reference name, if there is an error because
the name is invalid, then the memory allocated for storing the
name could be leaked if the caller was not careful and assumed
that the error return code meant that no allocation had occurred.

This fixes that by explicitly deallocating the reference name
buffer if there is an error in normalizing the name.

11 years agoMake spoolandsort a pushable iterator behavior
Russell Belfer [Fri, 28 Dec 2012 06:25:52 +0000 (22:25 -0800)]
Make spoolandsort a pushable iterator behavior

An earlier change to `git_diff_from_iterators` introduced a
memory leak where the allocated spoolandsort iterator was not
returned to the caller and thus not freed.

One proposal changes all iterator APIs to use git_iterator** so
we can reallocate the iterator at will, but that seems unexpected.
This commit makes it so that an iterator can be changed in place.
The callbacks are isolated in a separate structure and a pointer
to that structure can be reassigned by the spoolandsort extension.

This means that spoolandsort doesn't create a new iterator; it
just allocates a new block of callbacks (along with space for its
own extra data) and swaps that into the iterator.

Additionally, since spoolandsort is only needed to switch the
case sensitivity of an iterator, this simplifies the API to only
take the ignore_case boolean and to be a no-op if the iterator
already matches the requested case sensitivity.

11 years agoFix warnings in example
Ben Straub [Thu, 27 Dec 2012 19:12:14 +0000 (11:12 -0800)]
Fix warnings in example

11 years agoFix GCC static/non-static compile error
Ben Straub [Thu, 27 Dec 2012 19:11:53 +0000 (11:11 -0800)]
Fix GCC static/non-static compile error

11 years agoMerge pull request #1173 from nulltoken/bug/discover
Vicent Martí [Thu, 27 Dec 2012 00:08:10 +0000 (16:08 -0800)]
Merge pull request #1173 from nulltoken/bug/discover

Teach UNC paths to git_path_dirname_r()

11 years agopath: Teach UNC paths to git_path_dirname_r()
nulltoken [Wed, 26 Dec 2012 11:03:07 +0000 (12:03 +0100)]
path: Teach UNC paths to git_path_dirname_r()

Fix libgit2/libgit2sharp#256

11 years agopath: enhance git_path_dirname_r() test coverage
nulltoken [Wed, 26 Dec 2012 10:59:07 +0000 (11:59 +0100)]
path: enhance git_path_dirname_r() test coverage

11 years agoremote: remove duplicated test
nulltoken [Mon, 24 Dec 2012 16:16:41 +0000 (17:16 +0100)]
remote: remove duplicated test

11 years agoremote: Prevent create() from blindly overwriting
nulltoken [Mon, 24 Dec 2012 14:59:01 +0000 (15:59 +0100)]
remote: Prevent create() from blindly overwriting

11 years agoremote: Improve documentation
nulltoken [Mon, 24 Dec 2012 14:29:26 +0000 (15:29 +0100)]
remote: Improve documentation

11 years agoremote: Enhance in-memory remote test coverage
nulltoken [Mon, 24 Dec 2012 14:27:42 +0000 (15:27 +0100)]
remote: Enhance in-memory remote test coverage

11 years agoFix indentations
nulltoken [Mon, 17 Dec 2012 11:27:32 +0000 (12:27 +0100)]
Fix indentations

11 years agoFix MSSVC compilation issue
nulltoken [Mon, 24 Dec 2012 14:51:10 +0000 (15:51 +0100)]
Fix MSSVC compilation issue

11 years agoFix -Wmaybe-uninitialized warning
Michael Schubert [Sat, 22 Dec 2012 15:29:59 +0000 (16:29 +0100)]
Fix -Wmaybe-uninitialized warning

11 years agoFix examples
Ben Straub [Fri, 21 Dec 2012 23:30:46 +0000 (15:30 -0800)]
Fix examples

11 years agoRename test to make @nulltoken happy
Ben Straub [Fri, 21 Dec 2012 21:15:37 +0000 (13:15 -0800)]
Rename test to make @nulltoken happy

11 years agoMerge pull request #1163 from barrbrain/check-exists-before-write
Vicent Martí [Fri, 21 Dec 2012 18:32:23 +0000 (10:32 -0800)]
Merge pull request #1163 from barrbrain/check-exists-before-write

odb: check if object exists before writing

11 years agoIn-memory remotes don't have names
Ben Straub [Fri, 21 Dec 2012 16:05:59 +0000 (08:05 -0800)]
In-memory remotes don't have names

11 years agoodb: check if object exists before writing
David Michael Barr [Wed, 19 Dec 2012 03:30:06 +0000 (14:30 +1100)]
odb: check if object exists before writing

Update the procondition of git_odb_backend::write.
It may now be assumed that the object has already been hashed.

11 years agogit_remote_create calls git_remote_save
Ben Straub [Thu, 20 Dec 2012 23:50:33 +0000 (15:50 -0800)]
git_remote_create calls git_remote_save

11 years agoRemote: deprecate dangling, prevent saving in-memory
Ben Straub [Thu, 20 Dec 2012 19:49:05 +0000 (11:49 -0800)]
Remote: deprecate dangling, prevent saving in-memory

11 years agoRename remote creation APIs
Ben Straub [Thu, 20 Dec 2012 18:51:09 +0000 (10:51 -0800)]
Rename remote creation APIs

git_remote_add -> git_remote_create
git_remote_new -> git_remote_create_inmemory

11 years agoMerge pull request #1166 from scunz/antibiotica_for_travis
Vicent Martí [Thu, 20 Dec 2012 16:49:32 +0000 (08:49 -0800)]
Merge pull request #1166 from scunz/antibiotica_for_travis

Mark travis build as failed if any test fails

11 years agoMark travis build as failed if any test fails
Sascha Cunz [Thu, 20 Dec 2012 02:51:06 +0000 (03:51 +0100)]
Mark travis build as failed if any test fails

11 years agoFix clone sample
Ben Straub [Thu, 20 Dec 2012 01:07:12 +0000 (17:07 -0800)]
Fix clone sample

11 years agoInitialize variable
Ben Straub [Thu, 20 Dec 2012 00:51:58 +0000 (16:51 -0800)]
Initialize variable

11 years agoClone: trust but verify
Ben Straub [Thu, 20 Dec 2012 00:51:37 +0000 (16:51 -0800)]
Clone: trust but verify

11 years agoAdd more clone options. Push test suite segfaults.
Ben Straub [Wed, 19 Dec 2012 03:46:05 +0000 (19:46 -0800)]
Add more clone options. Push test suite segfaults.

11 years agoMerge pull request #1138 from ethomson/fetchhead
Edward Thomson [Wed, 19 Dec 2012 23:12:49 +0000 (15:12 -0800)]
Merge pull request #1138 from ethomson/fetchhead

fetchhead reading/iterating

11 years agofetchhead reading/iterating
Edward Thomson [Wed, 12 Dec 2012 04:31:21 +0000 (22:31 -0600)]
fetchhead reading/iterating

11 years agoMerge pull request #1150 from schu/fix-netops-ssl
Vicent Martí [Wed, 19 Dec 2012 21:43:50 +0000 (13:43 -0800)]
Merge pull request #1150 from schu/fix-netops-ssl

netops: on SSL teardown only send shutdown alert

11 years agoreflog: Actual error handling
Vicent Marti [Wed, 19 Dec 2012 11:52:14 +0000 (12:52 +0100)]
reflog: Actual error handling

11 years agoreflog: Rename error handling
Vicent Marti [Wed, 19 Dec 2012 11:48:12 +0000 (12:48 +0100)]
reflog: Rename error handling

11 years agoMerge pull request #1159 from rick/be-consistent-be-be-consistent
Vicent Martí [Wed, 19 Dec 2012 18:26:54 +0000 (10:26 -0800)]
Merge pull request #1159 from rick/be-consistent-be-be-consistent

Make `goto cleanup` more consistent

11 years agoMerge pull request #1162 from scunz/cmake_cleanups
Vicent Martí [Wed, 19 Dec 2012 18:26:01 +0000 (10:26 -0800)]
Merge pull request #1162 from scunz/cmake_cleanups

RFC: Some cleanups/features in CMakeLists.txt

11 years agoMerge pull request #1164 from scunz/fixtestleak
Vicent Martí [Wed, 19 Dec 2012 18:25:04 +0000 (10:25 -0800)]
Merge pull request #1164 from scunz/fixtestleak

Fix some leaks in tests

11 years agoFix some leaks and (possibly) dangling pointers in tests
Sascha Cunz [Wed, 19 Dec 2012 07:04:31 +0000 (08:04 +0100)]
Fix some leaks and (possibly) dangling pointers in tests

Also adds some asserts.

11 years agoclone-empty-test: Don't use one pointer for two things
Sascha Cunz [Wed, 19 Dec 2012 04:24:23 +0000 (05:24 +0100)]
clone-empty-test: Don't use one pointer for two things

... so we can clean up correctly.

11 years agorevwalk-test: Don't leak the second repository
Sascha Cunz [Wed, 19 Dec 2012 04:21:11 +0000 (05:21 +0100)]
revwalk-test: Don't leak the second repository

11 years agoMSVC: Don't list all source files in an endless list
Sascha Cunz [Tue, 18 Dec 2012 19:40:57 +0000 (20:40 +0100)]
MSVC: Don't list all source files in an endless list

Instead tell MSVC to group the source files by directory.

11 years agoDRY: Add function that adds os-specific libraries to our targets
Sascha Cunz [Tue, 18 Dec 2012 18:51:31 +0000 (19:51 +0100)]
DRY: Add function that adds os-specific libraries to our targets

11 years agoCollect configuration options at the top of the file
Sascha Cunz [Tue, 18 Dec 2012 18:32:31 +0000 (19:32 +0100)]
Collect configuration options at the top of the file

- Also document the -DSTDCALL even better.

11 years agoDRY: Don't repeat globs for libgit2's own source files
Sascha Cunz [Tue, 18 Dec 2012 18:18:13 +0000 (19:18 +0100)]
DRY: Don't repeat globs for libgit2's own source files

11 years agoRemove special case source globs for Solaris
Sascha Cunz [Tue, 18 Dec 2012 18:07:59 +0000 (19:07 +0100)]
Remove special case source globs for Solaris

With the src/compat/*.c glob removed, there is no longer a difference to
the default globs we use for the IF( UNIX ) case.

11 years agoRemove src/compat/*.c from source globs
Sascha Cunz [Tue, 18 Dec 2012 18:07:08 +0000 (19:07 +0100)]
Remove src/compat/*.c from source globs

This directory doesn't exist.

11 years agoSearch for zlib unconditional
Sascha Cunz [Tue, 18 Dec 2012 18:03:29 +0000 (19:03 +0100)]
Search for zlib unconditional

Up to now, on windows we don't even bother to look if the user has a zlib
available somwhere.

In almost all larger commercial projects i've participated in, it was not
at all uncommon to have such a dependency somewhere in the source tree and
use it whereever required.
Searching for it, even if it's unlikely to be present, allows for such a
scenario (i.e. by prefilling the CMake-Cache).

11 years agoDRY: Scan for regex.c only in one place
Sascha Cunz [Tue, 18 Dec 2012 17:55:23 +0000 (18:55 +0100)]
DRY: Scan for regex.c only in one place

11 years agoOnly add deps/http-parser to include-dirs if required
Sascha Cunz [Tue, 18 Dec 2012 17:52:49 +0000 (18:52 +0100)]
Only add deps/http-parser to include-dirs if required

11 years agoMake goto cleanup more consistent
Rick Bradley [Wed, 19 Dec 2012 00:15:21 +0000 (18:15 -0600)]
Make goto cleanup more consistent

There may be some question about whether this is likely to be needed
at all, but that's above my head at the moment.

11 years agoMerge pull request #1158 from rick/i-do-not-think-this-means-what-you-think-it-means
Russell Belfer [Tue, 18 Dec 2012 23:48:17 +0000 (15:48 -0800)]
Merge pull request #1158 from rick/i-do-not-think-this-means-what-you-think-it-means

don't deref before we've asserted

11 years agodon't deref before we've asserted
Rick Bradley [Tue, 18 Dec 2012 23:46:18 +0000 (17:46 -0600)]
don't deref before we've asserted

just sayin'.

11 years agoMerge pull request #1157 from rick/trivial-comment-fix
Vicent Martí [Tue, 18 Dec 2012 22:18:04 +0000 (14:18 -0800)]
Merge pull request #1157 from rick/trivial-comment-fix

Trivial comment fix

11 years agoAlso, whitespace.
Rick Bradley [Tue, 18 Dec 2012 22:09:57 +0000 (16:09 -0600)]
Also, whitespace.

I was totally flaunting @ben's 3-space tab advice.

11 years agoImprove comment text
Rick Bradley [Tue, 18 Dec 2012 22:07:18 +0000 (16:07 -0600)]
Improve comment text

This looked wrong to me.  I *think* this is more appropriate
commentary.

11 years agoMerge pull request #1156 from scunz/another_testcrash
Vicent Martí [Tue, 18 Dec 2012 20:07:13 +0000 (12:07 -0800)]
Merge pull request #1156 from scunz/another_testcrash

Reset global variable to NULL after free'ing resource

11 years agoReset global variable to NULL after free'ing resource
Sascha Cunz [Tue, 18 Dec 2012 18:52:37 +0000 (19:52 +0100)]
Reset global variable to NULL after free'ing resource

11 years agoMerge pull request #1151 from arrbee/fix-diff-constructor-names
Vicent Martí [Mon, 17 Dec 2012 19:10:25 +0000 (11:10 -0800)]
Merge pull request #1151 from arrbee/fix-diff-constructor-names

Fix diff constructor names

11 years agoMore diff.h comment fixes
Russell Belfer [Mon, 17 Dec 2012 19:03:42 +0000 (11:03 -0800)]
More diff.h comment fixes

Based on feedback from the ObjectiveGit folks, these are some
further updates to diff.h areas that are poorly documented.

11 years agoFix diff constructor name order confusion
Russell Belfer [Mon, 17 Dec 2012 19:00:53 +0000 (11:00 -0800)]
Fix diff constructor name order confusion

The diff constructor functions had some confusing names, where the
"old" side of the diff was coming after the "new" side.  This
reverses the order in the function name to make it less confusing.

Specifically...

* git_diff_index_to_tree becomes git_diff_tree_to_index
* git_diff_workdir_to_index becomes git_diff_index_to_workdir
* git_diff_workdir_to_tree becomes git_diff_tree_to_workdir

11 years agonetops: on SSL teardown only send shutdown alert
Michael Schubert [Mon, 17 Dec 2012 18:35:40 +0000 (19:35 +0100)]
netops: on SSL teardown only send shutdown alert

According to man 3 SSL_shutdown / TLS, "If a unidirectional shutdown is
enough (the underlying connection shall be closed anyway), this first
call to SSL_shutdown() is sufficient."

Currently, an unidirectional shutdown is enough, since
gitno_ssl_teardown is called by gitno_close only. Do so to avoid further
errors (by misbehaving peers for example).

Fixes #1129.

11 years agonetops: properly handle GITNO_CONNECT_SSL_NO_CHECK_CERT
Michael Schubert [Mon, 17 Dec 2012 18:18:34 +0000 (19:18 +0100)]
netops: properly handle GITNO_CONNECT_SSL_NO_CHECK_CERT

Don't return an error just because GITNO_CONNECT_SSL_NO_CHECK_CERT is
set.

11 years agoMerge pull request #1149 from nulltoken/topic/blob_isbinary
Vicent Martí [Mon, 17 Dec 2012 18:13:36 +0000 (10:13 -0800)]
Merge pull request #1149 from nulltoken/topic/blob_isbinary

Introduce git_blob_is_binary()

11 years agoMerge pull request #1148 from scunz/test_fix
Vicent Martí [Mon, 17 Dec 2012 16:31:04 +0000 (08:31 -0800)]
Merge pull request #1148 from scunz/test_fix

Cleanup the empty-clone test correctly

11 years agoblob: introduce git_blob_is_binary()
nulltoken [Mon, 17 Dec 2012 14:15:20 +0000 (15:15 +0100)]
blob: introduce git_blob_is_binary()

11 years agoFix MSVC compilation warnings
nulltoken [Mon, 17 Dec 2012 11:20:52 +0000 (12:20 +0100)]
Fix MSVC compilation warnings

11 years agoCleanup the test correctly
Sascha Cunz [Mon, 17 Dec 2012 16:15:58 +0000 (17:15 +0100)]
Cleanup the test correctly

11 years agoFix -Wmaybe-uninitialized warning
Michael Schubert [Mon, 17 Dec 2012 14:50:12 +0000 (15:50 +0100)]
Fix -Wmaybe-uninitialized warning

11 years agoMerge pull request #1141 from ben/clone-empty-repo
Vicent Martí [Mon, 17 Dec 2012 11:17:16 +0000 (03:17 -0800)]
Merge pull request #1141 from ben/clone-empty-repo

Allow clone to handle empty repos

11 years agoEnsure static variables are nulled after every test
Ben Straub [Sun, 16 Dec 2012 20:27:11 +0000 (12:27 -0800)]
Ensure static variables are nulled after every test

11 years agoMake building samples more friendly
Ben Straub [Sun, 16 Dec 2012 18:50:10 +0000 (10:50 -0800)]
Make building samples more friendly

11 years agoFix fetchhead tests
Ben Straub [Sat, 15 Dec 2012 22:56:20 +0000 (14:56 -0800)]
Fix fetchhead tests

11 years agoCloning empty repos: only allow missing target for HEAD
Ben Straub [Sat, 15 Dec 2012 22:30:20 +0000 (14:30 -0800)]
Cloning empty repos: only allow missing target for HEAD

11 years agoMerge pull request #1145 from esc/feature/mailmap
Vicent Martí [Sat, 15 Dec 2012 19:31:25 +0000 (11:31 -0800)]
Merge pull request #1145 from esc/feature/mailmap

adding .mailmap file

11 years agoadding .mailmap file
Valentin Haenel [Sat, 15 Dec 2012 17:20:22 +0000 (18:20 +0100)]
adding .mailmap file

Help clarify who are the top commiters when using 'shortlog -sn'.

11 years agoStop returning incorrect error message
Ben Straub [Fri, 14 Dec 2012 22:16:10 +0000 (14:16 -0800)]
Stop returning incorrect error message

11 years agoRemove placeholder files during tests
Ben Straub [Fri, 14 Dec 2012 22:15:42 +0000 (14:15 -0800)]
Remove placeholder files during tests

11 years agoRebase fixup
Ben Straub [Fri, 14 Dec 2012 22:00:35 +0000 (14:00 -0800)]
Rebase fixup

11 years agoLocal Only ignore ENOTFOUNDs when adding corrupted refs
Ben Straub [Fri, 14 Dec 2012 16:35:59 +0000 (08:35 -0800)]
Local Only ignore ENOTFOUNDs when adding corrupted refs

11 years agoAllow clone to handle empty repos
Ben Straub [Thu, 13 Dec 2012 20:55:28 +0000 (12:55 -0800)]
Allow clone to handle empty repos