]> git.proxmox.com Git - libgit2.git/log
libgit2.git
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 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 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

11 years agoMerge pull request #1143 from ben/clone-options
Vicent Martí [Fri, 14 Dec 2012 21:53:50 +0000 (13:53 -0800)]
Merge pull request #1143 from ben/clone-options

Options structure for git_clone

11 years agoMove non-options back out of options struct
Ben Straub [Fri, 14 Dec 2012 21:46:45 +0000 (13:46 -0800)]
Move non-options back out of options struct

11 years agoDeploy git_clone_options to network sample
Ben Straub [Fri, 14 Dec 2012 21:18:06 +0000 (13:18 -0800)]
Deploy git_clone_options to network sample

11 years agoDeploy git_clone_options; remove git_clone_bare
Ben Straub [Fri, 14 Dec 2012 21:03:59 +0000 (13:03 -0800)]
Deploy git_clone_options; remove git_clone_bare

11 years agoIntroduce git_clone_options
Ben Straub [Fri, 14 Dec 2012 20:21:59 +0000 (12:21 -0800)]
Introduce git_clone_options

11 years agotravis: update the apt-get db
Carlos Martín Nieto [Fri, 14 Dec 2012 02:02:33 +0000 (03:02 +0100)]
travis: update the apt-get db

11 years agotests: Fix unused temp repo
Vicent Marti [Fri, 14 Dec 2012 01:49:11 +0000 (02:49 +0100)]
tests: Fix unused temp repo

11 years agotest: Fix clone tests
Vicent Marti [Fri, 14 Dec 2012 01:49:01 +0000 (02:49 +0100)]
test: Fix clone tests

11 years agoMerge remote-tracking branch 'origin/clone-auth' into development
Vicent Marti [Fri, 14 Dec 2012 01:41:53 +0000 (02:41 +0100)]
Merge remote-tracking branch 'origin/clone-auth' into development

11 years agoMerge remote-tracking branch 'jamill/transport_localpaths' into development
Vicent Marti [Thu, 13 Dec 2012 23:16:03 +0000 (00:16 +0100)]
Merge remote-tracking branch 'jamill/transport_localpaths' into development

11 years agoFix comment so it doesn't go over 100 chars
Jameson Miller [Thu, 13 Dec 2012 23:08:45 +0000 (18:08 -0500)]
Fix comment so it doesn't go over 100 chars

11 years agoAdd test to clone with absolute path
Jameson Miller [Thu, 13 Dec 2012 22:58:12 +0000 (17:58 -0500)]
Add test to clone with absolute path

11 years agoEnable authenticated clones in network sample
Ben Straub [Thu, 13 Dec 2012 19:47:14 +0000 (11:47 -0800)]
Enable authenticated clones in network sample

11 years agoTransport resolution on Win32 should handle absolute local paths
Jameson Miller [Thu, 13 Dec 2012 17:51:23 +0000 (12:51 -0500)]
Transport resolution on Win32 should handle absolute local paths

11 years agoStop premature remote freeing when cloning
Ben Straub [Thu, 13 Dec 2012 17:14:56 +0000 (09:14 -0800)]
Stop premature remote freeing when cloning

11 years agoFix network example
Ben Straub [Thu, 13 Dec 2012 16:54:23 +0000 (08:54 -0800)]
Fix network example

11 years agoDefine constant for default fetch spec
Ben Straub [Thu, 13 Dec 2012 16:47:29 +0000 (08:47 -0800)]
Define constant for default fetch spec

11 years agoMerge pull request #1139 from ethomson/index_bugfix
Ben Straub [Thu, 13 Dec 2012 03:53:05 +0000 (19:53 -0800)]
Merge pull request #1139 from ethomson/index_bugfix

don't walk off the end of the index

11 years agoConvert clone to use dangling remotes
Ben Straub [Thu, 13 Dec 2012 03:48:44 +0000 (19:48 -0800)]
Convert clone to use dangling remotes

11 years agodon't walk off the end of the index
Edward Thomson [Wed, 12 Dec 2012 23:54:12 +0000 (17:54 -0600)]
don't walk off the end of the index

11 years agoAPI to set a dangling remote's repository
Ben Straub [Wed, 12 Dec 2012 20:23:24 +0000 (12:23 -0800)]
API to set a dangling remote's repository

11 years agoAllow creation of dangling remotes
Ben Straub [Wed, 12 Dec 2012 20:15:25 +0000 (12:15 -0800)]
Allow creation of dangling remotes

11 years agoMerge pull request #1136 from pclouds/tree-cache-counts
Vicent Martí [Wed, 12 Dec 2012 14:47:50 +0000 (06:47 -0800)]
Merge pull request #1136 from pclouds/tree-cache-counts

tree cache: loosen negative entry count check

11 years agotree cache: loosen negative entry count check
Nguyễn Thái Ngọc Duy [Wed, 12 Dec 2012 12:23:05 +0000 (19:23 +0700)]
tree cache: loosen negative entry count check

While C Git has been writing entry count -1 (ie. never other negative
numbers) as invalid since day 1, it accepts all negative entry counts
as invalid. JGit follows the same rule. libgit2 should also follow, or
the index that works with C Git or JGit may someday be rejected by
libgit2.

Other reimplementations like dulwich and grit have not bothered with
parsing or writing tree cache.

11 years agoMerge pull request #1135 from ymendel/patch-1
Vicent Martí [Tue, 11 Dec 2012 23:10:25 +0000 (15:10 -0800)]
Merge pull request #1135 from ymendel/patch-1

ignore mkmf.log

11 years agoignore mkmf.log
Yossef Mendelssohn [Tue, 11 Dec 2012 23:08:08 +0000 (15:08 -0800)]
ignore mkmf.log

no build artifacts
no parents

11 years agoMerge pull request #1133 from arrbee/more-iterator-cleanup
Vicent Martí [Mon, 10 Dec 2012 23:54:15 +0000 (15:54 -0800)]
Merge pull request #1133 from arrbee/more-iterator-cleanup

More iterator cleanup

11 years agoFix iterator reset and add reset ranges
Russell Belfer [Mon, 10 Dec 2012 23:29:44 +0000 (15:29 -0800)]
Fix iterator reset and add reset ranges

The `git_iterator_reset` command has not been working in all cases
particularly when there is a start and end range.  This fixes it
and adds tests for it, and also extends it with the ability to
update the start/end range strings when an iterator is reset.

11 years agoClean up iterator APIs
Russell Belfer [Thu, 6 Dec 2012 21:26:58 +0000 (13:26 -0800)]
Clean up iterator APIs

This removes the need to explicitly pass the repo into iterators
where the repo is implied by the other parameters.  This moves
the repo to be owned by the parent struct.  Also, this has some
iterator related updates to the internal diff API to lay the
groundwork for checkout improvements.

11 years agoAdd git_cred_acquire_cb payload to winhttp transport
Ben Straub [Mon, 10 Dec 2012 19:48:20 +0000 (11:48 -0800)]
Add git_cred_acquire_cb payload to winhttp transport

11 years agoMerge pull request #1132 from ben/cred-acquire-payload
Vicent Martí [Mon, 10 Dec 2012 19:40:49 +0000 (11:40 -0800)]
Merge pull request #1132 from ben/cred-acquire-payload

Add a payload param to git_cred_acquire_cb

11 years agoAdd a payload param to git_cred_acquire_cb
Ben Straub [Mon, 10 Dec 2012 19:11:01 +0000 (11:11 -0800)]
Add a payload param to git_cred_acquire_cb

Fixes #1128.

11 years agoClean up GCC build warnings
Ben Straub [Mon, 10 Dec 2012 18:05:31 +0000 (10:05 -0800)]
Clean up GCC build warnings

11 years agoMerge pull request #1126 from carlosmn/indexer-buffer
Vicent Martí [Mon, 10 Dec 2012 14:55:59 +0000 (06:55 -0800)]
Merge pull request #1126 from carlosmn/indexer-buffer

indexer: move the temporary buffers into the indexer object

11 years agoMerge pull request #1127 from libgit2/fix-mwindow-threading
Vicent Martí [Mon, 10 Dec 2012 14:55:13 +0000 (06:55 -0800)]
Merge pull request #1127 from libgit2/fix-mwindow-threading

Fix mwindow mutex initialization and error checking

11 years agoorite C89
Justin Spahr-Summers [Sun, 9 Dec 2012 10:40:16 +0000 (02:40 -0800)]
orite C89

11 years agoTreat git_mutex_lock as successful when threads are disabled
Justin Spahr-Summers [Sun, 9 Dec 2012 10:37:33 +0000 (02:37 -0800)]
Treat git_mutex_lock as successful when threads are disabled

11 years agoAlways check the result of git_mutex_lock
Justin Spahr-Summers [Sun, 9 Dec 2012 10:31:39 +0000 (02:31 -0800)]
Always check the result of git_mutex_lock

11 years agogit__mwindow_mutex needs to be initialized even with pthreads
Justin Spahr-Summers [Sun, 9 Dec 2012 10:22:50 +0000 (02:22 -0800)]
git__mwindow_mutex needs to be initialized even with pthreads

This could also use PTHREAD_MUTEX_INITIALIZER, but a dynamic initializer seems like a more portable concept, and we won't need another #define on top of git_mutex_init()

11 years agoindexer: move the temporary buffers into the indexer object
Carlos Martín Nieto [Fri, 7 Dec 2012 18:23:16 +0000 (19:23 +0100)]
indexer: move the temporary buffers into the indexer object

Storing 4kB or 8kB in the stack is not very gentle. As this part has
to be linear, put the buffer into the indexer object so we allocate it
once in the heap.

11 years agoMerge pull request #1091 from carlosmn/stream-object
Vicent Martí [Fri, 7 Dec 2012 17:40:21 +0000 (09:40 -0800)]
Merge pull request #1091 from carlosmn/stream-object

Indexer speedup with large objects

11 years agoMerge pull request #1123 from carlosmn/lax-tree
Vicent Martí [Fri, 7 Dec 2012 16:29:53 +0000 (08:29 -0800)]
Merge pull request #1123 from carlosmn/lax-tree

tree: relax the filemode parser

11 years agotree: relax the filemode parser
Carlos Martín Nieto [Fri, 7 Dec 2012 14:16:41 +0000 (15:16 +0100)]
tree: relax the filemode parser

There are many different broken filemodes in the wild so we need to
protect against them and give something useful up the chain. Don't
fail when reading a tree from the ODB but normalize the mode as best
we can.

As 664 is no longer a mode that we consider to be valid and gets
normalized to 644, we can stop accepting it in the treebuilder. The
library won't expose it to the user, so any invalid modes are a bug.

11 years agoAllow compilation as C++
Ben Straub [Fri, 7 Dec 2012 03:41:52 +0000 (19:41 -0800)]
Allow compilation as C++

11 years agotravis: Try this key
Vicent Marti [Thu, 6 Dec 2012 16:39:56 +0000 (17:39 +0100)]
travis: Try this key

11 years agotravis: Fix this hook
Vicent Marti [Thu, 6 Dec 2012 16:08:53 +0000 (17:08 +0100)]
travis: Fix this hook

11 years agotravis: Campfire notifications. Of course.
Vicent Marti [Thu, 6 Dec 2012 14:52:15 +0000 (15:52 +0100)]
travis: Campfire notifications. Of course.

11 years agoMerge pull request #1120 from arrbee/diff-header-fixes
Vicent Martí [Wed, 5 Dec 2012 22:07:27 +0000 (14:07 -0800)]
Merge pull request #1120 from arrbee/diff-header-fixes

Fix diff header comments and missing const

11 years agoFix diff header comments and missing const
Russell Belfer [Wed, 5 Dec 2012 21:56:32 +0000 (13:56 -0800)]
Fix diff header comments and missing const

Based on the recent work to wrap diff in objective-git, this
includes a fix for a missing const and a number of clarifications
of the documentation.

11 years agotests: MSVC fix
Vicent Marti [Wed, 5 Dec 2012 20:06:54 +0000 (21:06 +0100)]
tests: MSVC fix

11 years agoversions: MSVC build fixes
Vicent Marti [Wed, 5 Dec 2012 19:56:27 +0000 (20:56 +0100)]
versions: MSVC build fixes

11 years agocommon: Silly vmg.
Vicent Marti [Wed, 5 Dec 2012 19:54:03 +0000 (20:54 +0100)]
common: Silly vmg.

11 years agocommon: Silly MSVC
Vicent Marti [Wed, 5 Dec 2012 19:50:19 +0000 (20:50 +0100)]
common: Silly MSVC

11 years agoMerge pull request #1115 from ben/struct-versions
Vicent Martí [Wed, 5 Dec 2012 19:47:19 +0000 (11:47 -0800)]
Merge pull request #1115 from ben/struct-versions

Version info for public structs

11 years agoFix erroneous whitespace guideline
Ben Straub [Wed, 5 Dec 2012 16:22:28 +0000 (08:22 -0800)]
Fix erroneous whitespace guideline

11 years agoindentation fix
Edward Thomson [Tue, 4 Dec 2012 22:59:34 +0000 (16:59 -0600)]
indentation fix

11 years agoMerge pull request #1119 from ethomson/symlink_cast_ouch
Vicent Martí [Tue, 4 Dec 2012 22:47:25 +0000 (14:47 -0800)]
Merge pull request #1119 from ethomson/symlink_cast_ouch

Hey that's not an int!

11 years agohey don't stomp on my memory!
Edward Thomson [Tue, 4 Dec 2012 22:40:09 +0000 (16:40 -0600)]
hey don't stomp on my memory!

11 years agoMerge pull request #1111 from ethomson/conflictstatus
Russell Belfer [Mon, 3 Dec 2012 21:20:39 +0000 (13:20 -0800)]
Merge pull request #1111 from ethomson/conflictstatus

status should ignore conflicts entries in the index

11 years agostatus should ignore conflicts entries in the index
Edward Thomson [Thu, 29 Nov 2012 04:43:55 +0000 (22:43 -0600)]
status should ignore conflicts entries in the index

11 years agoDon't unconstify when casting
Ben Straub [Mon, 3 Dec 2012 20:45:15 +0000 (12:45 -0800)]
Don't unconstify when casting

11 years agoRemove GIT_SIGNATURE_VERSION and friends
Ben Straub [Mon, 3 Dec 2012 20:41:50 +0000 (12:41 -0800)]
Remove GIT_SIGNATURE_VERSION and friends

11 years agoRemove GIT_CRED_VERSION and friends
Ben Straub [Mon, 3 Dec 2012 20:41:38 +0000 (12:41 -0800)]
Remove GIT_CRED_VERSION and friends

11 years agoMerge pull request #1112 from barrbrain/odb-pack-read-header
Vicent Martí [Mon, 3 Dec 2012 15:38:58 +0000 (07:38 -0800)]
Merge pull request #1112 from barrbrain/odb-pack-read-header

odb-pack: resurrect pack_backend__read_header