]>
git.proxmox.com Git - libgit2.git/log
Scott J. Goldman [Wed, 28 Nov 2012 00:37:11 +0000 (16:37 -0800)]
Add tests for ahead-behind count
Scott J. Goldman [Wed, 28 Nov 2012 00:36:50 +0000 (16:36 -0800)]
Add initial implementation of ahead-behind count
Vicent Martí [Wed, 28 Nov 2012 12:14:24 +0000 (04:14 -0800)]
Merge pull request #1109 from scunz/uninitialized
Fix uninitialized variable
Sascha Cunz [Wed, 28 Nov 2012 11:43:12 +0000 (12:43 +0100)]
Fix uninitialized variable
clang-SVN HEAD kindly provided my the info, that sm_repo maybe
uninitialized when we want to free it (If the expression in line 358 or
359/360 evaluate to true, we jump to "cleanup", where we'd use sm_repo
uninitialized).
Vicent Marti [Wed, 28 Nov 2012 10:47:38 +0000 (11:47 +0100)]
object: Raise proper code on invalid object type
Vicent Marti [Wed, 28 Nov 2012 09:47:10 +0000 (10:47 +0100)]
odb: Add `git_odb_add_disk_alternate`
Loads a disk alternate by path to the ODB. Mimics the
`GIT_ALTERNATE_OBJECT_DIRECTORIES` shell var.
Ben Straub [Wed, 28 Nov 2012 02:59:22 +0000 (18:59 -0800)]
Merge pull request #1087 from libgit2/great-renaming
The Great Renaming of 2012
Russell Belfer [Tue, 27 Nov 2012 23:28:48 +0000 (15:28 -0800)]
Various minor commenting fixes
Russell Belfer [Tue, 27 Nov 2012 23:00:49 +0000 (15:00 -0800)]
Make git_odb_foreach_cb take const param
This makes the first OID param of the ODB callback a const pointer
and also propogates that change all the way to the backends.
Russell Belfer [Tue, 27 Nov 2012 23:00:28 +0000 (15:00 -0800)]
Clarify git_message_prettify comments
Russell Belfer [Tue, 27 Nov 2012 22:47:39 +0000 (14:47 -0800)]
Remove git_note_data structure
Ben Straub [Tue, 27 Nov 2012 22:18:51 +0000 (14:18 -0800)]
API updates for transport.h
Ben Straub [Tue, 27 Nov 2012 22:13:03 +0000 (14:13 -0800)]
Typedef enums.
Ben Straub [Tue, 27 Nov 2012 22:06:56 +0000 (14:06 -0800)]
API updates for stash.h
Ben Straub [Tue, 27 Nov 2012 22:03:53 +0000 (14:03 -0800)]
API updates for signature.h
Ben Straub [Tue, 27 Nov 2012 22:01:24 +0000 (14:01 -0800)]
API updates for revwalk.h
Ben Straub [Tue, 27 Nov 2012 21:44:49 +0000 (13:44 -0800)]
API updates for repository.h
Ben Straub [Tue, 27 Nov 2012 21:30:04 +0000 (13:30 -0800)]
Fix warning
Ben Straub [Tue, 27 Nov 2012 21:15:43 +0000 (13:15 -0800)]
API updates for remote.h
Includes typedef for git_direction, and renames for
GIT_DIR_[FETCH|PUSH] to GIT_DIRECTION_(\1).
Ben Straub [Tue, 27 Nov 2012 20:45:44 +0000 (12:45 -0800)]
API updates for oid.h
Ben Straub [Tue, 27 Nov 2012 20:33:58 +0000 (12:33 -0800)]
API updates for odb_backend.h
Ben Straub [Tue, 27 Nov 2012 17:49:16 +0000 (09:49 -0800)]
API updates for odb.h
Ben Straub [Tue, 27 Nov 2012 04:09:38 +0000 (20:09 -0800)]
API updates for notes.h/c.
Ben Straub [Tue, 27 Nov 2012 04:00:34 +0000 (20:00 -0800)]
API updates for net.h
Ben Straub [Tue, 27 Nov 2012 03:56:01 +0000 (19:56 -0800)]
API updates for message.h
Ben Straub [Tue, 27 Nov 2012 03:53:04 +0000 (19:53 -0800)]
Format/documentation tweaks for merge.h
Ben Straub [Tue, 27 Nov 2012 03:47:47 +0000 (19:47 -0800)]
Move merge functions to merge.c
In so doing, promote commit_list to git_commit_list,
with its own internal API header.
Ben Straub [Mon, 26 Nov 2012 20:04:07 +0000 (12:04 -0800)]
API updates for indexer.h
Russell Belfer [Wed, 21 Nov 2012 23:39:03 +0000 (15:39 -0800)]
Fix warnings on Win64 build
Russell Belfer [Wed, 21 Nov 2012 19:57:06 +0000 (11:57 -0800)]
update internal index API to avoid cast
Russell Belfer [Wed, 21 Nov 2012 19:53:54 +0000 (11:53 -0800)]
API updates for status.h
Russell Belfer [Wed, 21 Nov 2012 19:12:33 +0000 (11:12 -0800)]
Fixing up some comments in strarray.h
Russell Belfer [Wed, 21 Nov 2012 19:03:07 +0000 (11:03 -0800)]
Fix up some missing consts in tree & index
This fixes some missed places where we can apply const-ness to
various public APIs.
There are still some index and tree APIs that cannot take const
pointers because we sort our `git_vectors` lazily and so we can't
reliably bsearch the index and tree content without applying a
`git_vector_sort()` first.
This also fixes some missed places where size_t can be used and
where const can be applied to a couple internal functions.
Ben Straub [Wed, 21 Nov 2012 02:57:46 +0000 (19:57 -0700)]
API updates for index.h
Russell Belfer [Wed, 21 Nov 2012 01:06:54 +0000 (17:06 -0800)]
API updates for tag.h
Russell Belfer [Wed, 21 Nov 2012 00:57:16 +0000 (16:57 -0800)]
API updates for submodule.h
Russell Belfer [Wed, 21 Nov 2012 00:36:06 +0000 (16:36 -0800)]
Update diff callback param order
This makes the diff functions that take callbacks both take
the payload parameter after the callback function pointers and
pass the payload as the last argument to the callback function
instead of the first. This should make them consistent with
other callbacks across the API.
Ben Straub [Wed, 21 Nov 2012 00:02:25 +0000 (16:02 -0800)]
Clean up config.h
Russell Belfer [Tue, 20 Nov 2012 22:03:05 +0000 (14:03 -0800)]
Update callback fn ptr for git_reference_foreach
As part of API review, use a typedef for the callback fn ptr.
Russell Belfer [Tue, 20 Nov 2012 22:01:46 +0000 (14:01 -0800)]
API review / update for tree.h
Russell Belfer [Tue, 20 Nov 2012 20:13:52 +0000 (12:13 -0800)]
Updates to reset.h
Ben Straub [Mon, 19 Nov 2012 05:20:47 +0000 (22:20 -0700)]
Examples: fix clone api
Ben Straub [Mon, 19 Nov 2012 05:20:26 +0000 (22:20 -0700)]
Examples: fix reference names
Vicent Marti [Sun, 18 Nov 2012 03:54:47 +0000 (19:54 -0800)]
More external API cleanup
Conflicts:
src/branch.c
tests-clar/refs/branches/create.c
Ben Straub [Mon, 19 Nov 2012 04:38:08 +0000 (21:38 -0700)]
Rename ref and reflog apis for consistency
Vicent Martí [Mon, 26 Nov 2012 13:42:49 +0000 (05:42 -0800)]
Merge pull request #1106 from frasertweedale/fix/freebsd-build
fix build on FreeBSD
Fraser Tweedale [Mon, 26 Nov 2012 13:29:34 +0000 (23:29 +1000)]
fix build on FreeBSD
3f9eb1e introduced support for SSL certificates issued for IP
addresses, making use of in_addr and in_addr6 structs. On FreeBSD
these are defined in (a file included in) <netinet/in.h>, so include
that file on FreeBSD and get the build working again.
Vicent Martí [Mon, 26 Nov 2012 11:56:25 +0000 (03:56 -0800)]
Merge pull request #1101 from csware/prevent_die
pack.c: Set p->mwf.fd to -1 on error
Vicent Martí [Mon, 26 Nov 2012 11:53:53 +0000 (03:53 -0800)]
Merge pull request #1105 from delanne/invalid_read_config_file
Fix invalid read reported by valgrind
delanne [Mon, 26 Nov 2012 11:12:41 +0000 (12:12 +0100)]
Fix invalid read reported by valgrind
Sven Strickroth [Sat, 24 Nov 2012 14:48:17 +0000 (15:48 +0100)]
Set p->mwf.fd to -1 on error
If p->mwf.fd is e.g. -2 then it is closed in packfile_free and an exception might be thrown.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Vicent Martí [Fri, 23 Nov 2012 23:19:47 +0000 (15:19 -0800)]
Merge pull request #1097 from nulltoken/topic/head_tree_error
Make `git_repository_head_tree()` return error codes
Vicent Martí [Fri, 23 Nov 2012 23:18:30 +0000 (15:18 -0800)]
Merge pull request #1093 from libgit2/contributing
Create contributing guidelines
Vicent Martí [Fri, 23 Nov 2012 23:17:48 +0000 (15:17 -0800)]
Merge pull request #1098 from scunz/cleanup_in_cleanup
Reset all static variables to NULL in clar's __cleanup
Edward Thomson [Fri, 23 Nov 2012 19:33:32 +0000 (11:33 -0800)]
Merge pull request #1100 from martinwoodward/fuckityfuck
Remove use of English expletives
Martin Woodward [Fri, 23 Nov 2012 13:31:22 +0000 (13:31 +0000)]
Remove use of English expletives
Remove words such as fuck, crap, shit etc.
Remove other potentially offensive words from comments.
Tidy up other geopolicital terms in comments.
Sascha Cunz [Fri, 23 Nov 2012 10:41:56 +0000 (11:41 +0100)]
Reset all static variables to NULL in clar's __cleanup
Without this change, any failed assertion in the second (or a later) test
inside a test suite has a chance of double deleting memory, resulting in
a heap corruption. See #1096 for details.
This leaves alone the test cases where we "just" use cl_git_sandbox_init()
and cl_git_sandbox_cleanup(). These methods already take good care to not
double delete a repository.
Fixes #1096
nulltoken [Thu, 22 Nov 2012 17:51:06 +0000 (18:51 +0100)]
repo: Make git_repository_head_tree() return error codes
nulltoken [Thu, 22 Nov 2012 17:50:50 +0000 (18:50 +0100)]
test: Minor fixes
Philip Kelley [Thu, 22 Nov 2012 16:16:35 +0000 (11:16 -0500)]
Call git_remote_update_tips before git_remote_disconnect
Philip Kelley [Thu, 22 Nov 2012 16:10:35 +0000 (08:10 -0800)]
Merge pull request #1095 from martinwoodward/authors
Update to Authors
Ben Straub [Wed, 21 Nov 2012 20:42:12 +0000 (13:42 -0700)]
Rewrite conventions to be more complete
Ben Straub [Wed, 21 Nov 2012 04:04:52 +0000 (21:04 -0700)]
Markdownize CONVENTIONS
Ben Straub [Wed, 21 Nov 2012 03:59:58 +0000 (20:59 -0700)]
Add contributing guidelines
Russell Belfer [Tue, 20 Nov 2012 23:02:06 +0000 (15:02 -0800)]
Merge pull request #1092 from arrbee/legal-to-not-have-gitconfig
It is okay to not have a .gitconfig file
Russell Belfer [Tue, 20 Nov 2012 22:50:36 +0000 (14:50 -0800)]
Need to clear ignored error from config load
Russell Belfer [Tue, 20 Nov 2012 19:34:12 +0000 (11:34 -0800)]
Merge pull request #1089 from edubart/fix_win32_lstat
Fix win32 lstat
Russell Belfer [Tue, 20 Nov 2012 18:24:18 +0000 (10:24 -0800)]
It is okay to not have a .gitconfig file
Opening a repo is generating an error if you don't have a
.gitconfig file in your home directory, but that should be
legal.
Eduardo Bart [Tue, 20 Nov 2012 03:19:31 +0000 (01:19 -0200)]
Minor optimization in win32 do_lstat
Eduardo Bart [Tue, 20 Nov 2012 02:57:56 +0000 (00:57 -0200)]
Update clar tests p_lstat_posixly and p_lstat
Eduardo Bart [Tue, 20 Nov 2012 01:12:20 +0000 (23:12 -0200)]
update win32 lstat comment
Eduardo Bart [Tue, 20 Nov 2012 00:30:20 +0000 (22:30 -0200)]
Fix win32 lstat
Russell Belfer [Mon, 19 Nov 2012 20:11:01 +0000 (12:11 -0800)]
Merge pull request #1086 from scunz/vs_warning_level
VS-Build: Append C_FLAGS to the end of the already given ones.
Sascha Cunz [Mon, 19 Nov 2012 03:48:40 +0000 (04:48 +0100)]
VS-Build: Disable /W4 parameter, as it is not picked up anyway
My other PR revealed, that the /W4 parameter, we give to MSVC is ignored
because cmake set CMAKE_C_FLAGS already to /W3 and we overwrite it.
The command line tools gave me a D9025 warning for this on every file and
looking into the project properties page on MSVC 2008 tells, that it has
the warning level set to /W3.
However, the warnings introduced by /W4 are far to useless for having
them enabled. So just disable them.
Russell Belfer [Mon, 19 Nov 2012 19:53:04 +0000 (11:53 -0800)]
Merge pull request #1085 from scunz/no_pch_for_nmake
Don't use precompiled headers for command-line based VC builds.
Sascha Cunz [Mon, 19 Nov 2012 03:40:58 +0000 (04:40 +0100)]
Don't use precompiled headers for command-line based VC builds.
The reason, why libgit2 currently cannot support compiling via the command-line
tools cl/nmake from WinSDK and/or Microsoft Visual Studio, seems to be a
missing dependency on the generated precompiled header file.
The Visual Studio IDE automatically inserts this dependency when it sees the
right combination of "/Y" parameters.
This patch allows to compile using command line tools by disabling precompiled
headers for NON-IDE builds.
Vicent Martí [Mon, 19 Nov 2012 01:19:20 +0000 (17:19 -0800)]
Merge pull request #1084 from libgit2/filename-validation
Filename validation
Scott J. Goldman [Mon, 19 Nov 2012 00:59:42 +0000 (16:59 -0800)]
Add a test for invalid filenames while writing tree from index
Scott J. Goldman [Mon, 19 Nov 2012 00:52:04 +0000 (16:52 -0800)]
Catch invalid filenames in append_entry()
This prevents the index api from calling write_tree() with a
bogus tree.
Scott J. Goldman [Sun, 18 Nov 2012 23:15:24 +0000 (15:15 -0800)]
Prevent creating `..`, `.`, and `.git` with tree builder
As per core git.
Vicent Martí [Sun, 18 Nov 2012 22:15:04 +0000 (14:15 -0800)]
Merge pull request #1082 from scunz/fixDoubleDeleteOnError
Indexer: Avoid a possible double-deletion in error case
Sascha Cunz [Sun, 18 Nov 2012 08:07:35 +0000 (09:07 +0100)]
Indexer: Avoid a possible double-deletion in error case
Michael Schubert [Sun, 18 Nov 2012 03:27:49 +0000 (04:27 +0100)]
Fix a couple of warnings
nulltoken [Sun, 18 Nov 2012 02:42:40 +0000 (18:42 -0800)]
Merge pull request #1077 from nulltoken/fix/api
Itsy bitsy tiny winy minor api related fixes
nulltoken [Sun, 18 Nov 2012 02:29:51 +0000 (18:29 -0800)]
reflog: make entry_byindex() and drop() git compliant
Passing 0 as the index now retrieves the most recent entry instead
of the oldest one.
nulltoken [Sun, 18 Nov 2012 02:24:10 +0000 (18:24 -0800)]
reflog: Fix documentation
nulltoken [Sat, 17 Nov 2012 21:39:24 +0000 (13:39 -0800)]
config: Opening a nonexistent file returns ENOTFOUND
nulltoken [Sat, 17 Nov 2012 20:34:15 +0000 (12:34 -0800)]
config: Make git_config_file__ondisk() internal
nulltoken [Sat, 17 Nov 2012 15:19:14 +0000 (07:19 -0800)]
repo: ensure is_empty() checks there are no refs
nulltoken [Sat, 17 Nov 2012 14:46:42 +0000 (06:46 -0800)]
tests: introduce cl_git_remove_placeholders()
nulltoken [Sat, 17 Nov 2012 14:56:19 +0000 (06:56 -0800)]
repo: readonly tests don't need a sandboxed repo
nulltoken [Sat, 17 Nov 2012 13:22:39 +0000 (05:22 -0800)]
env: ensure git_futils_find_xxx() returns ENOTFOUND
nulltoken [Sat, 17 Nov 2012 13:12:14 +0000 (05:12 -0800)]
tag: rename git_tag_type to git_tag_target_type
nulltoken [Sat, 17 Nov 2012 12:50:48 +0000 (04:50 -0800)]
Fix MSVC compilation warnings
Vicent Martí [Fri, 16 Nov 2012 18:27:46 +0000 (10:27 -0800)]
Merge pull request #1075 from carlosmn/alternates-recurse
odb: recursively load alternates
Carlos Martín Nieto [Wed, 14 Nov 2012 21:35:43 +0000 (13:35 -0800)]
odb: recursively load alternates
The maximum depth is 5, like in git
Scott J. Goldman [Fri, 16 Nov 2012 07:28:52 +0000 (23:28 -0800)]
Merge pull request #1071 from arrbee/alternate-fix-strcmp
Win32 fixes for diff/checkout/reset
Michael Schubert [Fri, 16 Nov 2012 01:30:00 +0000 (02:30 +0100)]
AUTHORS: cleanup
Michael Schubert [Fri, 16 Nov 2012 01:17:57 +0000 (02:17 +0100)]
Fix -Wmaybe-uninitialized warning
Ben Straub [Fri, 16 Nov 2012 00:20:02 +0000 (16:20 -0800)]
Include Microsoft in AUTHORS