Vicent Martí
4581f9d8ab
Merge pull request #1833 from libgit2/cmn/config-include
...
Support config includes
2013-09-17 08:09:57 -07:00
Linquize
89095fbddc
Fix failure in win32_find_git_in_registry() when UAC is turned on
...
Demand read only access to registry key instead of full access.
This might happen in Windows Vista and later.
2013-09-17 22:57:30 +08:00
Linquize
ffbd337aef
Fix failure in win32_find_git_in_registry()
...
The buffer size 0 was definitely not enough so it failed
2013-09-17 22:57:06 +08:00
Vicent Martí
efc9e6700f
Merge pull request #1856 from libgit2/cmn/no-orphans
...
No such thing as an orphan branch
2013-09-17 03:45:35 -07:00
Vicent Martí
38fba8371e
Merge pull request #1851 from tiennou/libssh2-errors
...
Provide libssh2 error message
2013-09-17 03:40:50 -07:00
Carlos Martín Nieto
605da51a2c
No such thing as an orphan branch
...
Unfortunately git-core uses the term "unborn branch" and "orphan
branch" interchangeably. However, "orphan" is only really there for
the checkout command, which has the `--orphan` option so it doesn't
actually create the branch.
Branches never have parents, so the distinction of a branch with no
parents is odd to begin with. Crucially, the error messages deal with
unborn branches, so let's use that.
2013-09-17 09:50:30 +02:00
Etienne Samson
eec4dcc34b
Whitespace.
2013-09-16 23:07:22 +02:00
Etienne Samson
b622aabec0
Add a wrapper to provide the libssh2 error message
2013-09-16 23:07:19 +02:00
Vicent Marti
c62b5ca590
clone: Anal as fuck
2013-09-16 22:23:05 +02:00
Linquize
f2df503bab
git_clone supports optional init_options
2013-09-16 08:02:36 +08:00
wilke
d7fc2eb29b
Fix memory leak in git_tree_walk on error or when stopping the walk from the supplied callback
2013-09-13 21:36:39 +02:00
wilke
4e01e3029b
Prevent git_tree_walk 'skip entry' callback return code from leaking through as the return value of git_tree_walk
2013-09-13 21:21:33 +02:00
Vicent Martí
a6ee166111
Merge pull request #1839 from isaac/ssh-repository-invalid
...
SSH: Clone fails with errors: ERROR: Repository invalid & Early EOF
2013-09-11 16:46:39 -07:00
nulltoken
8cf8052534
errors: Fix format of some error messages
2013-09-11 20:13:59 +02:00
Russell Belfer
6c38e60a00
Merge pull request #1838 from libgit2/cmn/first-parent
...
revwalk: allow simplifying by first-parent
2013-09-10 16:55:58 -07:00
nulltoken
209f9b67c4
odb: Teach loose backend to return EAMBIGUOUS
2013-09-10 22:36:13 +02:00
nulltoken
d0cd6c427a
path: Make direach() return EUSER on callback error
2013-09-10 22:36:10 +02:00
Carlos Martín Nieto
15f7b9b8d9
revwalk: allow simplifying by first-parent
...
When enabled, only the first parent of each commit will be queued,
enabling a simple way of using first-parent simplification.
2013-09-09 20:31:14 +02:00
Isaac Kearse
b345026baa
Test for repo before removing leading colon
2013-09-10 05:16:52 +12:00
Isaac Kearse
fbabe855ad
Trim leading colon from ssh repository path
2013-09-08 14:11:08 +12:00
nulltoken
031f3f8028
odb: Error when streaming in too [few|many] bytes
2013-09-07 23:00:20 +02:00
Carlos Martín Nieto
53ea051371
config: handle realloc issues from larger depths
...
As the include depth increases, the chance of a realloc
increases. This means that whenever we run git_array_alloc() or call
config_parse(), we need to remember what our reader's index is so we
can look it up again.
2013-09-07 20:51:26 +02:00
Carlos Martín Nieto
6978992298
config: return an error when reaching the maximum include depth
2013-09-07 20:51:26 +02:00
Carlos Martín Nieto
73fc5e01c2
config: fix variable overriding
...
When two or more variables of the same name exist and the user asks
for a scalar, we must return the latest value assign to it.
2013-09-07 20:51:26 +02:00
Carlos Martín Nieto
a9fb79896e
config: refresh included files
...
We need to refresh the variables from the included files if they are
changed, so loop over all included files and re-parse the files if any
of them has changed.
2013-09-07 20:51:26 +02:00
Carlos Martín Nieto
19be0692b4
config: keep a list of included files
...
When refreshing we need to refresh if any of the files have been
touched, so we need to keep the list.
2013-09-07 20:51:26 +02:00
Carlos Martín Nieto
d8d25acb9a
config: add support for include directives
...
Relative, absolute and home-relative paths are supported. The
recursion limit it set at 10, just like in git.
2013-09-07 20:51:26 +02:00
nulltoken
1634df8c28
revparse: Simplify error handling
2013-09-07 17:48:06 +02:00
nulltoken
a8d67afe42
revparse: Prevent unnecessary odb backend calls
2013-09-07 17:48:05 +02:00
Russell Belfer
32e4992972
Merge pull request #1791 from libgit2/cmn/revwalk-recursive
...
revwalk: make mark_unintersting use a loop
2013-09-06 14:20:51 -07:00
nulltoken
4047950f30
odb: Prevent stream_finalize_write() from overwriting
...
Now that #1785 is merged, git_odb_stream_finalize_write() calculates the object id before invoking the odb backend.
This commit gives a chance to the backend to check if it already knows this object.
2013-09-06 22:47:28 +02:00
Carlos Martín Nieto
fb23d05f0b
revwalk: make mark_unintersting use a loop
...
Using a recursive function can blow the stack when dealing with long
histories. Use a loop instead to limit the call chain depth.
This fixes #1223 .
2013-09-06 19:56:51 +02:00
Vicent Martí
366bd2f43d
Merge pull request #1829 from libgit2/fix-umask-fragility
...
Fix umask fragility
2013-09-05 16:56:21 -07:00
Russell Belfer
a7fcc44dcf
Better macro name for is-exec-bit-set test
2013-09-05 16:14:32 -07:00
Russell Belfer
af22dabb43
GIT_MODE_TYPE should exclude setgid bits
...
The GIT_MODE_TYPE macro was looking at all bits above the
permissions, but it should really just look at the top bits so
that it will give the right results for a setgid or setuid entry.
Since we're now using these macros in the tests, this was causing
a test failure on platforms that don't support setgid.
2013-09-05 12:01:17 -07:00
Russell Belfer
f240acce86
Add more file mode permissions macros
...
This adds some more macros for some standard operations on file
modes, particularly related to permissions, and then updates a
number of places around the code base to use the new macros.
2013-09-05 11:20:12 -07:00
Carlos Martín Nieto
d209cc4751
config: decouple the backend from the reader at the low level
...
In order to support config includes, we must differentiate between the
backend's main file and the file we are currently parsing.
This lays the groundwork for includes, keeping the current behaviours.
2013-09-05 18:06:12 +02:00
Vicent Martí
cca9bea484
Merge pull request #1831 from linquize/version.h-warning
...
Fix warning in src/win32/version.h
2013-09-05 06:30:08 -07:00
Linquize
21753d4869
Fix warning in src/win32/version.h
2013-09-05 20:42:47 +08:00
Ben Straub
f42d546c63
Provide better errors for push on non-bare local remotes
2013-09-04 13:07:42 -07:00
Vicent Martí
e98535923b
Merge pull request #1817 from libgit2/ntk/fix/backend/honor_refresh_capabilities
...
Of backends and refreshers...
2013-09-04 06:20:36 -07:00
Vicent Marti
74b38d199e
Backport @peff's fix for duplicates in sha1_lookup
2013-09-04 13:16:57 +02:00
nulltoken
b1a6c316a6
odb: Move the auto refresh logic to the pack backend
...
Previously, `git_object_read()`, `git_object_read_prefix()` and
`git_object_exists()` were implementing an auto refresh logic. When the
expected object couldn't be found in any backend, a call to
`git_odb_refresh()` was triggered and the lookup was once again performed
against all backends.
This commit removes this auto-refresh logic from the odb layer and pushes
it down into the pack-backend (as it's the only one currently exposing
a `refresh()` endpoint).
2013-09-04 07:44:53 +02:00
Russell Belfer
cae5293854
Fix resolving relative windows network paths
2013-09-03 14:00:27 -07:00
Vicent Martí
6208bd499b
Merge pull request #1804 from ethomson/rewrites
...
Minor changes for rewrites
2013-09-03 12:29:18 -07:00
Russell Belfer
37fc44ddff
Merge pull request #1825 from nvloff/resolve_relative
...
path: properly resolve relative paths
2013-09-03 12:27:56 -07:00
Nikolai Vladimirov
6d9a6c5cec
path: properly resolve relative paths
2013-09-03 20:45:53 +03:00
Vicent Martí
b595b385df
Merge pull request #1814 from libgit2/is-empty-fix
...
Fix incorrect precedence within git_repository_is_empty()
2013-09-03 04:11:07 -07:00
Krzysztof Adamski
b1447edebc
Use git__insertsort_r on Android too.
2013-09-01 18:47:56 +02:00
Linquize
d45e9480e7
oid: git_oid_shorten_add() sets GITERR_INVALID when OID set is full
2013-08-31 18:22:50 +08:00
