summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* rebase: correctly finish rebasing detached headsethomson/rebase_detachedEdward Thomson2016-04-211-24/+35
| | | | | When rebasing with IDs, we do not return to the `branch`, we remain in a detached HEAD state.
* rebase: handle detached HEADs in `init`Edward Thomson2016-04-211-3/+11
| | | | | | When `init`ing a rebase from a detached HEAD, be sure to remember that we were in a detached HEAD state so that we can correctly `abort` the object that we just created.
* Merge pull request #3110 from libgit2/cmn/proxy-configEdward Thomson2016-04-1913-48/+345
|\ | | | | Proxy configuration
| * proxy: don't specify the protocol in the typeCarlos Martín Nieto2016-04-192-2/+2
| | | | | | | | | | | | We leave this up to the scheme in the url field. The type should only tell us about whether we want a proxy and whether we want to auto-detect it.
| * winhttp: correctly detect HTTPS usageCarlos Martín Nieto2016-04-191-2/+14
| |
| * curl: ask for proxy credentialsCarlos Martín Nieto2016-04-191-4/+81
| |
| * net: use proxy options struct in the stream configCarlos Martín Nieto2016-04-194-15/+44
| |
| * proxy: don't require the trailing slash on WinHTTPCarlos Martín Nieto2016-04-191-1/+2
| | | | | | | | | | The path is not something that you use for proxies, so make use of the new optionality of the path when extracting URL parts.
| * netops: make the path optional in URLsCarlos Martín Nieto2016-04-191-10/+12
| | | | | | | | | | | | When we're dealing with proxy addresses, we only want a hostname and port, and the user would not provide a path, so make it optional so we can use this same function to parse git as well as proxy URLs.
| * proxy: use poxy to test our Windows proxy supportCarlos Martín Nieto2016-04-191-0/+1
| |
| * proxy: ask the user for credentials if necessaryCarlos Martín Nieto2016-04-198-19/+178
| |
| * proxy: introduce a proxy options structCarlos Martín Nieto2016-04-191-0/+16
| | | | | | | | It is currently unused; it will go into the remote's options.
* | ignore: move star-star matching closer to it usecmn/ignore-starstarCarlos Martín Nieto2016-04-191-16/+11
| | | | | | | | | | Instead of threading the state down to the larger loop, let's have the loop where we detect the double star so each of them are easier to read.
* | ignore: fix directory limits when searching for star-starCarlos Martín Nieto2016-04-191-6/+24
|/ | | | | | | | | | | | In order to match the star-star, we disable the flag that's looking for a single path element, but that leads to searching for the pattern in the middle of elements in the input string. Mark when we're handing a star-star so we jump over the elements in our attempt to match the part of the pattern that comes after the star-star. While here, tighten up the check so we don't allow invalid rules through.
* refs: provide a more general error message for dwimcmn/dwim-general-messageCarlos Martín Nieto2016-04-111-0/+3
| | | | | | | If we cannot dwim the input, set the error message to be explicit about that. Otherwise we leave the error for the last failed lookup, which can be rather unexpected as it mentions a remote when the user thought they were trying to look up a branch.
* Merge pull request #3724 from ethomson/submodule_start_supports_silly_slashesCarlos Martín Nieto2016-04-021-10/+26
|\ | | | | iterator/diff: allow trailing `/` on start/end paths to match submodules
| * iterator: support trailing `/` in start for submodEdward Thomson2016-04-021-10/+26
| | | | | | | | | | | | Allow callers to specify a start path with a trailing slash to match a submodule, instead of just a directory. This is for some legacy behavior that's sort of dumb, but there it is.
* | ignore: don't use realpath to canonicalize pathcmn/ignore-symlinkCarlos Martín Nieto2016-04-021-3/+11
|/ | | | | | If we're looking for a symlink, realpath will give us the resolved path, which is not what we're after, but a canonicalized version of the path the user asked for.
* Merge pull request #3720 from pks-t/pks/merge-driver-memleaksCarlos Martín Nieto2016-04-011-0/+1
|\ | | | | merge_driver: fix missing `goto done;`
| * merge_driver: fix missing `goto done;`Patrick Steinhardt2016-04-011-0/+1
| | | | | | | | | | | | | | | | | | | | The code initializing the merge driver registry accidentally forgot a `goto done` in case of an error. Because of this the next line, which registers the global shutdown callback for the merge drivers, is only called when an error occured. Fix this by adding the missing `goto done`. This fixes some memory leaks when the global state is shut down.
* | Merge pull request #3719 from libgit2/ethomson/submodule_statusCarlos Martín Nieto2016-04-011-1/+1
|\ \ | |/ |/| WD iterator: properly identify submodules
| * iterator: use correct search functionethomson/submodule_statusEdward Thomson2016-03-311-1/+1
| |
* | leaks: call `xdl_free_classifier`Edward Thomson2016-03-311-1/+1
| |
* | leaks: fix some iterator leaksEdward Thomson2016-03-311-6/+22
| |
* | Plug a few leaksCarlos Martín Nieto2016-03-312-0/+16
|/
* Merge pull request #3575 from pmq20/master-13jan16Carlos Martín Nieto2016-03-312-4/+0
|\ | | | | Remove duplicated calls to git_mwindow_close
| * Remove duplicated calls to git_mwindow_closeP.S.V.R2016-01-132-4/+0
| |
* | xdiff/xprepare: fix a memory leakPatrick Steinhardt2016-03-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The xdl_prepare_env() function may initialise an xdlclassifier_t data structure via xdl_init_classifier(), which allocates memory to several fields, for example 'rchash', 'rcrecs' and 'ncha'. If this function later exits due to the failure of xdl_optimize_ctxs(), then this xdlclassifier_t structure, and the memory allocated to it, is not cleaned up. In order to fix the memory leak, insert a call to xdl_free_classifier() before returning. This patch was originally written by Ramsay Jones (see commit 87f16258367a3b9a62663b11f898a4a6f3c19d31 in git.git).
* | xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bitsPatrick Steinhardt2016-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 307ab20b3 ("xdiff: PATIENCE/HISTOGRAM are not independent option bits", 19-02-2012) introduced the XDF_DIFF_ALG() macro to access the flag bits used to represent the diff algorithm requested. In addition, code which had used explicit manipulation of the flag bits was changed to use the macros. However, one example of direct manipulation remains. Update this code to use the XDF_DIFF_ALG() macro. This patch was originally written by Ramsay Jones (see commit 5cd6978a9cfef58de061a9525f3678ade479564d in git.git).
* | Merge pull request #3712 from ethomson/config_duplicate_sectionCarlos Martín Nieto2016-03-291-4/+9
|\ \ | | | | | | config: don't write duplicate section
| * | config: don't write section header if we're in itEdward Thomson2016-03-281-4/+9
| | | | | | | | | | | | | | | | | | If we hit the EOF while trying to write a new value, it may be that we're already in the section that we were looking for. If so, do not write a (duplicate) section header, just write the value.
* | | Merge pull request #3703 from libgit2/cmn/multivar-set-lockedEdward Thomson2016-03-281-17/+0
|\ \ \ | |/ / |/| | config: don't special-case multivars that don't exist yet
| * | config: don't special-case multivars that don't exist yetcmn/multivar-set-lockedCarlos Martín Nieto2016-03-211-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This special-casing ignores that we might have a locked file, so the hashtable does not represent the contents of the file we want to write. This causes multivar writes to overwrite entries instead of add to them when under lock. There is no need for this as the normal code-path will write to the file just fine, so simply get rid of it.
* | | Merge pull request #3691 from ethomson/iteratorsCarlos Martín Nieto2016-03-2610-1595/+1703
|\ \ \ | | | | | | | | Some FANTASTIC iterator refactoring
| * | | iterator: comment fixedMarc Strapetz2016-03-241-2/+2
| | | |
| * | | iterator: unused includes removedMarc Strapetz2016-03-241-4/+0
| | | |
| * | | iterator: cleanupsEdward Thomson2016-03-243-366/+54
| | | | | | | | | | | | | | | | Remove some unused functions, refactor some ugliness.
| * | | iterator: refactor empty iterator to new styleEdward Thomson2016-03-241-15/+36
| | | |
| * | | iterator: mandate `advance_over`Edward Thomson2016-03-242-6/+11
| | | | | | | | | | | | | | | | | | | | Since the three iterators implement `advance_over` differently, mandate it and implement each.
| * | | iterator: refactor index iteratorEdward Thomson2016-03-241-200/+194
| | | |
| * | | Introduce `git_path_common_dirlen`Edward Thomson2016-03-242-0/+26
| | | |
| * | | iterator: move the index into the iterator itselfEdward Thomson2016-03-242-36/+15
| | | |
| * | | diff: stop processing nitem when its removedEdward Thomson2016-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | When a directory is removed out from underneath us, stop trying to manipulate it.
| * | | iterator: drop `advance_into_or_over`Edward Thomson2016-03-232-20/+1
| | | | | | | | | | | | | | | | | | | | | | | | Now that iterators do not return `GIT_ENOTFOUND` when advancing into an empty directory, we do not need a special `advance_into_or_over` function.
| * | | iterator: test that we're at the end of iterationEdward Thomson2016-03-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that we have hit the end of iteration; previously we tested that we saw all the values that we expected to see. We did not then ensure that we were at the end of the iteration (and that there were subsequently values in the iteration that we did *not* expect.)
| * | | iterator: combine fs+workdir iterators more completelyEdward Thomson2016-03-234-944/+1082
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop some of the layers of indirection between the workdir and the filesystem iterators. This makes the code a little bit easier to follow, and reduces the number of unnecessary allocations a bit as well. (Prior to this, when we filter entries, we would allocate them, filter them and then free them; now we do the filtering before allocation.) Also, rename `git_iterator_advance_over_with_status` to just `git_iterator_advance_over`. Mostly because it's a fucking long-ass function name otherwise.
| * | | checkout: provide internal func to compute target pathEdward Thomson2016-03-231-32/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many code paths in checkout need the final, full on-disk path of the file they're writing. (No surprise). However, they all munge the `data->path` buffer themselves to get there. Provide a nice helper method for them. Plus, drop the use `git_iterator_current_workdir_path` which does the same thing but different. Checkout is the only caller of this silly function, which lets us remove it.
| * | | iterators: refactored tree iteratorEdward Thomson2016-03-232-392/+630
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored the tree iterator to never recurse; simply process the next entry in order in `advance`. Additionally, reduce the number of allocations and sorting as much as possible to provide a ~30% speedup on case-sensitive iteration. (The gains for case-insensitive iteration are less majestic.)
| * | | git_object_dup: introduce typesafe versionsEdward Thomson2016-03-234-5/+23
| | | |
| * | | iterator: disambiguate reset and reset_rangeEdward Thomson2016-03-234-28/+65
| | | | | | | | | | | | | | | | | | | | | | | | Disambiguate the reset and reset_range functions. Now reset_range with a NULL path will clear the start or end; reset will leave the existing start and end unchanged.
View Lorry Controller Status