Commit Graph

4273 Commits

Author SHA1 Message Date
Vicent Martí
c493f8211f Merge pull request #1371 from csware/version-constants
Win32: Use constants in version resource definitions where possible
2013-02-27 11:01:16 -08:00
Sven Strickroth
82ac1f7678 Win32: Use constants in version resource definitions where possible
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2013-02-27 19:48:02 +01:00
Vicent Martí
6990377786 Merge pull request #1368 from scunz/inc_ref
Increment reference counter in git_repository_set_config
2013-02-26 09:29:27 -08:00
Sascha Cunz
25e7c9b7a6 Increment reference counter in git_repository_set_config
This fixes #1365
2013-02-26 18:21:03 +01:00
Edward Thomson
3e212548f8 Merge pull request #1364 from martinwoodward/thank-martin
Give props to Martin Pool
2013-02-26 07:06:42 -08:00
Martin Woodward
5c46937b3a Give props to Martin Pool
Martin Pool was the original author of the code referenced in the clone
example. Make note that he's given his permission and also give him the
proper credit.
2013-02-26 09:00:37 +00:00
Michael Schubert
8005c6d420 Revert "hash: remove git_hash_init from internal api"
This reverts commit efe7fad6c9, except for
the indentation fixes.
2013-02-26 01:08:34 +01:00
Vicent Martí
f657688bc7 Merge pull request #1363 from schu/hash-initialization
hash: remove git_hash_init from internal api
2013-02-25 15:41:56 -08:00
Michael Schubert
efe7fad6c9 hash: remove git_hash_init from internal api
Along with that, fix indentation in tests-clar/object/raw/hash.c
2013-02-26 00:23:00 +01:00
Michael Schubert
be225be785 tests/pack: fixup 6774b10
Initialize the hash ctx with git_hash_ctx_init, not git_hash_init.
2013-02-25 23:36:25 +01:00
Vicent Martí
989abe9be4 Merge pull request #1362 from schu/packbuilder-nits
packbuilder: minor improvements
2013-02-25 14:03:42 -08:00
Michael Schubert
6774b1071f tests/pack: do strict check of testpack's SHA1 hash 2013-02-25 22:22:15 +01:00
Michael Schubert
fcc265fef8 pack.h: improve docs on how to create a packfile 2013-02-25 22:22:15 +01:00
Vicent Martí
25a0831f2d Merge pull request #1359 from martinwoodward/remove-sample-hooks
Remove sample hook files
2013-02-25 09:07:45 -08:00
Martin Woodward
fc6c5b5001 Remove sample hook files
Getting rid of sample hook files from test repos as they just take up
space with no value.
2013-02-25 17:03:05 +00:00
Vicent Martí
5eeb357df8 Merge pull request #1355 from phkelley/development
Portability fixes for Solaris
2013-02-23 03:39:11 -08:00
Vicent Martí
68fec637a2 Merge pull request #1356 from arrbee/fix-directory-as-ignore-file
Do not fail if .gitignore is directory
2013-02-22 12:26:01 -08:00
Russell Belfer
37d9168608 Do not fail if .gitignore is directory
This is designed to fix libgit2sharp #350 where if .gitignore is
a directory we abort all operations that process ignores instead
of just skipping it as core git does.

Also added test that fails without this change and passes with it.
2013-02-22 12:21:54 -08:00
Philip Kelley
7beeb3f420 Rename 'exp' so it doesn't conflict with exp() 2013-02-22 14:03:44 -05:00
Vicent Martí
06eaa06f26 Merge pull request #1343 from nulltoken/topic/remote_orphaned_branch
Teach git_branch_remote_name() to work with orphaned heads
2013-02-22 09:48:47 -08:00
Vicent Martí
698bf1da0e Merge pull request #1354 from nulltoken/fix/stash-drop
Fix git_stash_drop()
2013-02-22 09:48:34 -08:00
Philip Kelley
6c72035fbc Portability fixes for Solaris 2013-02-22 12:23:14 -05:00
nulltoken
bbc53e4f93 branch: refactor git_branch_remote_name() tests 2013-02-22 17:04:25 +01:00
nulltoken
c1b5e8c42b branch: Make git_branch_remote_name() cope with orphaned heads 2013-02-22 17:04:23 +01:00
nulltoken
9ccab8dfb8 stash: Update the reference when dropping the topmost stash 2013-02-22 15:25:59 +01:00
nulltoken
39bcb4deb8 stash: Refactor stash::drop tests 2013-02-22 15:25:58 +01:00
nulltoken
d788499a10 ignore: enhance git_ignore_path_is_ignored() test coverage 2013-02-22 15:25:57 +01:00
Vicent Martí
0309e85045 Merge pull request #1352 from ethomson/reuc_sort
add a sorter to the reuc on index creation
2013-02-21 09:05:48 -08:00
Edward Thomson
eb5ffd1944 add a sorter to the reuc on index creation 2013-02-21 11:00:29 -06:00
Vicent Martí
f2e1d06064 Merge pull request #1351 from arrbee/moar-treebuilder-tests
Add more treebuilder tests
2013-02-20 12:00:51 -08:00
Russell Belfer
0cfce06d08 Add more treebuilder tests
The recent changes with git_treebuilder_entrycount point out that
the test coverage for git_treebuilder_remove and
git_treebuilder_entrycount is completely absent.  This adds tests.
2013-02-20 11:58:21 -08:00
Vicent Martí
6ec37f7232 Merge pull request #1350 from arrbee/fix-1292
Add explicit entrycount to tree builder
2013-02-20 11:42:15 -08:00
Russell Belfer
e223717902 Some code cleanups in tree.c
This replaces most of the explicit vector iteration with calls
to git_vector_foreach, adds in some git__free and giterr_clear
calls to clean up during some error paths, and a couple of
other code simplifications.
2013-02-20 10:58:56 -08:00
Russell Belfer
93ab370b53 Store treebuilder length separately from entries vec
The treebuilder entries vector flags removed items which means
we can't rely on the entries vector length to accurately get the
number of entries.  This adds an entrycount value and maintains it
while updating the treebuilder entries.
2013-02-20 10:50:01 -08:00
Russell Belfer
f7511c2c69 Merge pull request #1348 from libgit2/signatures-2
Simplify signature parsing
2013-02-20 10:19:58 -08:00
Vicent Martí
fd48d84317 Merge pull request #1349 from libgit2/clar-no-cache
Disable caching in Clar
2013-02-20 10:07:14 -08:00
Vicent Marti
63964c891b Disable caching in Clar 2013-02-20 18:49:00 +01:00
Vicent Marti
cf80993a50 signature: Small cleanup 2013-02-20 18:46:10 +01:00
Vicent Marti
41051e3fe1 signature: Shut up MSVC, you silly goose 2013-02-20 17:09:51 +01:00
Vicent Marti
c51880eeaf Simplify signature parsing 2013-02-20 17:03:18 +01:00
Vicent Martí
fd69c7bf9a Merge pull request #1344 from arrbee/fix-static-analyzer-issues
Fix static analyzer issues
2013-02-17 02:41:58 -08:00
Russell Belfer
56543a609a Clear up warnings from cppcheck
The cppcheck static analyzer generates warnings for a bunch of
places in the libgit2 code base.  All the ones fixed in this
commit are actually false positives, but I've reorganized the
code to hopefully make it easier for static analysis tools to
correctly understand the structure.  I wouldn't do this if I
felt like it was making the code harder to read or worse for
humans, but in this case, these fixes don't seem too bad and will
hopefully make it easier for better analysis tools to get at any
real issues.
2013-02-15 16:02:45 -08:00
Russell Belfer
71d62d3905 Fix memory leak in p_getaddrinfo on Amiga
If gethostbyname() fails on platforms with NO_ADDRINFO, the code
leaks the struct addrinfo that was allocated.  This fixes that
(and a number of code formatting issues in that area of code in
src/posix.c).
2013-02-15 16:01:31 -08:00
Russell Belfer
a7ed746093 Add rudimentary error checks and reformat comments
There were a number of functions assigning their return value to
`error` without much explanation.  I added in some rudimentary
error checking to help flesh out the example.

Also, I reformatted all of the comments down to 80 cols (and in
some cases, slightly updated the wording).
2013-02-15 15:58:13 -08:00
Vicent Martí
1d75acf7b7 Merge pull request #1342 from ghedo/development
push: fix typo in git_push_finish() doc
2013-02-15 04:21:41 -08:00
Alessandro Ghedini
91f7335e1c push: fix typo in git_push_finish() doc 2013-02-15 13:12:16 +01:00
Vicent Martí
fcd7733ded Merge pull request #1318 from nulltoken/topic/diff-tree-coverage
Topic/diff tree coverage
2013-02-14 12:49:46 -08:00
Vicent Martí
c9d17120ce Merge pull request #1340 from schu/push-docs
push: improve docs on success / failure of git_push_finish
2013-02-14 11:33:47 -08:00
Michael Schubert
a53b5e5fc3 push: improve docs on success / failure of git_push_finish 2013-02-14 20:22:48 +01:00
Ben Straub
a9e1339c06 Fix a leak when canceling a network operation 2013-02-14 08:12:55 -08:00