Carlos Martín Nieto
792d750bed
Merge pull request #2741 from ethomson/fetch-twice
...
win32: clear connection data on close
2014-12-03 13:38:48 +01:00
Edward Thomson
70d21742bf
win32: clear connection data on close
2014-12-03 00:41:46 -05:00
Edward Thomson
169497d1e7
Merge pull request #2734 from jeffhostetler/jeffhostetler/git_mkfile
...
fix cl_git_mkfile() to test for -1 rather than 0 for errors from p_creat...
2014-12-01 10:43:11 -05:00
Carlos Martín Nieto
fea15f7c74
Merge pull request #2736 from ethomson/describe_errorcode
...
describe: check error codes
2014-11-30 01:52:22 +01:00
Edward Thomson
32e2b758cf
describe: check error codes
2014-11-29 15:57:35 -05:00
Jeff Hostetler
93aef71e90
fix cl_git_mkfile() to test for -1 rather than 0 for errors from p_creat()
2014-11-26 14:12:11 -05:00
Edward Thomson
53e48b370c
Merge pull request #2727 from libgit2/cmn/travis-jobs
...
Regain non-threadsafe builds and make the valgrind build failable
2014-11-23 17:28:26 -05:00
Edward Thomson
e952bc5a57
Merge pull request #2718 from libgit2/cmn/peeling-errors
...
peel: reject bad queries with EPEEL
2014-11-23 17:15:18 -05:00
Carlos Martín Nieto
f7fcb18f8a
Plug leaks
...
Valgrind is now clean except for libssl and libgcrypt.
2014-11-23 15:51:31 +01:00
Carlos Martín Nieto
753e17b0f5
peel: reject bad queries with EINVALIDSPEC
...
There are some combination of objects and target types which we know
cannot be fulfilled. Return EINVALIDSPEC for those to signify that there
is a mismatch in the user-provided data and what the object model is
capable of satisfying.
If we start at a tag and in the course of peeling find out that we
cannot reach a particular type, we return EPEEL.
2014-11-22 18:55:22 +01:00
Carlos Martín Nieto
1dbb74baf2
Travis: do non-threadsafe builds
...
When flipping the default to threadsafe, we never made sure that the
tests were building non-threadsafe variants. Specify which thead-safety
we want for each.
2014-11-22 18:46:17 +01:00
Carlos Martín Nieto
60f3e876c5
Travis: move the valgrind run to allowed_failures
...
We don't need to know the result of the travis run before determining
whether we want to consider the merge as successful.
2014-11-22 18:42:00 +01:00
Carlos Martín Nieto
e06b1040d7
Merge pull request #2723 from ravindp/ravindp/fix_4_missing_delta_bases
...
Fix for misleading "missing delta bases" error.
2014-11-22 18:39:50 +01:00
Ravindra Patel
ec7e680c6c
Fix for misleading "missing delta bases" error - Fix #2721 .
2014-11-21 15:05:34 -05:00
Edward Thomson
e0482934e6
Merge pull request #2725 from libgit2/vmg/attr-null
...
Do not assume blob contents are NULL terminated
2014-11-21 13:16:42 -05:00
Vicent Marti
24cce2398f
text: Null-terminate a string if we've been gouging it
2014-11-21 18:09:57 +01:00
Vicent Marti
b7fb71e39c
notes: Use git__strndup
2014-11-21 17:38:55 +01:00
Vicent Marti
2e1e0f108f
blame: Do not assume blob contents are NULL-terminated
2014-11-21 17:24:55 +01:00
Vicent Marti
1ba48b7caf
notes: Do not assume blob contents are NULL-terminated
2014-11-21 17:21:34 +01:00
Vicent Marti
72d0024134
attr_file: Do not assume ODB data is NULL-terminated
...
That's a bad assumption to make, even though right now it holds
(because of the way we've implemented decompression of packfiles),
this may change in the future, given that ODB objects can be
binary data.
Furthermore, the ODB object can return a NULL pointer if the object
is empty. Copying the NULL pointer to the strbuf lets us handle it
like an empty string. Again, the NULL pointer is valid behavior because
you're supposed to check the *size* of the object before working
on it.
2014-11-21 17:21:34 +01:00
Vicent Marti
92e0b67930
buffer: Do not put
anything if len is 0
2014-11-21 17:21:33 +01:00
Edward Thomson
6f4461763e
Merge pull request #2710 from Therzok/shellcheckScripts
...
Run shell scripts through shellcheck
2014-11-21 10:59:20 -05:00
Carlos Martín Nieto
deadc43e1d
Merge pull request #2720 from ravindp/master
...
Fix for memory leak issue in indexer.c, that surfaces on windows
2014-11-21 15:21:00 +01:00
Vicent Marti
c89f1cf9d6
Merge pull request #2724 from libgit2/vmg/empty
...
odb: `git_odb_object` contents are never NULL
2014-11-21 14:18:32 +01:00
Vicent Marti
e015665142
odb: git_odb_object
contents are never NULL
...
This is a contract that we made in the library and that we need to uphold. The
contents of a blob can never be NULL because several parts of the library (including
the filter and attributes code) expect `git_blob_rawcontent` to always return a
valid pointer.
2014-11-21 14:09:53 +01:00
Ungureanu Marius
a4fccbbf9d
Run shell scripts through shellcheck
2014-11-20 23:17:19 +02:00
Vicent Marti
fc6ac074ee
Merge pull request #2713 from libgit2/jamill/push_fetch_first
...
Update message for error during push
2014-11-20 13:13:46 +01:00
Vicent Marti
fd10b110de
Merge pull request #2717 from libgit2/cmn/remote-ls
...
Clarify the git_remote_ls() documentation
2014-11-20 13:12:49 +01:00
Vicent Marti
21361cb7fe
Merge pull request #2719 from libgit2/cmn/fetch-twice
...
fetch: clear the connection data on close
2014-11-20 13:12:29 +01:00
Edward Thomson
d7674b5743
Merge pull request #2722 from libgit2/cmn/disable-ssh-check
...
travis: disable the cert callback on OSX
2014-11-19 19:12:59 -05:00
Carlos Martín Nieto
aa5a06c37d
travis: disable the cert callback on OSX
...
The sshd on OSX has stopped responding to the setting which this test
assumes is there, so let's disable it until we can figure out what's
happening.
2014-11-20 00:52:52 +01:00
Carlos Martín Nieto
1ca61bdcb9
fetch: clear the connection data on close
...
When we fetch twice with the same remote object, we did not properly
clear the connection flags, so we would leak state from the last
connection.
This can cause the second fetch with the same remote object to fail if
using a HTTP URL where the server redirects to HTTPS, as the second
fetch would see `use_ssl` set and think the initial connection wanted to
downgrade the connection.
2014-11-19 20:57:15 +01:00
Ravindra Patel
7561f98d6d
Fix for memory leak issue in indexer.c, that surfaces on windows
2014-11-19 14:54:30 -05:00
Carlos Martín Nieto
8fd7dd778d
remote: don't say we free the remote on disconnect
...
On disconnect we simply ask the transport to close the connection, we do
not free it.
2014-11-19 15:49:47 +01:00
Carlos Martín Nieto
699dfcc3bc
remote: clarify which list of references _ls() returns
...
Make it clear that this is not the ls-remote command but a way to access
the data we have and how long it's kept around.
2014-11-19 15:49:02 +01:00
Carlos Martín Nieto
4d86caec59
Remove two completed projects from the list
2014-11-18 18:32:25 +01:00
Edward Thomson
93b982b1c8
Merge pull request #2654 from linquize/missing-obj
...
Fix missing object in tests/resources/crlf by changing the tail commit
2014-11-18 12:12:19 -05:00
Edward Thomson
45301cca30
Merge pull request #2608 from libgit2/cmn/remote-push
...
Provide a convenience function `git_remote_push()`
2014-11-18 11:44:59 -05:00
Edward Thomson
8b5b814e55
Merge pull request #2671 from swisspol/remote_create_fix
...
Fixed active_refspecs field not initialized on new git_remote objects
2014-11-17 20:10:58 -05:00
Edward Thomson
7f1b73b7c8
Merge pull request #2693 from libgit2/cmn/push-refspec-refactor
...
push: use the common refspec parser
2014-11-17 17:03:55 -05:00
Edward Thomson
a4221ccb09
Merge pull request #2699 from swisspol/fix_warnings
...
Fixed a couple Clang warnings
2014-11-17 16:36:54 -05:00
Jameson Miller
a03f6caf5c
Update message for error during push
...
When attempting to update a reference on a remote during push, and the
reference on the remote refers to a commit that does not exist locally,
then we should report a more clear error message.
2014-11-17 16:30:31 -05:00
Pierre-Olivier Latour
d3cd7da51f
Fixed active_refspecs field not initialized on new git_remote objects
...
When creating a new remote, contrary to loading one from disk,
active_refspecs was not populated. This means that if using the new
remote to push, git_push_update_tips() will be a no-op since it
checks the refspecs passed during the push against the base ones
i.e. active_refspecs. And therefore the local refs won't be created
or updated after the push operation.
2014-11-17 22:46:22 +09:00
Carlos Martín Nieto
5915d7001b
branch: consider an empty upstream remote config as not found
2014-11-17 14:28:22 +01:00
Carlos Martín Nieto
8aa707376a
Merge branch 'openssl-lock-free'
2014-11-17 14:03:50 +01:00
Ungureanu Marius
d6ecc31140
Plug possible leak in the openssl locks
2014-11-17 14:03:15 +01:00
Carlos Martín Nieto
ce8822cb40
Merge pull request #2707 from swisspol/fix_include
...
Fixed git2.h not including threads.h anymore
2014-11-15 20:45:17 +01:00
Carlos Martín Nieto
624eb97fd5
Merge pull request #2708 from phatblat/pr/threading-doc
...
Fix typo in THREADING.md
2014-11-15 13:49:15 +01:00
Ben Chatelain
d698712bc7
Fix GCD typo
2014-11-14 21:16:03 -07:00
Pierre-Olivier Latour
889d8c8b8f
Fixed git2.h not including threads.h anymore
2014-11-15 08:20:36 +09:00