Commit Graph

5960 Commits

Author SHA1 Message Date
Russell Sim
aeee29abf1 Added new licenses to copyright file
New licenses:
src/khash.h (MIT)
src/tsort.c (MIT)
src/path.c (BSD)
src/win32/posix_w32.c (PHP 3.01)

Updated debian/* license year
2014-03-24 09:37:26 +11:00
Russell Sim
1e1e8f9538 Whitespace cleanup copyright file 2014-03-24 09:36:14 +11:00
Russell Sim
777e439e98 Bumped standards version, no change 2014-03-24 09:36:10 +11:00
Russell Sim
bc14b20f53 There is no way to verify packages at the moment 2014-03-24 09:35:01 +11:00
Russell Sim
53e01caec5 Use automatic dh_makeshlib version dependency
This will default to the current package version number.
2014-03-24 09:34:58 +11:00
Russell Sim
af4ddbe4df Updated symbols file 2014-03-24 09:23:45 +11:00
Russell Sim
d538205f3c Disable simple blame test
This simple blame test depends on the libgit2 repo which isn't shipped
in the orig tarball.
2014-03-24 09:23:37 +11:00
Russell Sim
d0f1b53f5d Updated changelog 2014-02-13 09:18:04 +11:00
Russell Sim
256186ff14 Merge tag 'upstream/0.20.0'
* tag 'upstream/0.20.0': (664 commits)
  libgit2 0.20.0 "anmeldung"
  Formatting fix for cred_acquire_cb
  util: NetBSD doesn't have qsort_r either
  tests: Drop unrelated comment
  index: Free the index on git_index_open() failure
  tree-cache: Fix error message typo
  tree-cache: Don't segfault upon corruption
  tree-cache: Zero out the allocated tree children array
  tree-cache: Free the tree upon the detection of a corrupted child
  cleaning code, removing unused variables
  Add content offset to git_diff_line
  netops: fix leak
  Fix warnings
  Introduce git_cred_default for NTLM/SPNEGO auth
  Propagate auth error codes as GIT_EUSER in winhttp
  Add missing mappings to .mailmap file
  Update files that reference tests-clar
  Rename tests-clar to tests
  Fix warnings
  tests: make a few globals statics
  ...
2014-02-13 09:11:12 +11:00
Vicent Marti
43cb8b3242 libgit2 0.20.0 "anmeldung"
Apologies for the delay. This release is chunky,
but you're probably used to chunky releases by now.

Full changelog follows:

Internal changes
	+ Added support for decomposed Unicode paths in Mac OS X
	+ Added support for junctions in win32
	+ Fixed issues with HTTP redirects in the network stack
	+ Performance improvements (as always)

git2/blame.h
	+ added full support for blame operations

git2/blob.h
	+ added `git_blob_filtered_content` to load blobs in
	memory with their corresponding filters applied

git2/branch.h
	+ added branch iterators as an alternative to the
	callback-based API

git2/buffer.h
	+ exported the git_buf struct to allow binary buffers
	to be passed from/to the library. This simplifies
	several APIs

git2/checkout.h
	+ implemented additional checkout options ('skip unmerged',
	'use ours' and 'use theirs')

git2/clone.h
	+ simplified the clone API
	+ added new `git_clone_into` to clone into an existing
	(empty) repository

git2/commit.h
	+ added APIs to access the raw (uncleaned) text of a commit
	message

git2/common.h
	+ added global options to set the default paths to load
	templates from

git2/config.h
	+ added multivar iterators
	+ added globbing iterator
	+ added `git_config_foreach_match` to perform operations
	on every single var in a config file

git2/diff.h
	+ restructured and simplified the diff API

git2/filter.h
	+ added external APIs to configure and apply custom filters
	to checked out blobs

git2/index.h
	+ `git_index_read` can now force a reload of the index file
	even if it hasn't changed on-disk

git2/indexer.h
	+ improved the streaming indexer APIs

git2/merge.h
	+ added support for merge!

git2/object.h
	+ added helper API to lookup a generic object by path

git2/pack.h
	+ added progress callbacks to the packbuilder

git2/patch.h
	+ added support for patch generation as part of the Diff
	API revamp

git2/pathspec.h
	+ added helper APIs to work with pathspecs and match files
	in the workdir or diffs

git2/push.h
	+ added progress callbacks to push

git2/reflog.h
	+ changed reflog APIs to work on reference names instead of
	the references themselves, so they become less racy

git2/remote.h
	+ added support for setting refspecs on remotes, either at
	creation or on existing ones
	+ simplified the remotes API

git2/revwalk.h
	+ add API to simplify parents during a walk

git2/signature.h
	+ add helper to create a signature with the default values for
	a repository (i.e. the set `user.name` and `user.email` values,
	and the current time)

git2/submodules.h
	+ improve the status detection for submodules

git2/sys/
	+ exported many new internal APIs, such as pluggabe transport
	APIs

-vmg, out
2013-11-20 12:53:33 +01:00
Carlos Martín Nieto
1b3fe73c8d Formatting fix for cred_acquire_cb 2013-11-20 11:55:32 +01:00
Vicent Martí
e479628a01 Merge pull request #1966 from nickh/patch_content_offsets
Add content offset to git_diff_line
2013-11-19 11:36:02 -08:00
Vicent Martí
7146eff309 Merge pull request #1970 from ghedo/netbsd_qsort
util: NetBSD doesn't have qsort_r either
2013-11-19 09:15:30 -08:00
Alessandro Ghedini
963edd9bff util: NetBSD doesn't have qsort_r either 2013-11-19 17:59:55 +01:00
Vicent Martí
47a9a6297e Merge pull request #1969 from libgit2/ntk/fix/drop_comment
Cleaning up
2013-11-19 05:29:37 -08:00
nulltoken
65f67857ab tests: Drop unrelated comment 2013-11-19 14:25:30 +01:00
Vicent Martí
e544a5b8e5 Merge pull request #1968 from libgit2/ntk/fix/bad_index
Corrupted index is bad for your health
2013-11-19 04:54:31 -08:00
nulltoken
bd15b51305 index: Free the index on git_index_open() failure 2013-11-19 13:25:39 +01:00
nulltoken
a5d7318802 tree-cache: Fix error message typo 2013-11-19 13:25:38 +01:00
nulltoken
3d5233455b tree-cache: Don't segfault upon corruption 2013-11-19 13:25:37 +01:00
nulltoken
82e6a42c6c tree-cache: Zero out the allocated tree children array 2013-11-19 13:25:25 +01:00
nulltoken
7b69289f4e tree-cache: Free the tree upon the detection of a corrupted child 2013-11-19 13:25:16 +01:00
Vicent Martí
7135e77a62 Merge pull request #1967 from victorgp/cleaning-code-minor-change
Cleaning code, removing unused variables
2013-11-19 03:13:23 -08:00
Victor Garcia
10b6678f94 cleaning code, removing unused variables 2013-11-19 11:57:32 +01:00
Nick Hengeveld
d8e7ffc2a2 Add content offset to git_diff_line
For additions and deletions, external consumers like subversion
can make use of the content offset to generate diffs in their
proprietary formats.
2013-11-18 14:03:25 -08:00
Carlos Martín Nieto
e1ce5249e5 netops: fix leak 2013-11-18 21:40:19 +01:00
Russell Belfer
8f2a3d6251 Fix warnings 2013-11-18 12:14:50 -08:00
Vicent Martí
8ea7472e08 Merge pull request #1960 from ethomson/ntlm
NTLM/Negotiate support in WinHTTP
2013-11-18 11:49:51 -08:00
Edward Thomson
84efffc33a Introduce git_cred_default for NTLM/SPNEGO auth 2013-11-18 12:56:35 -05:00
Edward Thomson
80fc7d6bf0 Propagate auth error codes as GIT_EUSER in winhttp 2013-11-18 12:56:34 -05:00
Vicent Martí
872094441c Merge pull request #1963 from libgit2/ntk/fix/mailmap
Add missing mappings to .mailmap file
2013-11-15 07:13:50 -08:00
nulltoken
a0f13ffaee Add missing mappings to .mailmap file 2013-11-15 14:33:23 +00:00
Vicent Martí
845eed800a Merge pull request #1962 from libgit2/rename-tests
Rename tests directory
2013-11-14 14:26:15 -08:00
Ben Straub
83e1efbf46 Update files that reference tests-clar 2013-11-14 14:10:32 -08:00
Ben Straub
1782038144 Rename tests-clar to tests 2013-11-14 14:05:52 -08:00
Vicent Martí
7b947bf5cc Merge pull request #1951 from victorgp/create-remote-plus-fetch
Allowing create remotes with custom fetch spec
2013-11-14 07:21:47 -08:00
Russell Belfer
98eaf39a87 Fix warnings 2013-11-13 11:12:31 -08:00
Carlos Martín Nieto
cfd16ca28e tests: make a few globals statics
ld was warning that the size of path changed, rightly so.
2013-11-13 13:08:56 +01:00
Vicent Martí
6481e06258 Merge pull request #1958 from libgit2/blame-fixes
Blame fixes
2013-11-13 01:41:09 -08:00
Ben Straub
4320bec09b Minor cleanup 2013-11-12 19:02:34 -08:00
Ben Straub
b20c40a8d6 Don't leak memory when duplicating a NULL signature 2013-11-12 19:02:28 -08:00
Ben Straub
9db56cc4a7 Fix buffer blame with new lines at end of file 2013-11-12 18:57:16 -08:00
Ben Straub
089297b2cd Duplicate all fields of a blame hunk 2013-11-12 15:24:59 -08:00
Ben Straub
f6f7537cfd Add some failing blame test cases 2013-11-12 15:24:05 -08:00
Vicent Martí
42593a6965 Merge pull request #1957 from linquize/warning3
Fix warnings
2013-11-12 04:52:11 -08:00
Linquize
fb190bbbd0 Fix warnings 2013-11-12 19:46:25 +08:00
Vicent Martí
6414fd338d Merge pull request #1956 from libgit2/cmn/fetch-default-head
Remote revamp (director's cut)
2013-11-11 06:47:15 -08:00
Carlos Martín Nieto
a6192d7c98 remote: update head list on push
A previous commit forgot to update the head list after push as well,
leading to wrong output of git_remote_ls().
2013-11-11 15:35:52 +01:00
Carlos Martín Nieto
ae2972122e tests: update push tests
These tests were forgotten when modifying git_remote_ls().
2013-11-11 15:35:52 +01:00
Carlos Martín Nieto
877cde765a remote: let's at least pretend to have some memory safety
Copy the pointers into temporary vectors instead of assigning them tot
he same array so we don't mess up with someone else's memory by
accident (e.g. by sorting).
2013-11-11 15:35:52 +01:00