|
eac938d9
|
2013-12-02T14:10:04
|
|
Bare naked merge and rebase
|
|
a149a189
|
2013-12-03T02:14:28
|
|
Merge pull request #1981 from jamill/download_cancel_tweaks
Updates to cancellation logic during download and indexing of packfile.
|
|
|
db0a7e39
|
2013-12-03T02:11:55
|
|
Merge pull request #1977 from ethomson/revert
Revert support for a single commit
|
|
db4cbfe5
|
2013-12-02T14:09:12
|
|
Updates to cancellation logic during download and indexing of packfile.
|
|
|
bab0b9f2
|
2013-11-22T18:02:12
|
|
clean up state metadata more consistently
|
|
|
300d192f
|
2013-12-02T11:15:27
|
|
Introduce git_revert to revert a single commit
|
|
f62c174d
|
2013-12-02T13:49:58
|
|
GIT_DIFF_FIND_REMOVE_UNMODIFIED sounds better
|
|
|
97ad85b8
|
2013-12-02T13:30:05
|
|
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.
|
|
|
2123a17f
|
2013-12-02T13:27:06
|
|
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.
|
|
758f2f10
|
2013-11-27T14:17:40
|
|
posix: Solaris doesn't have strnlen either
|
|
|
ee7040fd
|
2013-11-20T14:11:44
|
|
ssh: add support for ssh-agent authentication
|
|
|
e479628a
|
2013-11-19T11:36:02
|
|
Merge pull request #1966 from nickh/patch_content_offsets
Add content offset to git_diff_line
|
|
|
963edd9b
|
2013-11-19T17:58:58
|
|
util: NetBSD doesn't have qsort_r either
|
|
|
e544a5b8
|
2013-11-19T04:54:31
|
|
Merge pull request #1968 from libgit2/ntk/fix/bad_index
Corrupted index is bad for your health
|
|
bd15b513
|
2013-11-19T13:24:10
|
|
index: Free the index on git_index_open() failure
|
|
|
a5d73188
|
2013-11-19T13:16:09
|
|
tree-cache: Fix error message typo
|
|
|
3d523345
|
2013-11-19T13:15:47
|
|
tree-cache: Don't segfault upon corruption
|
|
|
82e6a42c
|
2013-11-19T13:13:51
|
|
tree-cache: Zero out the allocated tree children array
|
|
|
7b69289f
|
2013-11-19T12:54:57
|
|
tree-cache: Free the tree upon the detection of a corrupted child
|
|
|
7135e77a
|
2013-11-19T03:13:23
|
|
Merge pull request #1967 from victorgp/cleaning-code-minor-change
Cleaning code, removing unused variables
|
|
10b6678f
|
2013-11-19T11:57:32
|
|
cleaning code, removing unused variables
|
|
d8e7ffc2
|
2013-11-18T14:03:25
|
|
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.
|
|
e1ce5249
|
2013-11-18T21:40:19
|
|
netops: fix leak
|
|
|
8f2a3d62
|
2013-11-18T12:14:50
|
|
Fix warnings
|
|
|
84efffc3
|
2013-11-13T16:57:51
|
|
Introduce git_cred_default for NTLM/SPNEGO auth
|
|
|
80fc7d6b
|
2013-11-13T16:46:45
|
|
Propagate auth error codes as GIT_EUSER in winhttp
|
|
|
7b947bf5
|
2013-11-14T07:21:47
|
|
Merge pull request #1951 from victorgp/create-remote-plus-fetch
Allowing create remotes with custom fetch spec
|
|
|
98eaf39a
|
2013-11-13T11:12:31
|
|
Fix warnings
|
|
b20c40a8
|
2013-11-12T19:02:28
|
|
Don't leak memory when duplicating a NULL signature
|
|
|
9db56cc4
|
2013-11-12T18:57:16
|
|
Fix buffer blame with new lines at end of file
|
|
|
089297b2
|
2013-11-12T15:24:59
|
|
Duplicate all fields of a blame hunk
|
|
fb190bbb
|
2013-11-12T19:44:13
|
|
Fix warnings
|
|
|
6414fd33
|
2013-11-11T06:47:15
|
|
Merge pull request #1956 from libgit2/cmn/fetch-default-head
Remote revamp (director's cut)
|
|
|
877cde76
|
2013-11-02T01:10:21
|
|
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).
|
|
|
1c967df3
|
2013-11-02T00:51:57
|
|
remote: fix a couple of leaks
|
|
|
a6192d7c
|
2013-11-11T15:32:13
|
|
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().
|
|
|
359dce72
|
2013-11-02T00:05:32
|
|
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.
|
|
|
266af6d8
|
2013-10-30T13:44:22
|
|
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.
|
|
a1d35ede
|
2013-11-10T16:41:41
|
|
config_file: style
|
|
|
b9cb72c2
|
2013-11-10T07:33:11
|
|
Merge pull request #1950 from csware/quote-config-values
Correctly quote config values while saving
|
|
|
0df96f2b
|
2013-11-10T07:31:21
|
|
Merge pull request #1936 from libgit2/better-url-parsing
Streamline url-parsing logic.
|
|
|
40b99d05
|
2013-11-08T12:14:31
|
|
splitting funcionality in two methods to avoid ambiguity with NULL
|
|
|
1e60e5f4
|
2013-11-07T12:03:44
|
|
Allow callers to set mode on packfile creation
|
|
590c5efb
|
2013-11-07T17:51:43
|
|
Rename method
Signed-off-by: Sven Strickroth <email@cs-ware.de>
|
|
|
cc2447da
|
2013-11-06T18:41:08
|
|
Add git_packbuilder_hash to query pack filename
|
|
|
0fe522d1
|
2013-11-07T14:16:20
|
|
allowing create remote with custom fetch spec
|
|
|
fde93250
|
2013-11-07T13:17:36
|
|
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>
|
|
7616b8d3
|
2013-11-05T17:34:45
|
|
don't double free pkt
|
|
|
a8baf4b1
|
2013-11-05T12:26:41
|
|
Merge pull request #1946 from arthurschreiber/change-branch-iterator-definition
Change the git_branch_iterator_new definition to use git_branch_t
|
|
a667ca82
|
2013-11-05T20:51:07
|
|
Change the git_branch_iterator_new and git_branch_next definitions to use git_branch_t.
|
|
|
8adea28a
|
2013-11-05T11:42:42
|
|
Blame: change signature to be more binding-friendly
|
|
|
79c44342
|
2013-11-05T11:35:57
|
|
Make url decoding more bulletproof
|
|
|
aad5403f
|
2013-11-05T10:55:54
|
|
Fix MSVC 64-bit warnings
|
|
|
d6eb3f9c
|
2013-11-05T10:54:44
|
|
Remove unnecessary check
|
|
|
fe294b95
|
2013-11-05T10:37:50
|
|
Incorporate feedback
|
|
|
39b1ad7f
|
2013-11-05T16:14:20
|
|
Plug configuration file search paths leaks
|
|
|
8d22773f
|
2013-11-05T16:44:10
|
|
Plug git_merge() related leaks
|
|
|
039db728
|
2013-07-03T01:00:45
|
|
merge branch into current, updating workdir
|
|
|
ae26c4b8
|
2013-11-05T06:55:29
|
|
Merge pull request #1943 from libgit2/ntk/fix/leaks
Fix leaks
|
|
|
c82f7f8e
|
2013-11-05T06:55:16
|
|
Merge pull request #1938 from libgit2/cmn/branch-iterator
branch: move from foreach to an iterator
|
|
|
61080a95
|
2013-11-05T15:10:02
|
|
Fix leaks
|
|
|
ffd04053
|
2013-11-05T06:05:32
|
|
Merge pull request #1941 from libgit2/rb/preserve-iterator-error
Preserve error messages during file system iterator cleanup
|
|
|
8ec889a4
|
2013-11-02T14:07:02
|
|
branch: move from foreach to an iterator
Create a git_branch_iterator type which is equivalent to the foreach but
lets us write loops instead of callbacks.
Since the introduction of git_reference_shorthand(), the added value of
passing the name is reduced.
|
|
|
1eab9f0e
|
2013-11-05T14:56:10
|
|
error: Simplify giterr_detach
|
|
|
e8162fd0
|
2013-11-05T12:01:14
|
|
Propagate ELOCKED error when updating the config
|
|
|
1d3a8aeb
|
2013-11-04T18:28:57
|
|
move mode_t to filebuf_open instead of _commit
|
|
|
f966acd1
|
2013-11-04T15:46:32
|
|
Take umask into account in filebuf_commit
|
|
|
ac72051a
|
2013-11-04T19:09:30
|
|
Fix ssh.c compile
|
|
|
3b259cbd
|
2013-11-04T15:47:35
|
|
Preserve file error in iterator
When the filesystem iterator encounters an error with a file, it
returns the error but because of the cleanup code, it was in some
cases erasing the error message. This uses the giterr_detach API
to make sure that the actual error message is restored after the
cleanup code has been run.
|
|
|
d6c60169
|
2013-11-04T15:45:31
|
|
Add giterr_detach API to get and clear error
There are a number of cases where it is convenient to be able to
fetch and "claim" the current error string, clearing the error.
This is helpful when you need to call some code that may alter
the error and you want to restore it later on and/or report it via
some other mechanism.
|
|
|
0e1115d2
|
2013-11-04T12:16:14
|
|
Merge pull request #1939 from ethomson/readwrite_odb
Allow backend consumers to specify file mode
|
|
|
16bffd1c
|
2013-11-04T12:04:17
|
|
Unescape url-encoded usernames and passwords
|
|
|
dd64c71c
|
2013-11-04T14:50:25
|
|
Allow backend consumers to specify file mode
|
|
|
c227c173
|
2013-11-04T11:42:14
|
|
Use http_parser_parse_url to parse urls
|
|
|
fb6b0e01
|
2013-11-04T10:44:59
|
|
Merge pull request #1317 from libgit2/blame
Blame Canada
|
|
|
44acdd1f
|
2013-11-04T08:09:58
|
|
Merge pull request #1937 from scunz/checkout_assert
Don't assert in git_checkout_tree
|
|
|
5a0b8803
|
2013-11-04T08:05:55
|
|
Merge pull request #1929 from libgit2/rb/misc-diff-fixes
Fix some observed problems with incorrect diffs
|
|
|
a7a64d2c
|
2013-11-02T18:36:34
|
|
remote: don't write too much when dealing with multivars
We used to move `data_start` forward, which is wrong as that needs to
point to the beginning of the buffer in order to perform size
calculations.
Introduce a `write_start` variable which indicates where we should start
writing from, which is what the `data_start` was being wrongly reused to
be.
|
|
7b3959b2
|
2013-11-02T03:45:32
|
|
Checkout: git_checkout_head is git_checkout_tree without a treeish
The last commit taught git_checkout_tree to actually do something
meaningfull, when treeish was NULL. This lets us rewrite
git_checkout_head to simply call git_checkout_tree without giving it a
treeish.
|
|
|
35221441
|
2013-11-02T03:43:34
|
|
Checkout: Don't assert if treeish is NULL
In git_checkout_tree, the first check tests if either repo or treeish is
NULL and says that eithor of them has to have a valid value. But there
is no code to handle the treeish == NULL case.
So, do something meaningful in that case: use HEAD instead.
|
|
|
10749f6c
|
2013-11-02T03:20:05
|
|
Checkout: Unifiy const-ness of `opts` parameter
Since all 3 checkout APIs perform the same operation with the options,
all of them should use the same const-ness.
|
|
|
56c1cda2
|
2013-11-01T19:22:43
|
|
Clarify parsing issues and errors
|
|
|
7e035908
|
2013-11-01T15:29:25
|
|
Streamline url-parsing logic.
|
|
|
af613ecd
|
2013-10-28T23:30:45
|
|
remote: store dwimed refspecs separately
This allows us to add e.g. "HEAD" as a refspec when none are given
without overwriting the user's data.
|
|
|
968c7d07
|
2013-10-26T17:35:12
|
|
remote: create FETCH_HEAD with a refspecless remote
When downloading the default branch due to lack of refspecs, we still
need to write out FETCH_HEAD with the tip we downloaded, unfortunately
with a format that doesn't match what we already have.
|
|
|
a7382aa2
|
2013-10-26T16:52:54
|
|
remote: give up after 256 failures to find a common object
This avoids sending our whole history bit by bit to the remote in cases
where there is no common history, just to give up in the end.
The number comes from the canonical implementation.
|
|
|
2f03050f
|
2013-10-26T16:21:31
|
|
remote: download HEAD when no refspecs are given
The correct behaviour when a remote has no refspecs (e.g. a URL from the
command-line) is to download the remote's HEAD. Let's do that.
This fixes #1261.
|
|
|
c2408a69
|
2013-11-01T17:03:01
|
|
preserve windows error numbers as well
|
|
|
3e57069e
|
2013-11-01T13:49:43
|
|
Fix --assume-unchanged support
This was never really working right because we were checking the
wrong flag and not checking it in all the places that we need to
be checking it. I finally got around to writing a test and adding
actual support for it.
|
|
|
e7c85120
|
2013-11-01T11:39:37
|
|
More tests and fixed for merging reversed diffs
There were a lot more cases to deal with to make sure that our
merged (i.e. workdir-to-tree-to-index) diffs were matching the
output of core Git.
|
|
|
a5c16f3c
|
2013-11-01T10:18:03
|
|
Add git_diff_options_init helper
Sometimes the static initializer for git_diff_options cannot be
used and since setting them to all zeroes doesn't actually work
quite right, this adds a new helper for that situation.
This also adds an explicit new value to the submodule settings
options to be used when those enums need static initialization.
|
|
|
8e5a8ef8
|
2013-11-01T09:51:01
|
|
Convert git_index_read to have a "force" flag
This is a little more intuitive than the turned-around option that
I originally wrote.
|
|
|
4bf630b6
|
2013-10-31T14:36:52
|
|
Make diff and status perform soft index reload
This changes `git_index_read` to have two modes - a hard index
reload that always resets the index to match the on-disk data
(which was the old behavior) and a soft index reload that uses
the timestamp / file size information and only replaces the index
data if the file on disk has been modified.
This then updates the git_status code to do a soft reload unless
the new GIT_STATUS_OPT_NO_REFRESH flag is passed in.
This also changes the behavior of the git_diff functions that use
the index so that when an index is not explicitly passed in (i.e.
when the functions call git_repository_index for you), they will
also do a soft reload for you.
This intentionally breaks the file signature of git_index_read
because there has been some confusion about the behavior previously
and it seems like all existing uses of the API should probably be
examined to select the desired behavior.
|
|
|
3940310e
|
2013-10-30T13:56:42
|
|
Fix some of the glaring errors in GIT_DIFF_REVERSE
These changes fix the basic problem with GIT_DIFF_REVERSE being
broken for text diffs. The reversed diff entries were getting
added to the git_diff correctly, but some of the metadata was kept
incorrectly in a way that prevented the text diffs from being
generated correctly. Once I fixed that, it became clear that it
was not possible to merge reversed diffs correctly. This has a
first pass at fixing that problem. We probably need more tests
to make sure that is really fixed thoroughly.
|
|
|
948f00b4
|
2013-11-01T09:38:03
|
|
Merge pull request #1933 from libgit2/vmg/gcc-warnings
Warnings for Windows x64 (MSVC) and GCC on Linux
|
|
|
0bfa7323
|
2013-11-01T17:07:44
|
|
iconv: Do not fake an API when iconv is not available
|
|
|
95352b70
|
2013-11-01T16:55:20
|
|
checkout: Remove unused vector
|
|
|
73342386
|
2013-11-01T16:55:01
|
|
array: Wrap `array_alloc` as a single statement
|
|
|
51a3dfb5
|
2013-11-01T16:31:02
|
|
pack: `__object_header` always returns unsigned values
|
|
|
3343b5ff
|
2013-10-31T22:59:42
|
|
Fix warning on win64
|