|
5e1281f8
|
2013-11-10T08:19:32
|
|
Merge pull request #1955 from linquize/trivial.c-warning
Fix warning in tests-clar/merge/workdir/trivial.c
|
|
18bd73e5
|
2013-11-11T00:08:54
|
|
Fix warning in tests-clar/merge/workdir/trivial.c
|
|
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.
|
|
|
4cb3c7ab
|
2013-11-07T10:11:26
|
|
Merge pull request #1953 from ethomson/packfile_example
update example to new packfile creation signature
|
|
ad62f2ee
|
2013-11-07T12:00:43
|
|
update example to new packfile creation signature
|
|
|
7be89211
|
2013-11-07T09:22:01
|
|
Merge pull request #1952 from ethomson/packfile_mode
Allow callers to set mode on packfile creation
|
|
1e60e5f4
|
2013-11-07T12:03:44
|
|
Allow callers to set mode on packfile creation
|
|
|
9018a453
|
2013-11-07T08:52:32
|
|
Merge pull request #1949 from ethomson/packbuilder_oid
Add git_packbuilder_hash to query pack filename
|
|
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
|
|
|
7dd28dde
|
2013-11-07T15:39:15
|
|
Add another testcase to make sure double quotes are correctly escaped
Signed-off-by: Sven Strickroth <email@cs-ware.de>
|
|
|
a9f7236a
|
2013-11-07T13:38:04
|
|
Add a testcase for values which needs quotes
Signed-off-by: Sven Strickroth <email@cs-ware.de>
|
|
|
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>
|
|
|
e87d9d3d
|
2013-11-05T15:51:53
|
|
Merge pull request #1947 from ethomson/double_free_pkt
don't double free pkt
|
|
|
7616b8d3
|
2013-11-05T17:34:45
|
|
don't double free pkt
|
|
|
73291aff
|
2013-11-05T22:08:02
|
|
cmake: Add `USE_SSH` option
|
|
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
|
|
|
a6993f24
|
2013-11-05T09:01:08
|
|
Merge pull request #1944 from libgit2/ntk/fix/config_search_paths_leaks
Plug configuration file search paths tests leaks
|
|
39b1ad7f
|
2013-11-05T16:14:20
|
|
Plug configuration file search paths leaks
|
|
|
74e06c05
|
2013-11-05T08:32:09
|
|
Merge pull request #1945 from libgit2/ntk/fix/merge_leaks
Plug git_merge() related leaks
|
|
|
8d22773f
|
2013-11-05T16:44:10
|
|
Plug git_merge() related leaks
|
|
|
453e6b3e
|
2013-11-05T07:25:19
|
|
Merge pull request #1007 from ethomson/merge
merge!
|
|
|
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
|
|
|
b7fbfbb2
|
2013-11-05T05:39:48
|
|
Merge pull request #1942 from libgit2/fix/config_propagate_error
Propagate ELOCKED error when updating the config
|
|
|
e8162fd0
|
2013-11-05T12:01:14
|
|
Propagate ELOCKED error when updating the config
|
|
|
3ae66ef1
|
2013-11-05T04:48:45
|
|
Merge pull request #1940 from ethomson/filebuf_umask
Take umask into account in filebuf_commit
|
|
|
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
|
|
|
b4794925
|
2013-11-04T15:54:11
|
|
blame sample: usage comment
|
|
|
ea8ce3d1
|
2013-11-04T15:50:33
|
|
Fix warnings
|
|
|
e6b85be7
|
2013-11-04T15:48:35
|
|
Reorganize and doc-commentify blame sample.
|
|
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.
|
|
|
b7bb086b
|
2013-11-04T15:25:26
|
|
Standardize layout of blame sample
|
|
|
2d1feaa2
|
2013-11-04T15:03:44
|
|
Compile HTTP parser on win32 (for url parsing)
|
|
|
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
|
|
|
a605bbd9
|
2013-11-04T10:14:22
|
|
Merge pull request #1934 from libgit2/relicense-examples
Relicense examples under CC0
|
|
|
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
|
|
|
becb13c0
|
2013-11-03T13:46:07
|
|
examples: doc update
Update the explanation to reflect our use of git_status_list_new() and
make the breaks in rocco more meaningful.
Clarify why GIT_STATUS_CURRENT and index_to_workdir don't always imply
each other. Fixes #1740.
|
|
|
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.
|
|
|
187009e2
|
2013-11-02T18:34:51
|
|
Fix a leak in the diff tests
|
|
|
6cb831bd
|
2013-11-02T05:33:26
|
|
Replace copyright topmatter in example files
|
|
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.
|
|
|
7f13edfd
|
2013-11-01T15:25:28
|
|
Merge pull request #1935 from ethomson/winerrs
preserve windows error numbers as well
|
|
|
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.
|
|
|
dcfdb977
|
2013-11-01T10:51:12
|
|
Relicense examples under CC0
|
|
|
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.
|
|
|
567649f2
|
2013-11-01T09:38:34
|
|
Merge pull request #1916 from libgit2/simplify-examples
Fix examples to make the important stuff more obvious
|
|
|
948f00b4
|
2013-11-01T09:38:03
|
|
Merge pull request #1933 from libgit2/vmg/gcc-warnings
Warnings for Windows x64 (MSVC) and GCC on Linux
|
|
|
d3ed2106
|
2013-11-01T17:08:32
|
|
clar: Fix warnings in GCC/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
|
|
|
ac5e507c
|
2013-11-01T09:31:52
|
|
Merge pull request #1918 from libgit2/cmn/indexer-naming
indexer: remove the stream infix
|
|
|
b22593fb
|
2013-11-01T17:28:59
|
|
config_file: Style fixes
|
|
|
653ec420
|
2013-11-01T17:25:32
|
|
Merge remote-tracking branch 'drodriguez/fix-remote-save' into development
|
|
|
4f62d559
|
2013-11-01T05:39:21
|
|
Fix typos
|
|
|
ab44c62e
|
2013-11-01T04:22:12
|
|
Merge pull request #1928 from libgit2/parse-bad-urls
Improve bad URL handling
|
|
|
c44820c6
|
2013-10-31T23:42:50
|
|
A few formatting changes for rocco
I'm not too happy about manually inserting < and > but those get
output as html tags otherwise.
|
|
376454d0
|
2013-10-31T23:42:04
|
|
Set new multivar values using unmatcheable regexp.
Seems that regexp in Mac OS X and Linux were behaving
differently: while in OS X the empty string didn't
match any value, in Linux it was matching all of them,
so the the second fetch refspec was overwritting the
first one, instead of creating a new one.
Using an unmatcheable regular expression solves the
problem (and seems to be portable).
|
|
|
a71331eb
|
2013-10-31T23:41:48
|
|
Fix memory leaks.
|
|
|
3793fa9b
|
2013-10-31T01:08:50
|
|
Fix saving remotes with several fetch/push ref specs.
At some moment git_config_delete_entry lost the ability to delete one entry of
a multivar configuration. The moment you had more than one fetch or push
ref spec for a remote you will not be able to save that remote anymore. The
changes in network::remote::remotes::save show that problem.
I needed to create a new git_config_delete_multivar because I was not able to
remove one or several entries of a multivar config with the current API.
Several tries modifying how git_config_set_multivar(..., NULL) behaved were
not successful.
git_config_delete_multivar is very similar to git_config_set_multivar, and
delegates into config_delete_multivar of config_file. This function search
for the cvar_t that will be deleted, storing them in a temporal array, and
rebuilding the linked list. After calling config_write to delete the entries,
the cvar_t stored in the temporal array are freed.
There is a little fix in config_write, it avoids an infinite loop when using
a regular expression (case for the multivars). This error was found by the
test network::remote::remotes::tagopt.
|
|
|
76120863
|
2013-10-31T14:48:41
|
|
Update examples/README.md
|
|
|
85c6730c
|
2013-10-31T14:35:32
|
|
Format comments for use with docco
|
|
|
048f837b
|
2013-10-31T13:30:22
|
|
Prevent another segfault from bad URL
|
|
|
887df99f
|
2013-10-31T13:29:16
|
|
Test another bad URL
|
|
|
151b3218
|
2013-10-31T13:16:04
|
|
Prevent segfault with a badly-formed URL
|
|
|
7be5104d
|
2013-10-31T13:15:49
|
|
Add tests for badly-formed URLs
|
|
|
f93f3790
|
2013-10-31T06:35:01
|
|
Merge pull request #1924 from linquize/gmtime
Use gmtime() instead of gmtime_t()
|