Vicent Martí
5e1281f873
Merge pull request #1955 from linquize/trivial.c-warning
...
Fix warning in tests-clar/merge/workdir/trivial.c
2013-11-10 08:19:32 -08:00
Linquize
18bd73e50d
Fix warning in tests-clar/merge/workdir/trivial.c
2013-11-11 00:08:54 +08: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
886cc44738
fixing typo
2013-11-08 15:42:52 +01:00
Victor Garcia
40b99d05b4
splitting funcionality in two methods to avoid ambiguity with NULL
2013-11-08 12:14:31 +01:00
Vicent Martí
4cb3c7abe1
Merge pull request #1953 from ethomson/packfile_example
...
update example to new packfile creation signature
2013-11-07 10:11:26 -08:00
Edward Thomson
ad62f2eedc
update example to new packfile creation signature
2013-11-07 12:00:43 -06:00
Vicent Martí
7be892114c
Merge pull request #1952 from ethomson/packfile_mode
...
Allow callers to set mode on packfile creation
2013-11-07 09:22:01 -08:00
Edward Thomson
1e60e5f42d
Allow callers to set mode on packfile creation
2013-11-07 12:04:32 -05:00
Vicent Martí
9018a453ea
Merge pull request #1949 from ethomson/packbuilder_oid
...
Add git_packbuilder_hash to query pack filename
2013-11-07 08:52:32 -08:00
Sven Strickroth
590c5efb3b
Rename method
...
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2013-11-07 17:51:43 +01:00
Victor Garcia
99feb98897
adding doc for new param and test to check fetch spec is correctly added
2013-11-07 16:22:49 +01:00
Edward Thomson
cc2447da32
Add git_packbuilder_hash to query pack filename
2013-11-07 09:43:24 -05:00
Sven Strickroth
7dd28dde28
Add another testcase to make sure double quotes are correctly escaped
...
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2013-11-07 15:39:15 +01:00
Victor Garcia
0fe522d105
allowing create remote with custom fetch spec
2013-11-07 14:16:20 +01:00
Sven Strickroth
a9f7236aff
Add a testcase for values which needs quotes
...
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2013-11-07 13:45:28 +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
Vicent Martí
e87d9d3d4d
Merge pull request #1947 from ethomson/double_free_pkt
...
don't double free pkt
2013-11-05 15:51:53 -08:00
Edward Thomson
7616b8d3ce
don't double free pkt
2013-11-05 17:35:50 -06:00
Vicent Marti
73291aff6e
cmake: Add USE_SSH option
2013-11-05 22:08:38 +01:00
Carlos Martín Nieto
a8baf4b160
Merge pull request #1946 from arthurschreiber/change-branch-iterator-definition
...
Change the git_branch_iterator_new definition to use git_branch_t
2013-11-05 12:26:41 -08:00
Arthur Schreiber
a667ca8298
Change the git_branch_iterator_new and git_branch_next definitions to use git_branch_t.
2013-11-05 20:51:07 +01:00
Ben Straub
8adea28ae9
Blame: change signature to be more binding-friendly
2013-11-05 11:44:42 -08:00
Ben Straub
79c443425b
Make url decoding more bulletproof
2013-11-05 11:35:57 -08:00
Ben Straub
aad5403fe9
Fix MSVC 64-bit warnings
2013-11-05 10:55:54 -08:00
Ben Straub
d6eb3f9ce7
Remove unnecessary check
2013-11-05 10:54:44 -08:00
Ben Straub
fe294b95d1
Incorporate feedback
2013-11-05 10:37:50 -08:00
Vicent Martí
a6993f24bf
Merge pull request #1944 from libgit2/ntk/fix/config_search_paths_leaks
...
Plug configuration file search paths tests leaks
2013-11-05 09:01:08 -08:00
nulltoken
39b1ad7f15
Plug configuration file search paths leaks
2013-11-05 17:36:12 +01:00
Vicent Martí
74e06c05b5
Merge pull request #1945 from libgit2/ntk/fix/merge_leaks
...
Plug git_merge() related leaks
2013-11-05 08:32:09 -08:00
nulltoken
8d22773f4b
Plug git_merge() related leaks
2013-11-05 17:30:11 +01:00
Vicent Martí
453e6b3ec0
Merge pull request #1007 from ethomson/merge
...
merge!
2013-11-05 07:25:19 -08:00
Edward Thomson
039db728f3
merge branch into current, updating workdir
2013-11-05 10:00:39 -05:00
Vicent Martí
ae26c4b80f
Merge pull request #1943 from libgit2/ntk/fix/leaks
...
Fix leaks
2013-11-05 06:55:29 -08:00
Vicent Martí
c82f7f8e99
Merge pull request #1938 from libgit2/cmn/branch-iterator
...
branch: move from foreach to an iterator
2013-11-05 06:55:16 -08:00
nulltoken
61080a959d
Fix leaks
2013-11-05 15:10:02 +01:00
Vicent Martí
ffd040532a
Merge pull request #1941 from libgit2/rb/preserve-iterator-error
...
Preserve error messages during file system iterator cleanup
2013-11-05 06:05:32 -08:00
Carlos Martín Nieto
8ec889a45f
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.
2013-11-05 14:58:16 +01:00
Vicent Marti
1eab9f0e32
error: Simplify giterr_detach
2013-11-05 14:56:10 +01:00
Vicent Martí
b7fbfbb21f
Merge pull request #1942 from libgit2/fix/config_propagate_error
...
Propagate ELOCKED error when updating the config
2013-11-05 05:39:48 -08:00
nulltoken
e8162fd091
Propagate ELOCKED error when updating the config
2013-11-05 14:03:51 +01:00
Edward Thomson
3ae66ef1af
Merge pull request #1940 from ethomson/filebuf_umask
...
Take umask into account in filebuf_commit
2013-11-05 04:48:45 -08:00
Edward Thomson
1d3a8aeb4b
move mode_t to filebuf_open instead of _commit
2013-11-04 22:33:05 -05:00
Edward Thomson
f966acd133
Take umask into account in filebuf_commit
2013-11-04 22:32:50 -05:00
Ben Straub
ac72051afa
Fix ssh.c compile
2013-11-04 19:09:30 -08:00
Ben Straub
b47949254e
blame sample: usage comment
2013-11-04 15:54:11 -08:00
Ben Straub
ea8ce3d17e
Fix warnings
2013-11-04 15:50:33 -08:00
Ben Straub
e6b85be7cf
Reorganize and doc-commentify blame sample.
2013-11-04 15:48:35 -08:00
