Ben Straub
7fb4147f1f
Don't clobber whitespace settings
2013-12-06 13:38:59 -08:00
Ben Straub
628e92cdb3
Don't use weird return codes
2013-12-05 14:47:04 -08:00
Ben Straub
c56c6d6945
Implement GIT_DIFF_FIND_BY_CONFIG
2013-12-05 14:13:46 -08:00
Edward Thomson
eac938d96e
Bare naked merge and rebase
2013-12-03 10:18:53 -05:00
Vicent Martí
a149a18923
Merge pull request #1981 from jamill/download_cancel_tweaks
...
Updates to cancellation logic during download and indexing of packfile.
2013-12-03 02:14:28 -08:00
Vicent Martí
db0a7e39b3
Merge pull request #1977 from ethomson/revert
...
Revert support for a single commit
2013-12-03 02:11:55 -08:00
Jameson Miller
db4cbfe504
Updates to cancellation logic during download and indexing of packfile.
2013-12-02 23:05:10 -05:00
Edward Thomson
bab0b9f2d2
clean up state metadata more consistently
2013-12-02 16:57:41 -06:00
Edward Thomson
300d192f7e
Introduce git_revert to revert a single commit
2013-12-02 16:57:41 -06:00
Russell Belfer
f62c174d0d
GIT_DIFF_FIND_REMOVE_UNMODIFIED sounds better
2013-12-02 13:49:58 -08:00
Russell Belfer
97ad85b88d
Add GIT_DIFF_FIND_DELETE_UNMODIFIED flag
...
When doing copy detection, it is often necessary to include
UNMODIFIED records in the git_diff so they are available as source
records for GIT_DIFF_FIND_COPIES_FROM_UNMODIFIED. Yet in the final
diff, often you will not want to have these UNMODIFIED records.
This adds a flag which marks these UNMODIFIED records for deletion
from the diff list so they will be removed after the rename detect
phase is over.
2013-12-02 13:30:05 -08:00
Russell Belfer
2123a17f83
Fix bug making split deltas a COPIED targets
...
When FIND_COPIES is used in combination with BREAK_REWRITES for
rename detection, there was a bug where the split MODIFIED delta
was only used as a target for RENAME records and not for COPIED
records. This fixes that, converting the split into a pair of
DELETED and COPIED deltas when that circumstance arises.
2013-12-02 13:27:06 -08:00
Alessandro Ghedini
758f2f1022
posix: Solaris doesn't have strnlen either
2013-11-27 14:31:22 +01:00
Alessandro Ghedini
ee7040fd9b
ssh: add support for ssh-agent authentication
2013-11-20 14:11:44 +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
Alessandro Ghedini
963edd9bff
util: NetBSD doesn't have qsort_r either
2013-11-19 17:59:55 +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
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í
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
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
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
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
Carlos Martín Nieto
1c967df31c
remote: fix a couple of leaks
2013-11-11 15:35:52 +01:00
Carlos Martín Nieto
359dce726d
remote: make _ls return the list directly
...
The callback-based method of listing remote references dates back to the
beginning of the network code's lifetime, when we didn't know any
better.
We need to keep the list around for update_tips() after disconnect() so
let's make use of this to simply give the user a pointer to the array so
they can write straightforward code instead of having to go through a
callback.
2013-11-11 15:35:51 +01:00
Carlos Martín Nieto
266af6d819
remote: don't allow such direct access to the refspecs
...
Removing arbitrary refspecs makes things more complex to reason
about. Instead, let the user set the fetch and push refspec list to
whatever they want it to be.
2013-11-10 22:21:25 +01:00
Vicent Marti
a1d35ede18
config_file: style
2013-11-10 16:41:41 +01:00
Vicent Martí
b9cb72c28a
Merge pull request #1950 from csware/quote-config-values
...
Correctly quote config values while saving
2013-11-10 07:33:11 -08:00
Vicent Martí
0df96f2b05
Merge pull request #1936 from libgit2/better-url-parsing
...
Streamline url-parsing logic.
2013-11-10 07:31:21 -08:00
Victor Garcia
40b99d05b4
splitting funcionality in two methods to avoid ambiguity with NULL
2013-11-08 12:14:31 +01:00
Edward Thomson
1e60e5f42d
Allow callers to set mode on packfile creation
2013-11-07 12:04:32 -05:00
Sven Strickroth
590c5efb3b
Rename method
...
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2013-11-07 17:51:43 +01:00
Edward Thomson
cc2447da32
Add git_packbuilder_hash to query pack filename
2013-11-07 09:43:24 -05:00
Victor Garcia
0fe522d105
allowing create remote with custom fetch spec
2013-11-07 14:16:20 +01:00
Sven Strickroth
fde9325032
Correctly quote config values while saving
...
If the value contains a command (; or #) char or starts or ends with space it needs to be quoted.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2013-11-07 13:31:25 +01:00
