Ben Straub
fc1f7d4f15
Merge branch 'development' into blame
...
Conflicts:
include/git2.h
2013-10-03 06:20:20 -07:00
Vicent Martí
ab13687662
Merge pull request #1887 from libgit2/ntk/topic/git_message_raw
...
commit: Introduce git_commit_message_raw()
2013-10-03 04:36:29 -07:00
nulltoken
598f069b99
commit: Introduce git_commit_message_raw()
2013-10-03 07:59:55 +02:00
Russell Belfer
c8f2ba9944
Merge pull request #1889 from libgit2/relative-redirect
...
HTTP: handle "relative" redirects
2013-10-02 15:26:20 -07:00
Ben Straub
41a6de289f
HTTP: handle "relative" redirects
2013-10-02 14:45:57 -07:00
Vicent Martí
5bfead1dba
Merge pull request #1855 from libgit2/cmn/clone-into
...
An alternative for 'clone' with options
2013-10-02 05:56:37 -07:00
Carlos Martín Nieto
0e0cf78773
clone: put the callbacks struct directly in the clone options
...
There's no need for this to be a pointer to somewhere else.
2013-10-02 14:04:44 +02:00
Carlos Martín Nieto
ffc97d5126
remote: add some comments to the callback struct
...
Hopefully clear up what they're for.
2013-10-02 06:42:27 +02:00
Carlos Martín Nieto
36a241acbb
clone: mention clone_into in the clone documentation
...
Make the difference more explicit.
2013-10-02 06:42:27 +02:00
Carlos Martín Nieto
fdc7e5e35e
clone: bring back NULL as defaults
...
This wasremoved as part of the large culling a few commits ago.
2013-10-02 06:42:27 +02:00
Carlos Martín Nieto
c833893c64
clone: re-allow using a custom remote name
...
This is a small thing that by itself doesn't quite justify making the
user use clone_into.
2013-10-02 06:42:26 +02:00
Carlos Martín Nieto
eec1c1fe1e
clone: const-ify checkout options
...
The removal of many options which lead to the direct usage of the
user's checkout options means we should make sure they remain const.
2013-10-02 06:42:26 +02:00
Carlos Martín Nieto
b9bf5d701d
clone: re-add a way to ignore certificate errors
...
This used to be done via transport flags, which was removed in a
previous commit.
2013-10-02 06:42:26 +02:00
Carlos Martín Nieto
6ac15eff6d
clone: remove more options from basic clone
...
The basic clone function is there to make it easy to create a "normal"
clone. Remove a bunch of options that are about changing the remote's
configuration.
2013-10-02 06:42:26 +02:00
Carlos Martín Nieto
e3a92f0dfc
clone: implement git_clone on top of git_clone_into
...
Unify the code bases.
2013-10-02 06:41:42 +02:00
Carlos Martín Nieto
c8dbec4803
clone: remove the autotag option
...
Downloading all tags is part of what makes it a clone instead of
simply a fetch.
2013-10-02 06:41:42 +02:00
Carlos Martín Nieto
fe3a40a4ff
remote: add a convenience 'fetch' function.
2013-10-02 06:41:42 +02:00
Carlos Martín Nieto
d19870d947
clone: implement git_clone_into
...
This allows you to set up the repository and remote as you which to
have them before performing the clone operation.
2013-10-02 06:41:42 +02:00
Carlos Martín Nieto
e3c131c544
remote: move the credentials callback to the struct
...
Move this one as well, letting us have a single way of setting the
callbacks for the remote, and removing fields from the clone options.
2013-10-02 06:41:42 +02:00
Carlos Martín Nieto
d31402a3fc
remote: put the _download() callback with the others
...
The text progress and update_tips callbacks are already part of the
struct, which was meant to unify the callback setup, but the download
one was left out.
2013-10-02 06:41:42 +02:00
Vicent Martí
71e33d2649
Merge pull request #1885 from ethomson/transport_register
...
Add git_transport_register, git_transport_unregister
2013-10-01 14:00:30 -07:00
Philip Kelley
8378695671
Add git_transport_register, git_transport_unregister
2013-10-01 16:49:41 -04:00
Ben Straub
816d28e7bc
Mark git__timer as inline on OSX
2013-10-01 12:56:47 -07:00
Vicent Martí
c655aa5209
Merge pull request #1882 from linquize/config-subsection-fix
...
Config subsection name should allow to have ']' and '\\' should allow to escape any characters
2013-10-01 05:54:54 -07:00
Linquize
8d74125384
Add negative test cases for config header with invalid characters
2013-10-01 09:56:59 +08:00
Linquize
d52a93fab3
Add test case to test ']' and '\\' characters in config subsection
2013-10-01 09:56:59 +08:00
Linquize
566dd8cec0
Config subsection name should allow to have ']' and '\\' should allow to escape any characters
2013-10-01 09:56:17 +08:00
Vicent Martí
fba147631e
Merge pull request #1879 from libgit2/redir-refactor
...
Redir refactor
2013-09-30 15:03:35 -07:00
Vicent Martí
a6884b6fc7
Merge pull request #1412 from jamill/push_progress
...
Initial Implementation of progress reports during push
2013-09-30 14:58:45 -07:00
Vicent Martí
9acde16266
Merge pull request #1881 from libgit2/ignore-submodules-in-stash
...
Never consider submodules for stashing
2013-09-30 14:57:48 -07:00
Ben Straub
ae5a935290
Ensure submodule repos and indices are freed
...
...before the helper's cleanup method tries to delete their files.
2013-09-30 14:47:56 -07:00
Vicent Martí
dc56fea7a3
Merge pull request #1878 from libgit2/ntk/fix/warnings
...
Fix x86/x64 size_t related warnings
2013-09-30 12:18:19 -07:00
Jameson Miller
b176ededb7
Initial Implementation of progress reports during push
...
This adds the basics of progress reporting during push. While progress
for all aspects of a push operation are not reported with this change,
it lays the foundation to add these later. Push progress reporting
can be improved in the future - and consumers of the API should
just get more accurate information at that point.
The main areas where this is lacking are:
1) packbuilding progress: does not report progress during deltafication,
as this involves coordinating progress from multiple threads.
2) network progress: reports progress as objects and bytes are going
to be written to the subtransport (instead of as client gets
confirmation that they have been received by the server) and leaves
out some of the bytes that are transfered as part of the push protocol.
Basically, this reports the pack bytes that are written to the
subtransport. It does not report the bytes sent on the wire that
are received by the server. This should be a good estimate of
progress (and an improvement over no progress).
2013-09-30 13:22:28 -04:00
Vicent Martí
5b09db15d1
Merge pull request #1883 from libgit2/ntk/fix/empty_first_commit_line
...
Remove leading newlines from commit message
2013-09-30 09:40:15 -07:00
nulltoken
d27a441dde
commit: Trim message leading newlines
...
Fix libgit2/libgit2sharp#522
2013-09-30 11:33:58 +02:00
nulltoken
27c8eb2a1a
Tabify indentations
2013-09-30 11:31:35 +02:00
Ben Straub
de8fe729ef
Fix typo
2013-09-29 10:46:41 -07:00
Justin Spahr-Summers
526d4c949c
Test that submodules don't affect stashing
2013-09-27 21:39:28 -07:00
Justin Spahr-Summers
4fe0b0b34b
Never consider submodules for stashing
2013-09-27 17:07:06 -07:00
Vicent Martí
e6a1d9a248
Merge pull request #1880 from ethomson/refdb_h_oopsie
...
Add refdb.h to git2.h, reorder git2.h sanely
2013-09-27 13:27:11 -07:00
Edward Thomson
7d69245415
Add refdb.h to git2.h, reorder git2.h sanely
2013-09-27 16:08:24 -04:00
Ben Straub
b59344bf83
Tighten up url-connection utility
2013-09-26 16:48:46 -07:00
Ben Straub
256961e45d
WHOOPS
2013-09-26 16:36:05 -07:00
Ben Straub
0049d4d1d2
Make sure utility doesn't leak memory
2013-09-26 16:25:34 -07:00
Ben Straub
1b02baf40b
Adjust to new utility signature
2013-09-26 16:25:05 -07:00
Ben Straub
ea59f65977
Deploy gitno_connection_data into transport (winhttp)
...
...and have that call manage replaced memory in the output structure.
2013-09-26 16:20:30 -07:00
Ben Straub
83fbd36869
Deploy gitno_connection_data into transport
2013-09-26 15:58:41 -07:00
nulltoken
8a1e925dde
Fix warnings
2013-09-26 20:44:43 +02:00
Ben Straub
f30d91ce48
Refactor URL handling to use library call
2013-09-26 11:03:27 -07:00
Ben Straub
8988688c47
Migrate redirect URL handling to common utility
2013-09-25 20:41:56 -07:00