Vicent Martí
e62171e2fc
Merge pull request #1151 from arrbee/fix-diff-constructor-names
...
Fix diff constructor names
2012-12-17 11:10:25 -08:00
Russell Belfer
ba084f7aaf
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.
2012-12-17 11:03:42 -08:00
Russell Belfer
56c72b759c
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
2012-12-17 11:00:53 -08:00
Michael Schubert
f2b00cbdf6
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 .
2012-12-17 19:46:27 +01:00
Michael Schubert
9c8dbc8893
netops: properly handle GITNO_CONNECT_SSL_NO_CHECK_CERT
...
Don't return an error just because GITNO_CONNECT_SSL_NO_CHECK_CERT is
set.
2012-12-17 19:32:15 +01:00
Vicent Martí
0d10e79dd9
Merge pull request #1149 from nulltoken/topic/blob_isbinary
...
Introduce git_blob_is_binary()
2012-12-17 10:13:36 -08:00
Vicent Martí
f79535092d
Merge pull request #1148 from scunz/test_fix
...
Cleanup the empty-clone test correctly
2012-12-17 08:31:04 -08:00
nulltoken
a3337f10bb
blob: introduce git_blob_is_binary()
2012-12-17 17:20:31 +01:00
nulltoken
bdb94c21fd
Fix MSVC compilation warnings
2012-12-17 17:16:32 +01:00
Sascha Cunz
22d23c61ed
Cleanup the test correctly
2012-12-17 17:15:58 +01:00
Michael Schubert
101659be5d
Fix -Wmaybe-uninitialized warning
2012-12-17 15:50:12 +01:00
Vicent Martí
69a402d46c
Merge pull request #1141 from ben/clone-empty-repo
...
Allow clone to handle empty repos
2012-12-17 03:17:16 -08:00
Ben Straub
c4e3e797d1
Ensure static variables are nulled after every test
2012-12-16 12:27:11 -08:00
Ben Straub
cc3e9b5af4
Make building samples more friendly
2012-12-16 10:50:10 -08:00
Ben Straub
a7f125cdba
Fix fetchhead tests
2012-12-15 14:56:20 -08:00
Ben Straub
2a2d1ab086
Cloning empty repos: only allow missing target for HEAD
2012-12-15 14:30:20 -08:00
Vicent Martí
71131b5509
Merge pull request #1145 from esc/feature/mailmap
...
adding .mailmap file
2012-12-15 11:31:25 -08:00
Valentin Haenel
d777a4078c
adding .mailmap file
...
Help clarify who are the top commiters when using 'shortlog -sn'.
2012-12-15 18:20:23 +01:00
Ben Straub
28abb187c4
Stop returning incorrect error message
2012-12-14 14:16:10 -08:00
Ben Straub
57f5d8dca5
Remove placeholder files during tests
2012-12-14 14:15:42 -08:00
Ben Straub
1164acde96
Rebase fixup
2012-12-14 14:00:35 -08:00
Ben Straub
b524fe1a3c
Local Only ignore ENOTFOUNDs when adding corrupted refs
2012-12-14 13:58:44 -08:00
Ben Straub
850b1edfe8
Allow clone to handle empty repos
2012-12-14 13:58:44 -08:00
Vicent Martí
be5869fce0
Merge pull request #1143 from ben/clone-options
...
Options structure for git_clone
2012-12-14 13:53:50 -08:00
Ben Straub
b9e7e2b4e1
Move non-options back out of options struct
2012-12-14 13:46:45 -08:00
Ben Straub
0015b5875e
Deploy git_clone_options to network sample
2012-12-14 13:18:06 -08:00
Ben Straub
18b2d560d3
Deploy git_clone_options; remove git_clone_bare
2012-12-14 13:03:59 -08:00
Ben Straub
7e61044019
Introduce git_clone_options
2012-12-14 12:30:57 -08:00
Carlos Martín Nieto
37ac44366b
travis: update the apt-get db
2012-12-14 03:12:03 +01:00
Vicent Marti
2d466b7dcb
tests: Fix unused temp repo
2012-12-14 02:49:11 +01:00
Vicent Marti
509216a5b2
test: Fix clone tests
2012-12-14 02:49:01 +01:00
Vicent Marti
b0b9fd3245
Merge remote-tracking branch 'origin/clone-auth' into development
2012-12-14 02:41:53 +01:00
Vicent Marti
44f5f777ae
Merge remote-tracking branch 'jamill/transport_localpaths' into development
2012-12-14 00:16:03 +01:00
Jameson Miller
f0a2def5e4
Fix comment so it doesn't go over 100 chars
2012-12-13 18:08:45 -05:00
Jameson Miller
8a8820d89f
Add test to clone with absolute path
2012-12-13 17:58:12 -05:00
Ben Straub
2b10a2b0e8
Enable authenticated clones in network sample
2012-12-13 11:47:14 -08:00
Jameson Miller
cb2ace69f4
Transport resolution on Win32 should handle absolute local paths
2012-12-13 14:42:40 -05:00
Ben Straub
24393ea6d3
Stop premature remote freeing when cloning
2012-12-13 09:14:56 -08:00
Ben Straub
34c8c75433
Fix network example
2012-12-13 08:54:23 -08:00
Ben Straub
7c353afd0e
Define constant for default fetch spec
2012-12-13 08:47:29 -08:00
Ben Straub
ae0ddc6f02
Merge pull request #1139 from ethomson/index_bugfix
...
don't walk off the end of the index
2012-12-12 19:53:05 -08:00
Ben Straub
44f36f6e3b
Convert clone to use dangling remotes
2012-12-12 19:48:44 -08:00
Edward Thomson
e759b07217
don't walk off the end of the index
2012-12-12 17:54:12 -06:00
Ben Straub
b914e17d82
API to set a dangling remote's repository
2012-12-12 12:23:24 -08:00
Ben Straub
a71c27ccda
Allow creation of dangling remotes
2012-12-12 12:15:25 -08:00
Vicent Martí
6cacd44bd0
Merge pull request #1136 from pclouds/tree-cache-counts
...
tree cache: loosen negative entry count check
2012-12-12 06:47:50 -08:00
Nguyễn Thái Ngọc Duy
08f3d6caf4
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.
2012-12-12 19:23:05 +07:00
Vicent Martí
8d13035e0d
Merge pull request #1135 from ymendel/patch-1
...
ignore mkmf.log
2012-12-11 15:10:25 -08:00
Yossef Mendelssohn
640716176b
ignore mkmf.log
...
no build artifacts
no parents
2012-12-11 15:08:08 -08:00
Vicent Martí
55325efa1d
Merge pull request #1133 from arrbee/more-iterator-cleanup
...
More iterator cleanup
2012-12-10 15:54:15 -08:00
