[*.md]
indent_style = space
indent_size = 4
+trim_trailing_whitespace = false
-You are opening a _bug report_ against the libgit2 project. If you have a
-question about an API or usage, please ask on StackOverflow:
-http://stackoverflow.com/questions/tagged/libgit2. Please fill out the
-reproduction steps (below) and delete this introductory paragraph. Thanks!
+You are opening a _bug report_ against the libgit2 project: we use
+GitHub Issues for tracking bug reports and feature requests. If you
+have a question about an API or usage, please ask on StackOverflow:
+http://stackoverflow.com/questions/tagged/libgit2. If you want to
+have high-level discussions about the libgit2 project itself, visit
+https://github.com/libgit2/discussions.
+
+Otherwise, to report a bug, please fill out the reproduction steps
+(below) and delete these introductory paragraphs. Thanks!
### Reproduction steps
.*.swp
tags
mkmf.log
+*.profdata
+*.profraw
Sascha Cunz <sascha@babbelbox.org> <Sascha@BabbelBox.org>
Authmillenon <authmillenon@googlemail.com> <martin@ucsmail.de>
Authmillenon <authmillenon@googlemail.com> <authmillenon@googlemail.com>
-Edward Thomson <ethomson@github.com> <ethomson@microsoft.com>
-Edward Thomson <ethomson@github.com> <ethomson@edwardthomson.com>
+Edward Thomson <ethomson@edwardthomson.com> <ethomson@microsoft.com>
+Edward Thomson <ethomson@edwardthomson.com> <ethomson@github.com>
J. David Ibáñez <jdavid.ibp@gmail.com> <jdavid@itaapy.com>
Russell Belfer <rb@github.com> <arrbee@arrbee.com>
+++ /dev/null
-v0.27.7
--------
-
-This is a bugfix release with the following changes or improvements:
-
-- Our continuous integration environment has switched from Travis and
- AppVeyor to Azure Pipelines CI.
-
-- Fix adding worktrees for bare repositories.
-
-- Fix parsed patches not computing the old respectively new line
- numbers correctly.
-
-- Fix parsing configuration variables which do not have a section.
-
-- Fix a zero-byte allocation when trying to detect file renames and
- copies of a diff without any hunks.
-
-- Fix a zero-byte allocation when trying to resize or duplicate
- vectors.
-
-- Fix return value when trying to unlock worktrees which aren't
- locked.
-
-- Fix returning an unitialized error code when preparing a revision
- walk without any pushed commits.
-
-- Fix return value of `git_remote_lookup` when lookup of
- "remote.$remote.tagopt" fails.
-
-- Fix the revision walk always labelling commits as interesting due
- to a mishandling of the commit date.
-
-- Fix the packbuilder inserting uninteresting blobs when adding a
- tree containing references to such blobs.
-
-- Ignore unsupported authentication schemes in HTTP transport.
-
-- Improve performane of `git_remote_prune`.
-
-- Fix detection of whether `qsort_r` has a BSD or GNU function
- signature.
-
-- Fix detection of iconv if it is provided by libc.
-
-v0.27.6
--------
-
-This as a security release fixing the following list of issues:
-
-- The function family `git__strtol` is used to parse integers
- from a buffer. As the functions do not take a buffer length as
- argument, they will scan either until the end of the current
- number or until a NUL byte is encountered. Many callers have
- been misusing the function and called it on potentially
- non-NUL-terminated buffers, resulting in possible out-of-bounds
- reads. Callers have been fixed to use `git__strntol` functions
- instead and `git__strtol` functions were removed.
-
-- The function `git__strntol64` relied on the undefined behavior
- of signed integer overflows. While the code tried to detect
- such overflows after they have happened, this is unspecified
- behavior and may lead to weird behavior on uncommon platforms.
-
-- In the case where `git__strntol32` was unable to parse an
- integer because it doesn't fit into an `int32_t`, it printed an
- error message containing the string that is currently being
- parsed. The code didn't truncate the string though, which
- caused it to print the complete string until a NUL byte is
- encountered and not only the currently parsed number. In case
- where the string was not NUL terminated, this could have lead
- to an out-of-bounds read.
-
-- When parsing tags, all unknown fields that appear before the
- tag message are skipped. This skipping is done by using a plain
- `strstr(buffer, "\n\n")` to search for the two newlines that
- separate tag fields from tag message. As it is not possible to
- supply a buffer length to `strstr`, this call may skip over the
- buffer's end and thus result in an out of bounds read. As
- `strstr` may return a pointer that is out of bounds, the
- following computation of `buffer_end - buffer` will overflow
- and result in an allocation of an invalid length. Note that
- when reading objects from the object database, we make sure to
- always NUL terminate them, making the use of `strstr` safe.
-
-- When parsing the "encoding" field of a commit, we may perform
- an out of bounds read due to using `git__prefixcmp` instead of
- `git__prefixncmp`. This can result in the parsed commit object
- containing uninitialized data in both its message encoding and
- message fields. Note that when reading objects from the object
- database, we make sure to always NUL terminate them, making the
- use of `strstr` safe.
-
-v0.27.5
--------
-
-This is a security release fixing the following list of issues:
-
-- Submodule URLs and paths with a leading "-" are now ignored.
- This is due to the recently discovered CVE-2018-17456, which
- can lead to arbitrary code execution in upstream git. While
- libgit2 itself is not vulnerable, it can be used to inject
- options in an implementation which performs a recursive clone
- by executing an external command.
-
-- When running repack while doing repo writes,
- `packfile_load__cb()` could see some temporary files in the
- directory that were bigger than the usual, and makes `memcmp`
- overflow on the `p->pack_name` string. This issue was reported
- and fixed by bisho.
-
-- The configuration file parser used unbounded recursion to parse
- multiline variables, which could lead to a stack overflow. The
- issue was reported by the oss-fuzz project, issue 10048 and
- fixed by Nelson Elhage.
-
-- The fix to the unbounded recursion introduced a memory leak in
- the config parser. While this leak was never in a public
- release, the oss-fuzz project reported this as issue 10127. The
- fix was implemented by Nelson Elhage and Patrick Steinhardt.
-
-- When parsing "ok" packets received via the smart protocol, our
- parsing code did not correctly verify the bounds of the
- packets, which could result in a heap-buffer overflow. The
- issue was reported by the oss-fuzz project, issue 9749 and
- fixed by Patrick Steinhardt.
-
-- The parsing code for the smart protocol has been tightened in
- general, fixing heap-buffer overflows when parsing the packet
- type as well as for "ACK" and "unpack" packets. The issue was
- discovered and fixed by Patrick Steinhardt.
-
-- Fixed potential integer overflows on platforms with 16 bit
- integers when parsing packets for the smart protocol. The issue
- was discovered and fixed by Patrick Steinhardt.
-
-- Fixed potential NULL pointer dereference when parsing
- configuration files which have "include.path" or
- "includeIf..path" statements without a value.
-
-v0.27.4
--------
-
-This is a security release fixing out-of-bounds reads when
-processing smart-protocol "ng" packets.
-
-When parsing an "ng" packet, we keep track of both the current position
-as well as the remaining length of the packet itself. But instead of
-taking care not to exceed the length, we pass the current pointer's
-position to `strchr`, which will search for a certain character until
-hitting NUL. It is thus possible to create a crafted packet which
-doesn't contain a NUL byte to trigger an out-of-bounds read.
-
-The issue was discovered by the oss-fuzz project, issue 9406.
-
-v0.27.3
--------
-
-This is a security release fixing out-of-bounds reads when
-reading objects from a packfile. This corresponds to
-CVE-2018-10887 and CVE-2018-10888, which were both reported by
-Riccardo Schirone.
-
-When packing objects into a single so-called packfile, objects
-may not get stored as complete copies but instead as deltas
-against another object "base". A specially crafted delta object
-could trigger an integer overflow and thus bypass our input
-validation, which may result in copying memory before or after
-the base object into the final deflated object. This may lead to
-objects containing copies of system memory being written into the
-object database. As the hash of those objects cannot be easily
-controlled by the attacker, it is unlikely that any of those
-objects will be valid and referenced by the commit graph.
-
-Note that the error could also be triggered by the function
-`git_apply__patch`. But as this function is not in use outside of
-our test suite, it is not a possible attack vector.
-
-v0.27.2
----------
-
-### Changes or improvements
-
-* Fix builds with LibreSSL 2.7.
-
-* Fix for `git_diff_status_char()` not returning the correct mapping for
- `GIT_DELTA_TYPECHANGE`.
-
-* Fix for the submodules API not reporting errors when parsing the ".gitmodules"
- file.
-
-* Fix for accepting a ".gitmodules" file where two submodules have the same
- path.
-
-* Fix for hiding references in a graph walk not always limiting the graph
- correctly.
-
-* Fix for directory patterns with trailing spaces in attribute files not being
- handled correctly.
-
-* Fix SSH transports not properly disconnecting from the server.
-
-* Fix reading HEAD reflog in worktrees.
-
-* Update our copy of SHA1DC to fix errors with endianess on some platforms.
-
-v0.27.1
----------
-
-This is a security release fixing insufficient validation of submodule names
-(CVE-2018-11235, reported by Etienne Stalmans) and disallows `.gitmodules` files
-as symlinks.
-
-While submodule names come from the untrusted ".gitmodules" file, we blindly
-append the name to "$GIT_DIR/modules" to construct the final path of the
-submodule repository. In case the name contains e.g. "../", an adversary would
-be able to escape your repository and write data at arbitrary paths. In
-accordance with git, we now enforce some rules for submodule names which will
-cause libgit2 to ignore these malicious names.
-
-Adding a symlink as `.gitmodules` into the index from the workdir or checking
-out such files is not allowed as this can make a Git implementation write
-outside of the repository and bypass the `fsck` checks for CVE-2018-11235.
-
-libgit2 is not susceptible to CVE-2018-11233.
-
-v0.27
----------
-
-### Changes or improvements
-
-* Improved `p_unlink` in `posix_w32.c` to try and make a file writable
- before sleeping in the retry loop to prevent unnecessary calls to sleep.
-
-* The CMake build infrastructure has been improved to speed up building time.
-
-* A new CMake option "-DUSE_HTTPS=<backend>" makes it possible to explicitly
- choose an HTTP backend.
-
-* A new CMake option "-DSHA1_BACKEND=<backend>" makes it possible to explicitly
- choose an SHA1 backend. The collision-detecting backend is now the default.
-
-* A new CMake option "-DUSE_BUNDLED_ZLIB" makes it possible to explicitly use
- the bundled zlib library.
-
-* A new CMake option "-DENABLE_REPRODUCIBLE_BUILDS" makes it possible to
- generate a reproducible static archive. This requires support from your
- toolchain.
-
-* The minimum required CMake version has been bumped to 2.8.11.
-
-* Writing to a configuration file now preserves the case of the key given by the
- caller for the case-insensitive portions of the key (existing sections are
- used even if they don't match).
-
-* We now support conditional includes in configuration files.
-
-* Fix for handling re-reading of configuration files with includes.
-
-* Fix for reading patches which contain exact renames only.
-
-* Fix for reading patches with whitespace in the compared files' paths.
-
-* We will now fill `FETCH_HEAD` from all passed refspecs instead of overwriting
- with the last one.
-
-* There is a new diff option, `GIT_DIFF_INDENT_HEURISTIC` which activates a
- heuristic which takes into account whitespace and indentation in order to
- produce better diffs when dealing with ambiguous diff hunks.
-
-* Fix for pattern-based ignore rules where files ignored by a rule cannot be
- un-ignored by another rule.
-
-* Sockets opened by libgit2 are now being closed on exec(3) if the platform
- supports it.
-
-* Fix for peeling annotated tags from packed-refs files.
-
-* Fix reading huge loose objects from the object database.
-
-* Fix files not being treated as modified when only the file mode has changed.
-
-* We now explicitly reject adding submodules to the index via
- `git_index_add_frombuffer`.
-
-* Fix handling of `GIT_DIFF_FIND_RENAMES_FROM_REWRITES` raising `SIGABRT` when
- one file has been deleted and another file has been rewritten.
-
-* Fix for WinHTTP not properly handling NTLM and Negotiate challenges.
-
-* When using SSH-based transports, we now repeatedly ask for the passphrase to
- decrypt the private key in case a wrong passphrase is being provided.
-
-* When generating conflict markers, they will now use the same line endings as
- the rest of the file.
-
-### API additions
-
-* The `git_merge_file_options` structure now contains a new setting,
- `marker_size`. This allows users to set the size of markers that
- delineate the sides of merged files in the output conflict file.
- By default this is 7 (`GIT_MERGE_CONFLICT_MARKER_SIZE`), which
- produces output markers like `<<<<<<<` and `>>>>>>>`.
-
-* `git_remote_create_detached()` creates a remote that is not associated
- to any repository (and does not apply configuration like 'insteadof' rules).
- This is mostly useful for e.g. emulating `git ls-remote` behavior.
-
-* `git_diff_patchid()` lets you generate patch IDs for diffs.
-
-* `git_status_options` now has an additional field `baseline` to allow creating
- status lists against different trees.
-
-* New family of functions to allow creating notes for a specific notes commit
- instead of for a notes reference.
-
-* New family of functions to allow parsing message trailers. This API is still
- experimental and may change in future releases.
-
-### API removals
-
-### Breaking API changes
-
-* Signatures now distinguish between +0000 and -0000 UTC offsets.
-
-* The certificate check callback in the WinHTTP transport will now receive the
- `message_cb_payload` instead of the `cred_acquire_payload`.
-
-* We are now reading symlinked directories under .git/refs.
-
-* We now refuse creating branches named "HEAD".
-
-* We now refuse reading and writing all-zero object IDs into the
- object database.
-
-* We now read the effective user's configuration file instead of the real user's
- configuration in case libgit2 runs as part of a setuid binary.
-
-* The `git_odb_open_rstream` function and its `readstream` callback in the
- `git_odb_backend` interface have changed their signatures to allow providing
- the object's size and type to the caller.
-
-v0.26
------
-
-### Changes or improvements
-
-* Support for opening, creating and modifying worktrees.
-
-* We can now detect SHA1 collisions resulting from the SHAttered attack. These
- checks can be enabled at build time via `-DUSE_SHA1DC`.
-
-* Fix for missing implementation of `git_merge_driver_source` getters.
-
-* Fix for installed pkg-config file being broken when the prefix contains
- spaces.
-
-* We now detect when the hashsum of on-disk objects does not match their
- expected hashsum.
-
-* We now support open-ended ranges (e.g. "master..", "...master") in our
- revision range parsing code.
-
-* We now correctly compute ignores with leading "/" in subdirectories.
-
-* We now optionally call `fsync` on loose objects, packfiles and their indexes,
- loose references and packed reference files.
-
-* We can now build against OpenSSL v1.1 and against LibreSSL.
-
-* `GIT_MERGE_OPTIONS_INIT` now includes a setting to perform rename detection.
- This aligns this structure with the default by `git_merge` and
- `git_merge_trees` when `NULL` was provided for the options.
-
-* Improvements for reading index v4 files.
-
-* Perform additional retries for filesystem operations on Windows when files
- are temporarily locked by other processes.
-
-### API additions
-
-* New family of functions to handle worktrees:
-
- * `git_worktree_list()` lets you look up worktrees for a repository.
- * `git_worktree_lookup()` lets you get a specific worktree.
- * `git_worktree_open_from_repository()` lets you get the associated worktree
- of a repository.
- a worktree.
- * `git_worktree_add` lets you create new worktrees.
- * `git_worktree_prune` lets you remove worktrees from disk.
- * `git_worktree_lock()` and `git_worktree_unlock()` let you lock
- respectively unlock a worktree.
- * `git_repository_open_from_worktree()` lets you open a repository via
- * `git_repository_head_for_worktree()` lets you get the current `HEAD` for a
- linked worktree.
- * `git_repository_head_detached_for_worktree()` lets you check whether a
- linked worktree is in detached HEAD mode.
-
-* `git_repository_item_path()` lets you retrieve paths for various repository
- files.
-
-* `git_repository_commondir()` lets you retrieve the common directory of a
- repository.
-
-* `git_branch_is_checked_out()` allows you to check whether a branch is checked
- out in a repository or any of its worktrees.
-
-* `git_repository_submodule_cache_all()` and
- `git_repository_submodule_cache_clear()` functions allow you to prime or clear
- the submodule cache of a repository.
-
-* You can disable strict hash verifications via the
- `GIT_OPT_ENABLE_STRICT_HASH_VERIFICATION` option with `git_libgit2_opts()`.
-
-* You can enable us calling `fsync` for various files inside the ".git"
- directory by setting the `GIT_OPT_ENABLE_FSYNC_GITDIR` option with
- `git_libgit2_opts()`.
-
-* You can now enable "offset deltas" when creating packfiles and negotiating
- packfiles with a remote server by setting `GIT_OPT_ENABLE_OFS_DELTA` option
- with `GIT_libgit2_opts()`.
-
-* You can now set the default share mode on Windows for opening files using
- `GIT_OPT_SET_WINDOWS_SHAREMODE` option with `git_libgit2_opts()`.
- You can query the current share mode with `GIT_OPT_GET_WINDOWS_SHAREMODE`.
-
-* `git_transport_smart_proxy_options()' enables you to get the proxy options for
- smart transports.
-
-* The `GIT_FILTER_INIT` macro and the `git_filter_init` function are provided
- to initialize a `git_filter` structure.
-
-### Breaking API changes
-
-* `clone_checkout_strategy` has been removed from
- `git_submodule_update_option`. The checkout strategy used to clone will
- be the same strategy specified in `checkout_opts`.
-
-v0.25
--------
-
-### Changes or improvements
-
-* Fix repository discovery with `git_repository_discover` and
- `git_repository_open_ext` to match git's handling of a ceiling
- directory at the current directory. git only checks ceiling
- directories when its search ascends to a parent directory. A ceiling
- directory matching the starting directory will not prevent git from
- finding a repository in the starting directory or a parent directory.
-
-* Do not fail when deleting remotes in the presence of broken
- global configs which contain branches.
-
-* Support for reading and writing git index v4 files
-
-* Improve the performance of the revwalk and bring us closer to git's code.
-
-* The reference db has improved support for concurrency and returns `GIT_ELOCKED`
- when an operation could not be performed due to locking.
-
-* Nanosecond resolution is now activated by default, following git's change to
- do this.
-
-* We now restrict the set of ciphers we let OpenSSL use by default.
-
-* Users can now register their own merge drivers for use with `.gitattributes`.
- The library also gained built-in support for the union merge driver.
-
-* The default for creating references is now to validate that the object does
- exist.
-
-* Add `git_proxy_options` which is used by the different networking
- implementations to let the caller specify the proxy settings instead of
- relying on the environment variables.
-
-### API additions
-
-* You can now get the user-agent used by libgit2 using the
- `GIT_OPT_GET_USER_AGENT` option with `git_libgit2_opts()`.
- It is the counterpart to `GIT_OPT_SET_USER_AGENT`.
-
-* The `GIT_OPT_SET_SSL_CIPHERS` option for `git_libgit2_opts()` lets you specify
- a custom list of ciphers to use for OpenSSL.
-
-* `git_commit_create_buffer()` creates a commit and writes it into a
- user-provided buffer instead of writing it into the object db. Combine it with
- `git_commit_create_with_signature()` in order to create a commit with a
- cryptographic signature.
-
-* `git_blob_create_fromstream()` and
- `git_blob_create_fromstream_commit()` allow you to create a blob by
- writing into a stream. Useful when you do not know the final size or
- want to copy the contents from another stream.
-
-* New flags for `git_repository_open_ext`:
-
- * `GIT_REPOSITORY_OPEN_NO_DOTGIT` - Do not check for a repository by
- appending `/.git` to the `start_path`; only open the repository if
- `start_path` itself points to the git directory.
- * `GIT_REPOSITORY_OPEN_FROM_ENV` - Find and open a git repository,
- respecting the environment variables used by the git command-line
- tools. If set, `git_repository_open_ext` will ignore the other
- flags and the `ceiling_dirs` argument, and will allow a NULL
- `path` to use `GIT_DIR` or search from the current directory. The
- search for a repository will respect `$GIT_CEILING_DIRECTORIES`
- and `$GIT_DISCOVERY_ACROSS_FILESYSTEM`. The opened repository
- will respect `$GIT_INDEX_FILE`, `$GIT_NAMESPACE`,
- `$GIT_OBJECT_DIRECTORY`, and `$GIT_ALTERNATE_OBJECT_DIRECTORIES`.
- In the future, this flag will also cause `git_repository_open_ext`
- to respect `$GIT_WORK_TREE` and `$GIT_COMMON_DIR`; currently,
- `git_repository_open_ext` with this flag will error out if either
- `$GIT_WORK_TREE` or `$GIT_COMMON_DIR` is set.
-
-* `git_diff_from_buffer()` can create a `git_diff` object from the contents
- of a git-style patch file.
-
-* `git_index_version()` and `git_index_set_version()` to get and set
- the index version
-
-* `git_odb_expand_ids()` lets you check for the existence of multiple
- objects at once.
-
-* The new `git_blob_dup()`, `git_commit_dup()`, `git_tag_dup()` and
- `git_tree_dup()` functions provide type-specific wrappers for
- `git_object_dup()` to reduce noise and increase type safety for callers.
-
-* `git_reference_dup()` lets you duplicate a reference to aid in ownership
- management and cleanup.
-
-* `git_signature_from_buffer()` lets you create a signature from a string in the
- format that appear in objects.
-
-* `git_tree_create_updated()` lets you create a tree based on another one
- together with a list of updates. For the covered update cases, it's more
- efficient than the `git_index` route.
-
-* `git_apply_patch()` applies hunks from a `git_patch` to a buffer.
-
-* `git_diff_to_buf()` lets you print an entire diff directory to a buffer,
- similar to how `git_patch_to_buf()` works.
-
-* `git_proxy_init_options()` is added to initialize a `git_proxy_options`
- structure at run-time.
-
-* `git_merge_driver_register()`, `git_merge_driver_unregister()` let you
- register and unregister a custom merge driver to be used when `.gitattributes`
- specifies it.
-
-* `git_merge_driver_lookup()` can be used to look up a merge driver by name.
-
-* `git_merge_driver_source_repo()`, `git_merge_driver_source_ancestor()`,
- `git_merge_driver_source_ours()`, `git_merge_driver_source_theirs()`,
- `git_merge_driver_source_file_options()` added as accessors to
- `git_merge_driver_source`.
-
-### API removals
-
-* `git_blob_create_fromchunks()` has been removed in favour of
- `git_blob_create_fromstream()`.
-
-### Breaking API changes
-
-* `git_packbuilder_object_count` and `git_packbuilder_written` now
- return a `size_t` instead of a `uint32_t` for more thorough
- compatibility with the rest of the library.
-
-* `git_packbuiler_progress` now provides explicitly sized `uint32_t`
- values instead of `unsigned int`.
-
-* `git_diff_file` now includes an `id_abbrev` field that reflects the
- number of nibbles set in the `id` field.
-
-* `git_odb_backend` now has a `freshen` function pointer. This optional
- function pointer is similar to the `exists` function, but it will update
- a last-used marker. For filesystem-based object databases, this updates
- the timestamp of the file containing the object, to indicate "freshness".
- If this is `NULL`, then it will not be called and the `exists` function
- will be used instead.
-
-* `git_remote_connect()` now accepts `git_proxy_options` argument, and
- `git_fetch_options` and `git_push_options` each have a `proxy_opts` field.
-
-* `git_merge_options` now provides a `default_driver` that can be used
- to provide the name of a merge driver to be used to handle files changed
- during a merge.
-
-v0.24
--------
-
-### Changes or improvements
-
-* Custom merge drivers can now be registered, which allows callers to
- configure callbacks to honor `merge=driver` configuration in
- `.gitattributes`.
-
-* Custom filters can now be registered with wildcard attributes, for
- example `filter=*`. Consumers should examine the attributes parameter
- of the `check` function for details.
-
-* Symlinks are now followed when locking a file, which can be
- necessary when multiple worktrees share a base repository.
-
-* You can now set your own user-agent to be sent for HTTP requests by
- using the `GIT_OPT_SET_USER_AGENT` with `git_libgit2_opts()`.
-
-* You can set custom HTTP header fields to be sent along with requests
- by passing them in the fetch and push options.
-
-* Tree objects are now assumed to be sorted. If a tree is not
- correctly formed, it will give bad results. This is the git approach
- and cuts a significant amount of time when reading the trees.
-
-* Filter registration is now protected against concurrent
- registration.
-
-* Filenames which are not valid on Windows in an index no longer cause
- to fail to parse it on that OS.
-
-* Rebases can now be performed purely in-memory, without touching the
- repository's workdir.
-
-* When adding objects to the index, or when creating new tree or commit
- objects, the inputs are validated to ensure that the dependent objects
- exist and are of the correct type. This object validation can be
- disabled with the GIT_OPT_ENABLE_STRICT_OBJECT_CREATION option.
-
-* The WinHTTP transport's handling of bad credentials now behaves like
- the others, asking for credentials again.
-
-### API additions
-
-* `git_config_lock()` has been added, which allow for
- transactional/atomic complex updates to the configuration, removing
- the opportunity for concurrent operations and not committing any
- changes until the unlock.
-
-* `git_diff_options` added a new callback `progress_cb` to report on the
- progress of the diff as files are being compared. The documentation of
- the existing callback `notify_cb` was updated to reflect that it only
- gets called when new deltas are added to the diff.
-
-* `git_fetch_options` and `git_push_options` have gained a `custom_headers`
- field to set the extra HTTP header fields to send.
-
-* `git_stream_register_tls()` lets you register a callback to be used
- as the constructor for a TLS stream instead of the libgit2 built-in
- one.
-
-* `git_commit_header_field()` allows you to look up a specific header
- field in a commit.
-
-* `git_commit_extract_signature()` extracts the signature from a
- commit and gives you both the signature and the signed data so you
- can verify it.
-
-### API removals
-
-* No APIs were removed in this version.
-
-### Breaking API changes
-
-* The `git_merge_tree_flag_t` is now `git_merge_flag_t`. Subsequently,
- its members are no longer prefixed with `GIT_MERGE_TREE_FLAG` but are
- now prefixed with `GIT_MERGE_FLAG`, and the `tree_flags` field of the
- `git_merge_options` structure is now named `flags`.
-
-* The `git_merge_file_flags_t` enum is now `git_merge_file_flag_t` for
- consistency with other enum type names.
-
-* `git_cert` descendent types now have a proper `parent` member
-
-* It is the responsibility of the refdb backend to decide what to do
- with the reflog on ref deletion. The file-based backend must delete
- it, a database-backed one may wish to archive it.
-
-* `git_config_backend` has gained two entries. `lock` and `unlock`
- with which to implement the transactional/atomic semantics for the
- configuration backend.
-
-* `git_index_add` and `git_index_conflict_add()` will now use the case
- as provided by the caller on case insensitive systems. Previous
- versions would keep the case as it existed in the index. This does
- not affect the higher-level `git_index_add_bypath` or
- `git_index_add_frombuffer` functions.
-
-* The `notify_payload` field of `git_diff_options` was renamed to `payload`
- to reflect that it's also the payload for the new progress callback.
-
-* The `git_config_level_t` enum has gained a higher-priority value
- `GIT_CONFIG_LEVEL_PROGRAMDATA` which represent a rough Windows equivalent
- to the system level configuration.
-
-* `git_rebase_options` now has a `merge_options` field.
-
-* The index no longer performs locking itself. This is not something
- users of the library should have been relying on as it's not part of
- the concurrency guarantees.
-
-* `git_remote_connect()` now takes a `custom_headers` argument to set
- the extra HTTP header fields to send.
-
-v0.23
-------
-
-### Changes or improvements
-
-* Patience and minimal diff drivers can now be used for merges.
-
-* Merges can now ignore whitespace changes.
-
-* Updated binary identification in CRLF filtering to avoid false positives in
- UTF-8 files.
-
-* Rename and copy detection is enabled for small files.
-
-* Checkout can now handle an initial checkout of a repository, making
- `GIT_CHECKOUT_SAFE_CREATE` unnecessary for users of clone.
-
-* The signature parameter in the ref-modifying functions has been
- removed. Use `git_repository_set_ident()` and
- `git_repository_ident()` to override the signature to be used.
-
-* The local transport now auto-scales the number of threads to use
- when creating the packfile instead of sticking to one.
-
-* Reference renaming now uses the right id for the old value.
-
-* The annotated version of branch creation, HEAD detaching and reset
- allow for specifying the expression from the user to be put into the
- reflog.
-
-* `git_rebase_commit` now returns `GIT_EUNMERGED` when you attempt to
- commit with unstaged changes.
-
-* On Mac OS X, we now use SecureTransport to provide the cryptographic
- support for HTTPS connections insead of OpenSSL.
-
-* Checkout can now accept an index for the baseline computations via the
- `baseline_index` member.
-
-* The configuration for fetching is no longer stored inside the
- `git_remote` struct but has been moved to a `git_fetch_options`. The
- remote functions now take these options or the callbacks instead of
- setting them beforehand.
-
-* `git_submodule` instances are no longer cached or shared across
- lookup. Each submodule represents the configuration at the time of
- loading.
-
-* The index now uses diffs for `add_all()` and `update_all()` which
- gives it a speed boost and closer semantics to git.
-
-* The ssh transport now reports the stderr output from the server as
- the error message, which allows you to get the "repository not
- found" messages.
-
-* `git_index_conflict_add()` will remove staged entries that exist for
- conflicted paths.
-
-* The flags for a `git_diff_file` will now have the `GIT_DIFF_FLAG_EXISTS`
- bit set when a file exists on that side of the diff. This is useful
- for understanding whether a side of the diff exists in the presence of
- a conflict.
-
-* The constructor for a write-stream into the odb now takes
- `git_off_t` instead of `size_t` for the size of the blob, which
- allows putting large files into the odb on 32-bit systems.
-
-* The remote's push and pull URLs now honor the url.$URL.insteadOf
- configuration. This allows modifying URL prefixes to a custom
- value via gitconfig.
-
-* `git_diff_foreach`, `git_diff_blobs`, `git_diff_blob_to_buffer`,
- and `git_diff_buffers` now accept a new binary callback of type
- `git_diff_binary_cb` that includes the binary diff information.
-
-* The race condition mitigations described in `racy-git.txt` have been
- implemented.
-
-* If libcurl is installed, we will use it to connect to HTTP(S)
- servers.
-
-### API additions
-
-* The `git_merge_options` gained a `file_flags` member.
-
-* Parsing and retrieving a configuration value as a path is exposed
- via `git_config_parse_path()` and `git_config_get_path()`
- respectively.
-
-* `git_repository_set_ident()` and `git_repository_ident()` serve to
- set and query which identity will be used when writing to the
- reflog.
-
-* `git_config_entry_free()` frees a config entry.
-
-* `git_config_get_string_buf()` provides a way to safely retrieve a
- string from a non-snapshot configuration.
-
-* `git_annotated_commit_from_revspec()` allows to get an annotated
- commit from an extended sha synatx string.
-
-* `git_repository_set_head_detached_from_annotated()`,
- `git_branch_create_from_annotated()` and
- `git_reset_from_annotated()` allow for the caller to provide an
- annotated commit through which they can control what expression is
- put into the reflog as the source/target.
-
-* `git_index_add_frombuffer()` can now create a blob from memory
- buffer and add it to the index which is attached to a repository.
-
-* The structure `git_fetch_options` has been added to determine the
- runtime configuration for fetching, such as callbacks, pruning and
- autotag behaviour. It has the runtime initializer
- `git_fetch_init_options()`.
-
-* The enum `git_fetch_prune_t` has been added, letting you specify the
- pruning behaviour for a fetch.
-
-* A push operation will notify the caller of what updates it indends
- to perform on the remote, which provides similar information to
- git's pre-push hook.
-
-* `git_stash_apply()` can now apply a stashed state from the stash list,
- placing the data into the working directory and index.
-
-* `git_stash_pop()` will apply a stashed state (like `git_stash_apply()`)
- but will remove the stashed state after a successful application.
-
-* A new error code `GIT_EEOF` indicates an early EOF from the
- server. This typically indicates an error with the URL or
- configuration of the server, and tools can use this to show messages
- about failing to communicate with the server.
-
-* A new error code `GIT_EINVALID` indicates that an argument to a
- function is invalid, or an invalid operation was requested.
-
-* `git_diff_index_to_workdir()` and `git_diff_tree_to_index()` will now
- produce deltas of type `GIT_DELTA_CONFLICTED` to indicate that the index
- side of the delta is a conflict.
-
-* The `git_status` family of functions will now produce status of type
- `GIT_STATUS_CONFLICTED` to indicate that a conflict exists for that file
- in the index.
-
-* `git_index_entry_is_conflict()` is a utility function to determine if
- a given index entry has a non-zero stage entry, indicating that it is
- one side of a conflict.
-
-* It is now possible to pass a keypair via a buffer instead of a
- path. For this, `GIT_CREDTYPE_SSH_MEMORY` and
- `git_cred_ssh_key_memory_new()` have been added.
-
-* `git_filter_list_contains` will indicate whether a particular
- filter will be run in the given filter list.
-
-* `git_commit_header_field()` has been added, which allows retrieving
- the contents of an arbitrary header field.
-
-* `git_submodule_set_branch()` allows to set the configured branch for
- a submodule.
-
-### API removals
-
-* `git_remote_save()` and `git_remote_clear_refspecs()` have been
- removed. Remote's configuration is changed via the configuration
- directly or through a convenience function which performs changes to
- the configuration directly.
-
-* `git_remote_set_callbacks()`, `git_remote_get_callbacks()` and
- `git_remote_set_transport()` have been removed and the remote no
- longer stores this configuration.
-
-* `git_remote_set_fetch_refpecs()` and
- `git_remote_set_push_refspecs()` have been removed. There is no
- longer a way to set the base refspecs at run-time.
-
-* `git_submodule_save()` has been removed. The submodules are no
- longer configured via the objects.
-
-* `git_submodule_reload_all()` has been removed as we no longer cache
- submodules.
-
-### Breaking API changes
-
-* `git_smart_subtransport_cb` now has a `param` parameter.
-
-* The `git_merge_options` structure member `flags` has been renamed
- to `tree_flags`.
-
-* The `git_merge_file_options` structure member `flags` is now
- an unsigned int. It was previously a `git_merge_file_flags_t`.
-
-* `GIT_CHECKOUT_SAFE_CREATE` has been removed. Most users will generally
- be able to switch to `GIT_CHECKOUT_SAFE`, but if you require missing
- file handling during checkout, you may now use `GIT_CHECKOUT_SAFE |
- GIT_CHECKOUT_RECREATE_MISSING`.
-
-* The `git_clone_options` and `git_submodule_update_options`
- structures no longer have a `signature` field.
-
-* The following functions have removed the signature and/or log message
- parameters in favour of git-emulating ones.
-
- * `git_branch_create()`, `git_branch_move()`
- * `git_rebase_init()`, `git_rebase_abort()`
- * `git_reference_symbolic_create_matching()`,
- `git_reference_symbolic_create()`, `git_reference_create()`,
- `git_reference_create_matching()`,
- `git_reference_symbolic_set_target()`,
- `git_reference_set_target()`, `git_reference_rename()`
- * `git_remote_update_tips()`, `git_remote_fetch()`, `git_remote_push()`
- * `git_repository_set_head()`,
- `git_repository_set_head_detached()`,
- `git_repository_detach_head()`
- * `git_reset()`
-
-* `git_config_get_entry()` now gives back a ref-counted
- `git_config_entry`. You must free it when you no longer need it.
-
-* `git_config_get_string()` will return an error if used on a
- non-snapshot configuration, as there can be no guarantee that the
- returned pointer is valid.
-
-* `git_note_default_ref()` now uses a `git_buf` to return the string,
- as the string is otherwise not guaranteed to stay allocated.
-
-* `git_rebase_operation_current()` will return `GIT_REBASE_NO_OPERATION`
- if it is called immediately after creating a rebase session but before
- you have applied the first patch.
-
-* `git_rebase_options` now contains a `git_checkout_options` struct
- that will be used for functions that modify the working directory,
- namely `git_rebase_init`, `git_rebase_next` and
- `git_rebase_abort`. As a result, `git_rebase_open` now also takes
- a `git_rebase_options` and only the `git_rebase_init` and
- `git_rebase_open` functions take a `git_rebase_options`, where they
- will persist the options to subsequent `git_rebase` calls.
-
-* The `git_clone_options` struct now has fetch options in a
- `fetch_opts` field instead of remote callbacks in
- `remote_callbacks`.
-
-* The remote callbacks has gained a new member `push_negotiation`
- which gets called before sending the update commands to the server.
-
-* The following functions no longer act on a remote instance but
- change the repository's configuration. Their signatures have changed
- accordingly:
-
- * `git_remote_set_url()`, `git_remote_seturl()`
- * `git_remote_add_fetch()`, `git_remote_add_push()` and
- * `git_remote_set_autotag()`
-
-* `git_remote_connect()` and `git_remote_prune()` now take a pointer
- to the callbacks.
-
-* `git_remote_fetch()` and `git_remote_download()` now take a pointer
- to fetch options which determine the runtime configuration.
-
-* The `git_remote_autotag_option_t` values have been changed. It has
- gained a `_UNSPECIFIED` default value to specify no override for the
- configured setting.
-
-* `git_remote_update_tips()` now takes a pointer to the callbacks as
- well as a boolean whether to write `FETCH_HEAD` and the autotag
- setting.
-
-* `git_remote_create_anonymous()` no longer takes a fetch refspec as
- url-only remotes cannot have configured refspecs.
-
-* The `git_submodule_update_options` struct now has fetch options in
- the `fetch_opts` field instead of callbacks in the
- `remote_callbacks` field.
-
-* The following functions no longer act on a submodule instance but
- change the repository's configuration. Their signatures have changed
- accordingly:
-
- * `git_submodule_set_url()`, `git_submodule_set_ignore()`,
- `git_submodule_set_update()`,
- `git_submodule_set_fetch_recurse_submodules()`.
-
-* `git_submodule_status()` no longer takes a submodule instance but a
- repsitory, a submodule name and an ignore setting.
-
-* The `push` function in the `git_transport` interface now takes a
- pointer to the remote callbacks.
-
-* The `git_index_entry` struct's fields' types have been changed to
- more accurately reflect what is in fact stored in the
- index. Specifically, time and file size are 32 bits intead of 64, as
- these values are truncated.
-
-* `GIT_EMERGECONFLICT` is now `GIT_ECONFLICT`, which more accurately
- describes the nature of the error.
-
-* It is no longer allowed to call `git_buf_grow()` on buffers
- borrowing the memory they point to.
-
-v0.22
-------
-
-### Changes or improvements
-
-* `git_signature_new()` now requires a non-empty email address.
-
-* Use CommonCrypto libraries for SHA-1 calculation on Mac OS X.
-
-* Disable SSL compression and SSLv2 and SSLv3 ciphers in favor of TLSv1
- in OpenSSL.
-
-* The fetch behavior of remotes with autotag set to `GIT_REMOTE_DOWNLOAD_TAGS_ALL`
- has been changed to match git 1.9.0 and later. In this mode, libgit2 now
- fetches all tags in addition to whatever else needs to be fetched.
-
-* `git_checkout()` now handles case-changing renames correctly on
- case-insensitive filesystems; for example renaming "readme" to "README".
-
-* The search for libssh2 is now done via pkg-config instead of a
- custom search of a few directories.
-
-* Add support for core.protectHFS and core.protectNTFS. Add more
- validation for filenames which we write such as references.
-
-* The local transport now generates textual progress output like
- git-upload-pack does ("counting objects").
-
-* `git_checkout_index()` can now check out an in-memory index that is not
- necessarily the repository's index, so you may check out an index
- that was produced by git_merge and friends while retaining the cached
- information.
-
-* Remove the default timeout for receiving / sending data over HTTP using
- the WinHTTP transport layer.
-
-* Add SPNEGO (Kerberos) authentication using GSSAPI on Unix systems.
-
-* Provide built-in objects for the empty blob (e69de29) and empty
- tree (4b825dc) objects.
-
-* The index' tree cache is now filled upon read-tree and write-tree
- and the cache is written to disk.
-
-* LF -> CRLF filter refuses to handle mixed-EOL files
-
-* LF -> CRLF filter now runs when * text = auto (with Git for Windows 1.9.4)
-
-* File unlocks are atomic again via rename. Read-only files on Windows are
- made read-write if necessary.
-
-* Share open packfiles across repositories to share descriptors and mmaps.
-
-* Use a map for the treebuilder, making insertion O(1)
-
-* The build system now accepts an option EMBED_SSH_PATH which when set
- tells it to include a copy of libssh2 at the given location. This is
- enabled for MSVC.
-
-* Add support for refspecs with the asterisk in the middle of a
- pattern.
-
-* Fetching now performs opportunistic updates. To achieve this, we
- introduce a difference between active and passive refspecs, which
- make `git_remote_download()` and `git_remote_fetch()` to take a list of
- resfpecs to be the active list, similarly to how git fetch accepts a
- list on the command-line.
-
-* The THREADSAFE option to build libgit2 with threading support has
- been flipped to be on by default.
-
-* The remote object has learnt to prune remote-tracking branches. If
- the remote is configured to do so, this will happen via
- `git_remote_fetch()`. You can also call `git_remote_prune()` after
- connecting or fetching to perform the prune.
-
-
-### API additions
-
-* Introduce `git_buf_text_is_binary()` and `git_buf_text_contains_nul()` for
- consumers to perform binary detection on a git_buf.
-
-* `git_branch_upstream_remote()` has been introduced to provide the
- branch.<name>.remote configuration value.
-
-* Introduce `git_describe_commit()` and `git_describe_workdir()` to provide
- a description of the current commit (and working tree, respectively)
- based on the nearest tag or reference
-
-* Introduce `git_merge_bases()` and the `git_oidarray` type to expose all
- merge bases between two commits.
-
-* Introduce `git_merge_bases_many()` to expose all merge bases between
- multiple commits.
-
-* Introduce rebase functionality (using the merge algorithm only).
- Introduce `git_rebase_init()` to begin a new rebase session,
- `git_rebase_open()` to open an in-progress rebase session,
- `git_rebase_commit()` to commit the current rebase operation,
- `git_rebase_next()` to apply the next rebase operation,
- `git_rebase_abort()` to abort an in-progress rebase and `git_rebase_finish()`
- to complete a rebase operation.
-
-* Introduce `git_note_author()` and `git_note_committer()` to get the author
- and committer information on a `git_note`, respectively.
-
-* A factory function for ssh has been added which allows to change the
- path of the programs to execute for receive-pack and upload-pack on
- the server, `git_transport_ssh_with_paths()`.
-
-* The ssh transport supports asking the remote host for accepted
- credential types as well as multiple challeges using a single
- connection. This requires to know which username you want to connect
- as, so this introduces the USERNAME credential type which the ssh
- transport will use to ask for the username.
-
-* The `GIT_EPEEL` error code has been introduced when we cannot peel a tag
- to the requested object type; if the given object otherwise cannot be
- peeled, `GIT_EINVALIDSPEC` is returned.
-
-* Introduce `GIT_REPOSITORY_INIT_RELATIVE_GITLINK` to use relative paths
- when writing gitlinks, as is used by git core for submodules.
-
-* `git_remote_prune()` has been added. See above for description.
-
-
-* Introduce reference transactions, which allow multiple references to
- be locked at the same time and updates be queued. This also allows
- us to safely update a reflog with arbitrary contents, as we need to
- do for stash.
-
-### API removals
-
-* `git_remote_supported_url()` and `git_remote_is_valid_url()` have been
- removed as they have become essentially useless with rsync-style ssh paths.
-
-* `git_clone_into()` and `git_clone_local_into()` have been removed from the
- public API in favour of `git_clone callbacks`.
-
-* The option to ignore certificate errors via `git_remote_cert_check()`
- is no longer present. Instead, `git_remote_callbacks` has gained a new
- entry which lets the user perform their own certificate checks.
-
-### Breaking API changes
-
-* `git_cherry_pick()` is now `git_cherrypick()`.
-
-* The `git_submodule_update()` function was renamed to
- `git_submodule_update_strategy()`. `git_submodule_update()` is now used to
- provide functionalty similar to "git submodule update".
-
-* `git_treebuilder_create()` was renamed to `git_treebuilder_new()` to better
- reflect it being a constructor rather than something which writes to
- disk.
-
-* `git_treebuilder_new()` (was `git_treebuilder_create()`) now takes a
- repository so that it can query repository configuration.
- Subsequently, `git_treebuilder_write()` no longer takes a repository.
-
-* `git_threads_init()` and `git_threads_shutdown()` have been renamed to
- `git_libgit2_init()` and `git_libgit2_shutdown()` to better explain what
- their purpose is, as it's grown to be more than just about threads.
-
-* `git_libgit2_init()` and `git_libgit2_shutdown()` now return the number of
- initializations of the library, so consumers may schedule work on the
- first initialization.
-
-* The `git_transport_register()` function no longer takes a priority and takes
- a URL scheme name (eg "http") instead of a prefix like "http://"
-
-* `git_index_name_entrycount()` and `git_index_reuc_entrycount()` now
- return size_t instead of unsigned int.
-
-* The `context_lines` and `interhunk_lines` fields in `git_diff`_options are
- now `uint32_t` instead of `uint16_t`. This allows to set them to `UINT_MAX`,
- in effect asking for "infinite" context e.g. to iterate over all the
- unmodified lines of a diff.
-
-* `git_status_file()` now takes an exact path. Use `git_status_list_new()` if
- pathspec searching is needed.
-
-* `git_note_create()` has changed the position of the notes reference
- name to match `git_note_remove()`.
-
-* Rename `git_remote_load()` to `git_remote_lookup()` to bring it in line
- with the rest of the lookup functions.
-
-* `git_remote_rename()` now takes the repository and the remote's
- current name. Accepting a remote indicates we want to change it,
- which we only did partially. It is much clearer if we accept a name
- and no loaded objects are changed.
-
-* `git_remote_delete()` now accepts the repository and the remote's name
- instead of a loaded remote.
-
-* `git_merge_head` is now `git_annotated_commit`, to better reflect its usage
- for multiple functions (including rebase)
-
-* The `git_clone_options` struct no longer provides the `ignore_cert_errors` or
- `remote_name` members for remote customization.
-
- Instead, the `git_clone_options` struct has two new members, `remote_cb` and
- `remote_cb_payload`, which allow the caller to completely override the remote
- creation process. If needed, the caller can use this callback to give their
- remote a name other than the default (origin) or disable cert checking.
-
- The `remote_callbacks` member has been preserved for convenience, although it
- is not used when a remote creation callback is supplied.
-
-* The `git_clone`_options struct now provides `repository_cb` and
- `repository_cb_payload` to allow the user to create a repository with
- custom options.
-
-* The `git_push` struct to perform a push has been replaced with
- `git_remote_upload()`. The refspecs and options are passed as a
- function argument. `git_push_update_tips()` is now also
- `git_remote_update_tips()` and the callbacks are in the same struct as
- the rest.
-
-* The `git_remote_set_transport()` function now sets a transport factory function,
- rather than a pre-existing transport instance.
-
-* The `git_transport` structure definition has moved into the sys/transport.h
- file.
-
-* libgit2 no longer automatically sets the OpenSSL locking
- functions. This is not something which we can know to do. A
- last-resort convenience function is provided in sys/openssl.h,
- `git_openssl_set_locking()` which can be used to set the locking.
PROJECT(libgit2 C)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
CMAKE_POLICY(SET CMP0015 NEW)
-IF (POLICY CMP0051)
+IF(POLICY CMP0051)
CMAKE_POLICY(SET CMP0051 NEW)
ENDIF()
-IF (POLICY CMP0042)
+IF(POLICY CMP0042)
CMAKE_POLICY(SET CMP0042 NEW)
ENDIF()
+IF(POLICY CMP0054)
+ CMAKE_POLICY(SET CMP0054 NEW)
+ENDIF()
# Add find modules to the path
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${libgit2_SOURCE_DIR}/cmake/Modules/")
# Build options
#
-OPTION( SONAME "Set the (SO)VERSION of the target" ON )
-OPTION( BUILD_SHARED_LIBS "Build Shared Library (OFF for Static)" ON )
-OPTION( THREADSAFE "Build libgit2 as threadsafe" ON )
-OPTION( BUILD_CLAR "Build Tests using the Clar suite" ON )
-OPTION( BUILD_EXAMPLES "Build library usage example apps" OFF )
-OPTION( TAGS "Generate tags" OFF )
-OPTION( PROFILE "Generate profiling information" OFF )
-OPTION( ENABLE_TRACE "Enables tracing support" OFF )
-OPTION( LIBGIT2_FILENAME "Name of the produced binary" OFF )
-
-SET(SHA1_BACKEND "CollisionDetection" CACHE STRING "Backend to use for SHA1. One of Generic, OpenSSL, Win32, CommonCrypto, CollisionDetection. ")
-OPTION( USE_SSH "Link with libssh to enable SSH support" ON )
-OPTION( USE_HTTPS "Enable HTTPS support. Can be set to a specific backend" ON )
-OPTION( USE_GSSAPI "Link with libgssapi for SPNEGO auth" OFF )
-OPTION( VALGRIND "Configure build for valgrind" OFF )
-OPTION( CURL "Use curl for HTTP if available" ON)
-OPTION( USE_EXT_HTTP_PARSER "Use system HTTP_Parser if available" ON)
-OPTION( DEBUG_POOL "Enable debug pool allocator" OFF )
-OPTION( ENABLE_WERROR "Enable compilation with -Werror" OFF )
-OPTION( USE_BUNDLED_ZLIB "Use the bundled version of zlib" OFF )
+OPTION(SONAME "Set the (SO)VERSION of the target" ON)
+OPTION(BUILD_SHARED_LIBS "Build Shared Library (OFF for Static)" ON)
+OPTION(THREADSAFE "Build libgit2 as threadsafe" ON)
+OPTION(BUILD_CLAR "Build Tests using the Clar suite" ON)
+OPTION(BUILD_EXAMPLES "Build library usage example apps" OFF)
+OPTION(BUILD_FUZZERS "Build the fuzz targets" OFF)
+OPTION(TAGS "Generate tags" OFF)
+OPTION(PROFILE "Generate profiling information" OFF)
+OPTION(ENABLE_TRACE "Enables tracing support" OFF)
+OPTION(LIBGIT2_FILENAME "Name of the produced binary" OFF)
+
+ SET(SHA1_BACKEND "CollisionDetection" CACHE STRING
+ "Backend to use for SHA1. One of Generic, OpenSSL, Win32, CommonCrypto, mbedTLS, CollisionDetection.")
+OPTION(USE_SSH "Link with libssh2 to enable SSH support" ON)
+OPTION(USE_HTTPS "Enable HTTPS support. Can be set to a specific backend" ON)
+OPTION(USE_GSSAPI "Link with libgssapi for SPNEGO auth" OFF)
+OPTION(USE_STANDALONE_FUZZERS "Enable standalone fuzzers (compatible with gcc)" OFF)
+OPTION(VALGRIND "Configure build for valgrind" OFF)
+OPTION(USE_EXT_HTTP_PARSER "Use system HTTP_Parser if available" ON)
+OPTION(DEBUG_POOL "Enable debug pool allocator" OFF)
+OPTION(ENABLE_WERROR "Enable compilation with -Werror" OFF)
+OPTION(USE_BUNDLED_ZLIB "Use the bundled version of zlib" OFF)
+OPTION(DEPRECATE_HARD "Do not include deprecated functions in the library" OFF)
IF (UNIX AND NOT APPLE)
- OPTION( ENABLE_REPRODUCIBLE_BUILDS "Enable reproducible builds" OFF )
+ OPTION(ENABLE_REPRODUCIBLE_BUILDS "Enable reproducible builds" OFF)
ENDIF()
IF (APPLE)
- OPTION( USE_ICONV "Link with and use iconv library" ON )
+ OPTION(USE_ICONV "Link with and use iconv library" ON)
ENDIF()
IF(MSVC)
- # This option is only available when building with MSVC. By default, libgit2
- # is build using the cdecl calling convention, which is useful if you're
- # writing C. However, the CLR and Win32 API both expect stdcall.
- #
- # If you are writing a CLR program and want to link to libgit2, you'll want
- # to turn this on by invoking CMake with the "-DSTDCALL=ON" argument.
- OPTION( STDCALL "Build libgit2 with the __stdcall convention" OFF )
-
# This option must match the settings used in your program, in particular if you
# are linking statically
- OPTION( STATIC_CRT "Link the static CRT libraries" ON )
+ OPTION(STATIC_CRT "Link the static CRT libraries" ON)
# If you want to embed a copy of libssh2 into libgit2, pass a
# path to libssh2
- OPTION( EMBED_SSH_PATH "Path to libssh2 to embed (Windows)" OFF )
+ OPTION(EMBED_SSH_PATH "Path to libssh2 to embed (Windows)" OFF)
ENDIF()
IF(WIN32)
# By default, libgit2 is built with WinHTTP. To use the built-in
# HTTP transport, invoke CMake with the "-DWINHTTP=OFF" argument.
- OPTION( WINHTTP "Use Win32 WinHTTP routines" ON )
+ OPTION(WINHTTP "Use Win32 WinHTTP routines" ON)
ENDIF()
IF(MSVC)
# Enable MSVC CRTDBG memory leak reporting when in debug mode.
- OPTION(MSVC_CRTDBG "Enable CRTDBG memory leak reporting" OFF)
+ OPTION(MSVC_CRTDBG "Enable CRTDBG memory leak reporting" OFF)
ENDIF()
FILE(STRINGS "${libgit2_SOURCE_DIR}/include/git2/version.h" GIT2_HEADER REGEX "^#define LIBGIT2_VERSION \"[^\"]*\"$")
FILE(STRINGS "${libgit2_SOURCE_DIR}/include/git2/version.h" GIT2_HEADER_SOVERSION REGEX "^#define LIBGIT2_SOVERSION [0-9]+$")
STRING(REGEX REPLACE "^.*LIBGIT2_SOVERSION ([0-9]+)$" "\\1" LIBGIT2_SOVERSION "${GIT2_HEADER_SOVERSION}")
+IF (DEPRECATE_HARD)
+ ADD_DEFINITIONS(-DGIT_DEPRECATE_HARD)
+ENDIF()
+
# Platform specific compilation flags
IF (MSVC)
+ IF (STDCALL)
+ MESSAGE(FATAL_ERROR "The STDCALL option is no longer supported; libgit2 is now always built as a cdecl library. If you're using PInvoke, please add the CallingConventions.Cdecl attribute for support.")
+ ENDIF()
+
ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS)
ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)
ADD_DEFINITIONS(-D_CRT_NONSTDC_NO_DEPRECATE)
# /MP - Parallel build
SET(CMAKE_C_FLAGS "/GF /MP /nologo ${CMAKE_C_FLAGS}")
- IF (STDCALL)
- # /Gz - stdcall calling convention
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Gz")
- ENDIF ()
+ # /Gd - explicitly set cdecl calling convention
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Gd")
IF (STATIC_CRT)
SET(CRT_FLAG_DEBUG "/MTd")
# /O1 - Optimize for size
SET(CMAKE_C_FLAGS_MINSIZEREL "/DNDEBUG /O1 /Oy /GL /Gy ${CRT_FLAG_RELEASE}")
+ # /IGNORE:4221 - Ignore empty compilation units
+ SET(CMAKE_STATIC_LINKER_FLAGS "/IGNORE:4221")
+
# /DYNAMICBASE - Address space load randomization (ASLR)
# /NXCOMPAT - Data execution prevention (DEP)
# /LARGEADDRESSAWARE - >2GB user address space on x86
ENABLE_WARNINGS(extra)
IF (CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)")
- SET(CMAKE_C_FLAGS "-std=c99 -D_POSIX_C_SOURCE=200112L -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS ${CMAKE_C_FLAGS}")
+ SET(CMAKE_C_FLAGS "-D_POSIX_C_SOURCE=200112L -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS ${CMAKE_C_FLAGS}")
ENDIF()
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -O0")
ENABLE_WARNINGS(strict-prototypes)
ENABLE_WARNINGS(declaration-after-statement)
ENABLE_WARNINGS(shift-count-overflow)
- DISABLE_WARNINGS(unused-const-variable)
- DISABLE_WARNINGS(unused-function)
+ ENABLE_WARNINGS(unused-const-variable)
+ ENABLE_WARNINGS(unused-function)
ENABLE_WARNINGS(format)
ENABLE_WARNINGS(format-security)
ENABLE_WARNINGS(int-conversion)
-
- IF (APPLE) # Apple deprecated OpenSSL
- DISABLE_WARNINGS(deprecated-declarations)
- ENDIF()
+ DISABLE_WARNINGS(documentation-deprecated-sync)
IF (PROFILE)
SET(CMAKE_C_FLAGS "-pg ${CMAKE_C_FLAGS}")
# that uses CMAKE_CONFIGURATION_TYPES and not CMAKE_BUILD_TYPE
ENDIF()
+IF(BUILD_FUZZERS AND NOT USE_STANDALONE_FUZZERS)
+ # The actual sanitizer link target will be added when linking the fuzz
+ # targets.
+ SET(CMAKE_REQUIRED_FLAGS "-fsanitize=fuzzer-no-link")
+ ADD_C_FLAG(-fsanitize=fuzzer-no-link)
+ UNSET(CMAKE_REQUIRED_FLAGS)
+ENDIF ()
+
ADD_SUBDIRECTORY(src)
# Tests
ADD_SUBDIRECTORY(examples)
ENDIF ()
+IF(BUILD_FUZZERS)
+ IF(NOT USE_STANDALONE_FUZZERS)
+ IF(BUILD_EXAMPLES)
+ MESSAGE(FATAL_ERROR "Cannot build the fuzzer targets and the examples together")
+ ENDIF()
+ IF(BUILD_CLAR)
+ MESSAGE(FATAL_ERROR "Cannot build the fuzzer targets and the tests together")
+ ENDIF()
+ ENDIF()
+ ADD_SUBDIRECTORY(fuzzers)
+ENDIF()
+
IF(CMAKE_VERSION VERSION_GREATER 3)
FEATURE_SUMMARY(WHAT ENABLED_FEATURES DESCRIPTION "Enabled features:")
FEATURE_SUMMARY(WHAT DISABLED_FEATURES DESCRIPTION "Disabled features:")
+++ /dev/null
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
- address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
- professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at [libgit2@gmail.com][email]. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[email]: mailto:libgit2@gmail.com
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+++ /dev/null
-# Welcome to libgit2!
-
-We're making it easy to do interesting things with git, and we'd love to have
-your help.
-
-## Licensing
-
-By contributing to libgit2, you agree to release your contribution under
-the terms of the license. Except for the `examples` directory, all code
-is released under the [GPL v2 with linking exception](COPYING).
-
-The `examples` code is governed by the
-[CC0 Public Domain Dedication](examples/COPYING), so that you may copy
-from them into your own application.
-
-## Discussion & Chat
-
-We hang out in the
-[`#libgit2`](http://webchat.freenode.net/?channels=#libgit2)) channel on
-irc.freenode.net.
-
-Also, feel free to open an
-[Issue](https://github.com/libgit2/libgit2/issues/new) to start a discussion
-about any concerns you have. We like to use Issues for that so there is an
-easily accessible permanent record of the conversation.
-
-## Libgit2 Versions
-
-The `master` branch is the main branch where development happens.
-Releases are tagged
-(e.g. [v0.21.0](https://github.com/libgit2/libgit2/releases/tag/v0.21.0) )
-and when a critical bug fix needs to be backported, it will be done on a
-`<tag>-maint` maintenance branch.
-
-## Reporting Bugs
-
-First, know which version of libgit2 your problem is in and include it in
-your bug report. This can either be a tag (e.g.
-[v0.17.0](https://github.com/libgit2/libgit2/releases/tag/v0.17.0)) or a
-commit SHA
-(e.g. [01be7863](https://github.com/libgit2/libgit2/commit/01be7863)).
-Using [`git describe`](http://git-scm.com/docs/git-describe) is a
-great way to tell us what version you're working with.
-
-If you're not running against the latest `master` branch version,
-please compile and test against that to avoid re-reporting an issue that's
-already been fixed.
-
-It's *incredibly* helpful to be able to reproduce the problem. Please
-include a list of steps, a bit of code, and/or a zipped repository (if
-possible). Note that some of the libgit2 developers are employees of
-GitHub, so if your repository is private, find us on IRC and we'll figure
-out a way to help you.
-
-## Pull Requests
-
-Our work flow is a [typical GitHub
-flow](https://guides.github.com/introduction/flow/index.html), where
-contributors fork the [libgit2 repository](https://github.com/libgit2/libgit2),
-make their changes on branch, and submit a
-[Pull Request](https://help.github.com/articles/using-pull-requests)
-(a.k.a. "PR"). Pull requests should usually be targeted at the `master`
-branch.
-
-Life will be a lot easier for you (and us) if you follow this pattern
-(i.e. fork, named branch, submit PR). If you use your fork's `master`
-branch directly, things can get messy.
-
-Please include a nice description of your changes when you submit your PR;
-if we have to read the whole diff to figure out why you're contributing
-in the first place, you're less likely to get feedback and have your change
-merged in.
-
-In addition to outlining your thought process in the PR's description, please
-also try to document it in your commits. We welcome it if every commit has a
-description of why you have been doing your changes alongside with your
-reasoning why this is a good idea. The messages shall be written in
-present-tense and in an imperative style (e.g. "Add feature foobar", not "Added
-feature foobar" or "Adding feature foobar"). Lines should be wrapped at 80
-characters so people with small screens are able to read the commit messages in
-their terminal without any problem.
-
-To make it easier to attribute commits to certain parts of our code base, we
-also prefer to have the commit subject be prefixed with a "scope". E.g. if you
-are changing code in our merging subsystem, make sure to prefix the subject with
-"merge:". The first word following the colon shall start with an lowercase
-letter. The maximum line length for the subject is 70 characters, preferably
-shorter.
-
-If you are starting to work on a particular area, feel free to submit a PR
-that highlights your work in progress (and note in the PR title that it's
-not ready to merge). These early PRs are welcome and will help in getting
-visibility for your fix, allow others to comment early on the changes and
-also let others know that you are currently working on something.
-
-Before wrapping up a PR, you should be sure to:
-
-* Write tests to cover any functional changes
-* Update documentation for any changed public APIs
-* Add to the [`CHANGELOG.md`](CHANGELOG.md) file describing any major changes
-
-## Unit Tests
-
-We believe that our unit tests allow us to keep the quality of libgit2
-high: any new changes must not cause unit test failures, and new changes
-should include unit tests that cover the bug fixes or new features.
-For bug fixes, we prefer unit tests that illustrate the failure before
-the change, but pass with your changes.
-
-In addition to new tests, please ensure that your changes do not cause
-any other test failures. Running the entire test suite is helpful
-before you submit a pull request. When you build libgit2, the test
-suite will also be built. You can run most of the tests by simply running
-the resultant `libgit2_clar` binary. If you want to run a specific
-unit test, you can name it with the `-s` option. For example:
-
- libgit2_clar -sstatus::worktree::long_filenames
-
-Or you can run an entire class of tests. For example, to run all the
-worktree status tests:
-
- libgit2_clar -sstatus::worktree
-
-The default test run is fairly exhaustive, but it will exclude some
-unit tests by default: in particular, those that talk to network
-servers and the tests that manipulate the filesystem in onerous
-ways (and may need to have special privileges to run). To run the
-network tests:
-
- libgit2_clar -ionline
-
-In addition, various tests may be enabled by environment variables,
-like the ones that write exceptionally large repositories or manipulate
-the filesystem structure in unexpected ways. These tests *may be
-dangerous* to run on a normal machine and may harm your filesystem. It's
-not recommended that you run these; instead, the continuous integration
-servers will run these (in a sandbox).
-
-## Porting Code From Other Open-Source Projects
-
-`libgit2` is licensed under the terms of the GPL v2 with a linking
-exception. Any code brought in must be compatible with those terms.
-
-The most common case is porting code from core Git. Git is a pure GPL
-project, which means that in order to port code to this project, we need the
-explicit permission of the author. Check the
-[`git.git-authors`](https://github.com/libgit2/libgit2/blob/development/git.git-authors)
-file for authors who have already consented.
-
-Other licenses have other requirements; check the license of the library
-you're porting code *from* to see what you need to do. As a general rule,
-MIT and BSD (3-clause) licenses are typically no problem. Apache 2.0
-license typically doesn't work due to GPL incompatibility.
-
-If your pull request uses code from core Git, another project, or code
-from a forum / Stack Overflow, then *please* flag this in your PR and make
-sure you've given proper credit to the original author in the code
-snippet.
-
-## Style Guide
-
-The public API of `libgit2` is [ANSI C](http://en.wikipedia.org/wiki/ANSI_C)
-(a.k.a. C89) compatible. Internally, `libgit2` is written using a portable
-subset of C99 - in order to compile with GCC, Clang, MSVC, etc., we keep
-local variable declarations at the tops of blocks only and avoid `//` style
-comments. Additionally, `libgit2` follows some extra conventions for
-function and type naming, code formatting, and testing.
-
-We like to keep the source code consistent and easy to read. Maintaining
-this takes some discipline, but it's been more than worth it. Take a look
-at the [conventions
-file](https://github.com/libgit2/libgit2/blob/development/CONVENTIONS.md).
-
-## Starter Projects
-
-See our [projects
-list](https://github.com/libgit2/libgit2/blob/development/PROJECTS.md).
+++ /dev/null
-# Libgit2 Conventions
-
-We like to keep the source consistent and readable. Herein are some
-guidelines that should help with that.
-
-## External API
-
-We have a few rules to avoid surprising ways of calling functions and
-some rules for consumers of the library to avoid stepping on each
-other's toes.
-
- - Property accessors return the value directly (e.g. an `int` or
- `const char *`) but if a function can fail, we return a `int` value
- and the output parameters go first in the parameter list, followed
- by the object that a function is operating on, and then any other
- arguments the function may need.
-
- - If a function returns an object as a return value, that function is
- a getter and the object's lifetime is tied to the parent
- object. Objects which are returned as the first argument as a
- pointer-to-pointer are owned by the caller and it is responsible
- for freeing it. Strings are returned via `git_buf` in order to
- allow for re-use and safe freeing.
-
- - Most of what libgit2 does relates to I/O so as a general rule
- you should assume that any function can fail due to errors as even
- getting data from the filesystem can result in all sorts of errors
- and complex failure cases.
-
- - Paths inside the Git system are separated by a slash (0x2F). If a
- function accepts a path on disk, then backslashes (0x5C) are also
- accepted on Windows.
-
- - Do not mix allocators. If something has been allocated by libgit2,
- you do not know which is the right free function in the general
- case. Use the free functions provided for each object type.
-
-## Compatibility
-
-`libgit2` runs on many different platforms with many different compilers.
-
-The public API of `libgit2` is [ANSI C](http://en.wikipedia.org/wiki/ANSI_C)
-(a.k.a. C89) compatible.
-
-Internally, `libgit2` is written using a portable subset of C99 - in order
-to maximize compatibility (e.g. with MSVC) we avoid certain C99
-extensions. Specifically, we keep local variable declarations at the tops
-of blocks only and we avoid `//` style comments.
-
-Also, to the greatest extent possible, we try to avoid lots of `#ifdef`s
-inside the core code base. This is somewhat unavoidable, but since it can
-really hamper maintainability, we keep it to a minimum.
-
-## Match Surrounding Code
-
-If there is one rule to take away from this document, it is *new code should
-match the surrounding code in a way that makes it impossible to distinguish
-the new from the old.* Consistency is more important to us than anyone's
-personal opinion about where braces should be placed or spaces vs. tabs.
-
-If a section of code is being completely rewritten, it is okay to bring it
-in line with the standards that are laid out here, but we will not accept
-submissions that contain a large number of changes that are merely
-reformatting.
-
-## Naming Things
-
-All external types and functions start with `git_` and all `#define` macros
-start with `GIT_`. The `libgit2` API is mostly broken into related
-functional modules each with a corresponding header. All functions in a
-module should be named like `git_modulename_functioname()`
-(e.g. `git_repository_open()`).
-
-Functions with a single output parameter should name that parameter `out`.
-Multiple outputs should be named `foo_out`, `bar_out`, etc.
-
-Parameters of type `git_oid` should be named `id`, or `foo_id`. Calls that
-return an OID should be named `git_foo_id`.
-
-Where a callback function is used, the function should also include a
-user-supplied extra input that is a `void *` named "payload" that will be
-passed through to the callback at each invocation.
-
-## Typedefs
-
-Wherever possible, use `typedef`. In some cases, if a structure is just a
-collection of function pointers, the pointer types don't need to be
-separately typedef'd, but loose function pointer types should be.
-
-## Exports
-
-All exported functions must be declared as:
-
-```c
-GIT_EXTERN(result_type) git_modulename_functionname(arg_list);
-```
-
-## Internals
-
-Functions whose *modulename* is followed by two underscores,
-for example `git_odb__read_packed`, are semi-private functions.
-They are primarily intended for use within the library itself,
-and may disappear or change their signature in a future release.
-
-## Parameters
-
-Out parameters come first.
-
-Whenever possible, pass argument pointers as `const`. Some structures (such
-as `git_repository` and `git_index`) have mutable internal structure that
-prevents this.
-
-Callbacks should always take a `void *` payload as their last parameter.
-Callback pointers are grouped with their payloads, and typically come last
-when passed as arguments:
-
-```c
-int git_foo(git_repository *repo, git_foo_cb callback, void *payload);
-```
-
-## Memory Ownership
-
-Some APIs allocate memory which the caller is responsible for freeing; others
-return a pointer into a buffer that's owned by some other object. Make this
-explicit in the documentation.
-
-## Return codes
-
-Most public APIs should return an `int` error code. As is typical with most
-C library functions, a zero value indicates success and a negative value
-indicates failure.
-
-Some bindings will transform these returned error codes into exception
-types, so returning a semantically appropriate error code is important.
-Check
-[`include/git2/errors.h`](https://github.com/libgit2/libgit2/blob/development/include/git2/errors.h)
-for the return codes already defined.
-
-In your implementation, use `giterr_set()` to provide extended error
-information to callers.
-
-If a `libgit2` function internally invokes another function that reports an
-error, but the error is not propagated up, use `giterr_clear()` to prevent
-callers from getting the wrong error message later on.
-
-
-## Structs
-
-Most public types should be opaque, e.g.:
-
-```C
-typedef struct git_odb git_odb;
-```
-
-...with allocation functions returning an "instance" created within
-the library, and not within the application. This allows the type
-to grow (or shrink) in size without rebuilding client code.
-
-To preserve ABI compatibility, include an `int version` field in all opaque
-structures, and initialize to the latest version in the construction call.
-Increment the "latest" version whenever the structure changes, and try to only
-append to the end of the structure.
-
-## Option Structures
-
-If a function's parameter count is too high, it may be desirable to package
-up the options in a structure. Make them transparent, include a version
-field, and provide an initializer constant or constructor. Using these
-structures should be this easy:
-
-```C
-git_foo_options opts = GIT_FOO_OPTIONS_INIT;
-opts.baz = BAZ_OPTION_ONE;
-git_foo(&opts);
-```
-
-## Enumerations
-
-Typedef all enumerated types. If each option stands alone, use the enum
-type for passing them as parameters; if they are flags to be OR'ed together,
-pass them as `unsigned int` or `uint32_t` or some appropriate type.
-
-## Code Layout
-
-Try to keep lines less than 80 characters long. This is a loose
-requirement, but going significantly over 80 columns is not nice.
-
-Use common sense to wrap most code lines; public function declarations
-can use a couple of different styles:
-
-```c
-/** All on one line is okay if it fits */
-GIT_EXTERN(int) git_foo_simple(git_oid *id);
-
-/** Otherwise one argument per line is a good next step */
-GIT_EXTERN(int) git_foo_id(
- git_oid **out,
- int a,
- int b);
-```
-
-Indent with tabs; set your editor's tab width to 4 for best effect.
-
-Avoid trailing whitespace and only commit Unix-style newlines (i.e. no CRLF
-in the repository - just set `core.autocrlf` to true if you are writing code
-on a Windows machine).
-
-## Documentation
-
-All comments should conform to Doxygen "javadoc" style conventions for
-formatting the public API documentation. Try to document every parameter,
-and keep the comments up to date if you change the parameter list.
-
-## Public Header Template
-
-Use this template when creating a new public header.
-
-```C
-#ifndef INCLUDE_git_${filename}_h__
-#define INCLUDE_git_${filename}_h__
-
-#include "git/common.h"
-
-/**
- * @file git/${filename}.h
- * @brief Git some description
- * @defgroup git_${filename} some description routines
- * @ingroup Git
- * @{
- */
-GIT_BEGIN_DECL
-
-/* ... definitions ... */
-
-/** @} */
-GIT_END_DECL
-#endif
-```
-
-## Inlined functions
-
-All inlined functions must be declared as:
-
-```C
-GIT_INLINE(result_type) git_modulename_functionname(arg_list);
-```
-
-`GIT_INLINE` (or `inline`) should not be used in public headers in order
-to preserve ANSI C compatibility.
-
-## Tests
-
-`libgit2` uses the [clar](https://github.com/vmg/clar) testing framework.
-
-All PRs should have corresponding tests.
-
-* If the PR fixes an existing issue, the test should fail prior to applying
- the PR and succeed after applying it.
-* If the PR is for new functionality, then the tests should exercise that
- new functionality to a certain extent. We don't require 100% coverage
- right now (although we are getting stricter over time).
-
-When adding new tests, we prefer if you attempt to reuse existing test data
-(in `tests-clar/resources/`) if possible. If you are going to add new test
-repositories, please try to strip them of unnecessary files (e.g. sample
-hooks, etc).
+++ /dev/null
-Projects For LibGit2
-====================
-
-So, you want to start helping out with `libgit2`? That's fantastic! We
-welcome contributions and we promise we'll try to be nice.
-
-This is a list of libgit2 related projects that new contributors can take
-on. It includes a number of good starter projects as well as some larger
-ideas that no one is actively working on.
-
-## Before You Start
-
-Please start by reading the [README.md](README.md),
-[CONTRIBUTING.md](CONTRIBUTING.md), and [CONVENTIONS.md](CONVENTIONS.md)
-files before diving into one of these projects. Those explain our work
-flow and coding conventions to help ensure that your work will be easily
-integrated into libgit2.
-
-Next, work through the build instructions and make sure you can clone the
-repository, compile it, and run the tests successfully. That will make
-sure that your development environment is set up correctly and you are
-ready to start on libgit2 development.
-
-## Starter Projects
-
-These are good small projects to get started with libgit2.
-
-* Look at the `examples/` programs, find an existing one that mirrors a
- core Git command and add a missing command-line option. There are many
- gaps right now and this helps demonstrate how to use the library. Here
- are some specific ideas (though there are many more):
- * Fix the `examples/diff.c` implementation of the `-B`
- (a.k.a. `--break-rewrites`) command line option to actually look for
- the optional `[<n>][/<m>]` configuration values. There is an
- existing comment that reads `/* TODO: parse thresholds */`. The
- trick to this one will be doing it in a manner that is clean and
- simple, but still handles the various cases correctly (e.g. `-B/70%`
- is apparently a legal setting).
- * As an extension to the matching idea for `examples/log.c`, add the
- `-i` option to use `strcasestr()` for matches.
- * For `examples/log.c`, implement the `--first-parent` option now that
- libgit2 supports it in the revwalk API.
-* Pick a Git command that is not already emulated in `examples/` and write
- a new example that mirrors the behavior. Examples don't have to be
- perfect emulations, but should demonstrate how to use the libgit2 APIs
- to get results that are similar to Git commands. This lets you (and us)
- easily exercise a particular facet of the API and measure compatibility
- and feature parity with core git.
-* Submit a PR to clarify documentation! While we do try to document all of
- the APIs, your fresh eyes on the documentation will find areas that are
- confusing much more easily.
-
-If none of these appeal to you, take a look at our issues list to see if
-there are any unresolved issues you'd like to jump in on.
-
-## Larger Projects
-
-These are ideas for larger projects mostly taken from our backlog of
-[Issues](https://github.com/libgit2/libgit2/issues). Please don't dive
-into one of these as a first project for libgit2 - we'd rather get to
-know you first by successfully shipping your work on one of the smaller
-projects above.
-
-Some of these projects are broken down into subprojects and/or have
-some incremental steps listed towards the larger goal. Those steps
-might make good smaller projects by themselves.
-
-* Port part of the Git test suite to run against the command line emulation
- in `examples/`
- * Pick a Git command that is emulated in our `examples/` area
- * Extract the Git tests that exercise that command
- * Convert the tests to call our emulation
- * These tests could go in `examples/tests/`...
-* Add hooks API to enumerate and manage hooks (not run them at this point)
- * Enumeration of available hooks
- * Lookup API to see which hooks have a script and get the script
- * Read/write API to load a hook script and write a hook script
- * Eventually, callback API to invoke a hook callback when libgit2
- executes the action in question
-* Isolate logic of ignore evaluation into a standalone API
-* Upgrade internal libxdiff code to latest from core Git
-* Tree builder improvements:
- * Extend to allow building a tree hierarchy
-* Apply-patch API
-* Add a patch editing API to enable "git add -p" type operations
-* Textconv API to filter binary data before generating diffs (something
- like the current Filter API, probably).
-* Performance profiling and improvement
-* Support "git replace" ref replacements
-* Include conflicts in diff results and in status
- * GIT_DELTA_CONFLICT for items in conflict (with multiple files)
- * Appropriate flags for status
-* Support sparse checkout (i.e. "core.sparsecheckout" and ".git/info/sparse-checkout")
libgit2 - the Git linkable library
==================================
-[](https://dev.azure.com/libgit2/libgit2/_build/latest?definitionId=7)
-[](https://scan.coverity.com/projects/639)
+| Build Status | |
+| ------------ | - |
+| **master** branch CI builds | [](https://dev.azure.com/libgit2/libgit2/_build/latest?definitionId=7&branchName=master) |
+| **v0.28 branch** CI builds | [](https://dev.azure.com/libgit2/libgit2/_build/latest?definitionId=7&branchName=maint/v0.28) |
+| **v0.27 branch** CI builds | [](https://dev.azure.com/libgit2/libgit2/_build/latest?definitionId=7&branchName=maint/v0.27) |
+| **v0.26 branch** CI builds | [](https://dev.azure.com/libgit2/libgit2/_build/latest?definitionId=7&branchName=maint/v0.26) |
+| **Nightly** builds | [](https://libgit2.visualstudio.com/libgit2/_build/latest?definitionId=9&branchName=master) [](https://dev.azure.com/libgit2/libgit2/_build/latest?definitionId=21?branchName=master) [](https://scan.coverity.com/projects/639) |
`libgit2` is a portable, pure C implementation of the Git core methods
provided as a linkable library with a solid API, allowing to build Git
Additionally, the example code has been released to the public domain (see the
[separate license](examples/COPYING) for more information).
+Table of Contents
+=================
+
+* [Quick Start](#quick-start)
+* [Getting Help](#getting-help)
+* [What It Can Do](#what-it-can-do)
+* [Optional dependencies](#optional-dependencies)
+* [Initialization](#initialization)
+* [Threading](#threading)
+* [Conventions](#conventions)
+* [Building libgit2 - Using CMake](#building-libgit2---using-cmake)
+ * [Building](#building)
+ * [Installation](#installation)
+ * [Advanced Usage](#advanced-usage)
+ * [Compiler and linker options](#compiler-and-linker-options)
+ * [MacOS X](#macos-x)
+ * [Android](#android)
+* [Language Bindings](#language-bindings)
+* [How Can I Contribute?](#how-can-i-contribute)
+* [License](#license)
+
Quick Start
===========
2. Create the cmake build environment: `cmake ..`
3. Build libgit2: `cmake --build .`
-Trouble with these steps? Read `TROUBLESHOOTING.md`. More detailed build
-guidance is available below.
+Trouble with these steps? Read our (troubleshooting guide)[docs/troubleshooting.md].
+More detailed build guidance is available below.
Getting Help
============
Threading
=========
-See [THREADING](THREADING.md) for information
+See [threading](docs/threading.md) for information
Conventions
===========
-See [CONVENTIONS](CONVENTIONS.md) for an overview of the external
+See [conventions](docs/conventions.md) for an overview of the external
and internal API/coding conventions we use.
Building libgit2 - Using CMake
$ ./libgit2_clar -sindex
To run a single test named `index::racy::diff`, which corresponds to the test
-function (`test_index_racy__diff`)[https://github.com/libgit2/libgit2/blob/master/tests/index/racy.c#L23]:
+function [`test_index_racy__diff`](https://github.com/libgit2/libgit2/blob/master/tests/index/racy.c#L23):
$ ./libgit2_clar -sindex::racy::diff
- `BUILD_SHARED_LIBS`: Build libgit2 as a Shared Library (defaults to ON)
- `BUILD_CLAR`: Build [Clar](https://github.com/vmg/clar)-based test suite (defaults to ON)
- `THREADSAFE`: Build libgit2 with threading support (defaults to ON)
-- `STDCALL`: Build libgit2 as `stdcall`. Turn off for `cdecl` (Windows; defaults to ON)
+
+To list all build options and their current value, you can do the
+following:
+
+ # Create and set up a build directory
+ $ mkdir build
+ $ cmake ..
+ # List all build options and their values
+ $ cmake -L
Compiler and linker options
---------------------------
and
["easy fix"](https://github.com/libgit2/libgit2/issues?utf8=✓&q=is%3Aissue+is%3Aopen+label%3A%22easy+fix%22)
that are good places to jump in and get started. There's much more detailed
-information in our list of [outstanding projects](PROJECTS.md).
+information in our list of [outstanding projects](docs/projects.md).
-Please be sure to check the [contribution guidelines](CONTRIBUTING.md) to
-understand our workflow, and the libgit2 [coding conventions](CONVENTIONS.md).
+Please be sure to check the [contribution guidelines](docs/contributing.md) to
+understand our workflow, and the libgit2 [coding conventions](docs/conventions.md).
License
==================================
+++ /dev/null
-Threads in libgit2
-==================
-
-You may safely use any libgit2 object from any thread, though there
-may be issues depending on the cryptographic libraries libgit2 or its
-dependencies link to (more on this later). For libgit2 itself,
-provided you take the following into consideration you won't run into
-issues:
-
-Sharing objects
----------------
-
-Use an object from a single thread at a time. Most data structures do
-not guard against concurrent access themselves. This is because they
-are rarely used in isolation and it makes more sense to synchronize
-access via a larger lock or similar mechanism.
-
-There are some objects which are read-only/immutable and are thus safe
-to share across threads, such as references and configuration
-snapshots.
-
-Error messages
---------------
-
-The error message is thread-local. The `giterr_last()` call must
-happen on the same thread as the error in order to get the
-message. Often this will be the case regardless, but if you use
-something like the [GCD](http://en.wikipedia.org/wiki/Grand_Central_Dispatch)
-on Mac OS X (where code is executed on an arbitrary thread), the code
-must make sure to retrieve the error code on the thread where the error
-happened.
-
-Threads and cryptographic libraries
-=======================================
-
-On Windows
-----------
-
-When built as a native Windows DLL, libgit2 uses WinCNG and WinHTTP,
-both of which are thread-safe. You do not need to do anything special.
-
-When using libssh2 which itself uses WinCNG, there are no special
-steps necessary. If you are using a MinGW or similar environment where
-libssh2 uses OpenSSL or libgcrypt, then the general case affects
-you.
-
-On Mac OS X
------------
-
-By default we use libcurl to perform the encryption. The
-system-provided libcurl uses SecureTransport, so no special steps are
-necessary. If you link against another libcurl (e.g. from homebrew)
-refer to the general case.
-
-If the option to use libcurl was deactivated, the library makes use of
-CommonCrypto and SecureTransport for cryptographic support. These are
-thread-safe and you do not need to do anything special.
-
-Note that libssh2 may still use OpenSSL itself. In that case, the
-general case still affects you if you use ssh.
-
-General Case
-------------
-
-If it's available, by default we use libcurl to provide HTTP tunneling support,
-which may be linked against a number of cryptographic libraries and has its
-own
-[recommendations for thread safety](https://curl.haxx.se/libcurl/c/threadsafe.html).
-
-If there are no alternative TLS implementations (currently only
-SecureTransport), libgit2 uses OpenSSL in order to use HTTPS as a transport.
-OpenSSL is thread-safe starting at version 1.1.0. If your copy of libgit2 is
-linked against that version, you do not need to take any further steps.
-
-Older versions of OpenSSL are made to be thread-implementation agnostic, and the
-users of the library must set which locking function it should use. libgit2
-cannot know what to set as the user of libgit2 may also be using OpenSSL independently and
-the locking settings must then live outside the lifetime of libgit2.
-
-Even if libgit2 doesn't use OpenSSL directly, OpenSSL can still be used by
-libssh2 or libcurl depending on the configuration. If OpenSSL is used by
-more than one library, you only need to set up threading for OpenSSL once.
-
-If libgit2 is linked against OpenSSL, it provides a last-resort convenience function
-`git_openssl_set_locking()` (available in `sys/openssl.h`) to use the
-platform-native mutex mechanisms to perform the locking, which you can use
-if you do not want to use OpenSSL outside of libgit2, or you
-know that libgit2 will outlive the rest of the operations. It is then not
-safe to use OpenSSL multi-threaded after libgit2's shutdown function
-has been called. Note `git_openssl_set_locking()` only works if
-libgit2 uses OpenSSL directly - if OpenSSL is only used as a dependency
-of libssh2 or libcurl as described above, `git_openssl_set_locking()` is a no-op.
-
-If your programming language offers a package/bindings for OpenSSL,
-you should very strongly prefer to use that in order to set up
-locking, as they provide a level of coordination which is impossible
-when using this function.
-
-See the
-[OpenSSL documentation](https://www.openssl.org/docs/crypto/threads.html)
-on threading for more details, and http://trac.libssh2.org/wiki/MultiThreading
-for a specific example of providing the threading callbacks.
-
-libssh2 may be linked against OpenSSL or libgcrypt. If it uses OpenSSL,
-see the above paragraphs. If it uses libgcrypt, then you need to
-set up its locking before using it multi-threaded. libgit2 has no
-direct connection to libgcrypt and thus has no convenience functions for
-it (but libgcrypt has macros). Read libgcrypt's
-[threading documentation for more information](http://www.gnupg.org/documentation/manuals/gcrypt/Multi_002dThreading.html)
-
-It is your responsibility as an application author or packager to know
-what your dependencies are linked against and to take the appropriate
-steps to ensure the cryptographic libraries are thread-safe. We agree
-that this situation is far from ideal but at this time it is something
-the application authors need to deal with.
+++ /dev/null
-Troubleshooting libgit2 Problems
-================================
-
-CMake Failures
---------------
-
-* **`Asked for OpenSSL TLS backend, but it wasn't found`**
- CMake cannot find your SSL/TLS libraries. By default, libgit2 always
- builds with HTTPS support, and you are encouraged to install the
- OpenSSL libraries for your system (eg, `apt-get install libssl-dev`).
-
- For development, if you simply want to disable HTTPS support entirely,
- pass the `-DUSE_HTTPS=OFF` argument to `cmake` when configuring it.
{
"name": "libgit2",
"github": "libgit2/libgit2",
- "input": "include/git2",
+ "input": "include",
"prefix": "git_",
"output": "docs",
"branch": "gh-pages",
- maint/*
jobs:
-- job: linux_trusty_gcc_openssl
- displayName: 'Linux (Trusty; GCC; OpenSSL)'
+- job: linux_amd64_trusty_gcc_openssl
+ displayName: 'Linux (amd64; Trusty; GCC; OpenSSL)'
pool:
vmImage: 'Ubuntu 16.04'
steps:
- - template: ci/docker.yml
+ - template: azure-pipelines/docker.yml
parameters:
- imageName: 'libgit2/trusty-openssl:latest'
+ imageName: 'libgit2/trusty-amd64:latest'
environmentVariables: |
CC=gcc
+ CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON
LEAK_CHECK=valgrind
-- job: linux_trusty_clang_openssl
- displayName: 'Linux (Trusty; Clang; OpenSSL)'
+- job: linux_amd64_trusty_gcc_mbedtls
+ displayName: 'Linux (amd64; Trusty; GCC; mbedTLS)'
pool:
vmImage: 'Ubuntu 16.04'
steps:
- - template: ci/docker.yml
+ - template: azure-pipelines/docker.yml
parameters:
- imageName: 'libgit2/trusty-openssl:latest'
+ imageName: 'libgit2/trusty-amd64:latest'
+ environmentVariables: |
+ CC=gcc
+ CMAKE_OPTIONS=-DUSE_HTTPS=mbedTLS -DSHA1_BACKEND=mbedTLS -DDEPRECATE_HARD=ON
+ LEAK_CHECK=valgrind
+
+- job: linux_amd64_trusty_clang_openssl
+ displayName: 'Linux (amd64; Trusty; Clang; OpenSSL)'
+ pool:
+ vmImage: 'Ubuntu 16.04'
+ steps:
+ - template: azure-pipelines/docker.yml
+ parameters:
+ imageName: 'libgit2/trusty-amd64:latest'
+ environmentVariables: |
+ CC=clang
+ CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON
+ LEAK_CHECK=valgrind
+
+- job: linux_amd64_trusty_clang_mbedtls
+ displayName: 'Linux (amd64; Trusty; Clang; mbedTLS)'
+ pool:
+ vmImage: 'Ubuntu 16.04'
+ steps:
+ - template: azure-pipelines/docker.yml
+ parameters:
+ imageName: 'libgit2/trusty-amd64:latest'
environmentVariables: |
CC=clang
+ CMAKE_OPTIONS=-DUSE_HTTPS=mbedTLS -DSHA1_BACKEND=mbedTLS -DDEPRECATE_HARD=ON
LEAK_CHECK=valgrind
- job: macos
steps:
- bash: . '$(Build.SourcesDirectory)/ci/setup-osx.sh'
displayName: Setup
- - template: ci/bash.yml
+ - template: azure-pipelines/bash.yml
parameters:
environmentVariables:
TMPDIR: $(Agent.TempDirectory)
PKG_CONFIG_PATH: /usr/local/opt/openssl/lib/pkgconfig
LEAK_CHECK: leaks
+ CMAKE_OPTIONS: -G Ninja -DDEPRECATE_HARD=ON
+ SKIP_SSH_TESTS: true
- job: windows_vs_amd64
- displayName: 'Windows (Visual Studio; amd64)'
+ displayName: 'Windows (amd64; Visual Studio)'
pool: Hosted
steps:
- - template: ci/powershell.yml
+ - template: azure-pipelines/powershell.yml
parameters:
environmentVariables:
- CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013 Win64"
+ CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013 Win64" -DDEPRECATE_HARD=ON
- job: windows_vs_x86
- displayName: 'Windows (Visual Studio; x86)'
+ displayName: 'Windows (x86; Visual Studio)'
pool: Hosted
steps:
- - template: ci/powershell.yml
+ - template: azure-pipelines/powershell.yml
parameters:
environmentVariables:
- CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013"
+ CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013" -DDEPRECATE_HARD=ON
- job: windows_mingw_amd64
- displayName: 'Windows (MinGW; amd64)'
+ displayName: 'Windows (amd64; MinGW)'
pool: Hosted
steps:
- powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1'
env:
TEMP: $(Agent.TempDirectory)
ARCH: amd64
- - template: ci/powershell.yml
+ - template: azure-pipelines/powershell.yml
parameters:
environmentVariables:
- CMAKE_OPTIONS: -G"MinGW Makefiles"
+ CMAKE_OPTIONS: -G"MinGW Makefiles" -DDEPRECATE_HARD=ON
PATH: $(Agent.TempDirectory)\mingw64\bin;C:\ProgramData\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\CMake\bin
- job: windows_mingw_x86
- displayName: 'Windows (MinGW; x86)'
+ displayName: 'Windows (x86; MinGW)'
pool: Hosted
steps:
- powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1'
env:
TEMP: $(Agent.TempDirectory)
ARCH: x86
- - template: ci/powershell.yml
+ - template: azure-pipelines/powershell.yml
parameters:
environmentVariables:
- CMAKE_OPTIONS: -G"MinGW Makefiles"
+ CMAKE_OPTIONS: -G"MinGW Makefiles" -DDEPRECATE_HARD=ON
PATH: $(Agent.TempDirectory)\mingw32\bin;C:\ProgramData\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\CMake\bin
+
+- job: documentation
+ displayName: 'Generate Documentation'
+ pool:
+ vmImage: 'Ubuntu 16.04'
+ steps:
+ - script: |
+ git config user.name 'Documentation Generation'
+ git config user.email 'noreply@libgit2.org'
+ docker run --rm -v /home/vsts/work/1/s:/src -w /src libgit2/docurium:test cm doc api.docurium
+ git checkout gh-pages
+ cp -R * '$(Build.BinariesDirectory)'
+ - task: archivefiles@2
+ displayName: 'Archive Documentation'
+ inputs:
+ rootFolderOrFile: '$(Build.BinariesDirectory)'
+ includeRootFolder: false
+ archiveFile: '$(Build.ArtifactStagingDirectory)/api-documentation.zip'
+ - task: publishbuildartifacts@1
+ displayName: 'Upload Documentation'
+ inputs:
+ pathToPublish: '$(Build.ArtifactStagingDirectory)'
+ artifactName: 'docs'
--- /dev/null
+# These are the steps used for building on machines with bash.
+steps:
+- bash: . '$(Build.SourcesDirectory)/ci/build.sh'
+ displayName: Build
+ workingDirectory: '$(Build.BinariesDirectory)'
+ env: ${{ parameters.environmentVariables }}
+- bash: . '$(Build.SourcesDirectory)/ci/test.sh'
+ displayName: Test
+ workingDirectory: '$(Build.BinariesDirectory)'
+ env: ${{ parameters.environmentVariables }}
+- task: PublishTestResults@2
+ displayName: Publish Test Results
+ condition: succeededOrFailed()
+ inputs:
+ testResultsFiles: 'results_*.xml'
+ searchFolder: '$(Build.BinariesDirectory)'
+ mergeTestResults: true
--- /dev/null
+resources:
+- repo: self
+
+jobs:
+- job: coverity
+ displayName: 'Coverity'
+ pool:
+ vmImage: 'Ubuntu 16.04'
+ steps:
+ - task: Docker@0
+ displayName: Build
+ inputs:
+ action: 'Run an image'
+ imageName: 'libgit2/trusty-openssl:latest'
+ volumes: |
+ $(Build.SourcesDirectory):/src
+ $(Build.BinariesDirectory):/build
+ envVars: |
+ COVERITY_TOKEN=$(COVERITY_TOKEN)
+ workDir: '/build'
+ containerCommand: '/src/ci/coverity-build.sh'
+ detached: false
+ - task: Docker@0
+ displayName: Publish
+ inputs:
+ action: 'Run an image'
+ imageName: 'libgit2/trusty-openssl:latest'
+ volumes: |
+ $(Build.SourcesDirectory):/src
+ $(Build.BinariesDirectory):/build
+ envVars: |
+ COVERITY_TOKEN=$(COVERITY_TOKEN)
+ workDir: '/build'
+ containerCommand: '/src/ci/coverity-publish.sh'
+ detached: false
+ continueOnError: true
--- /dev/null
+# These are the steps used in a container-based build in VSTS.
+steps:
+- ${{ if eq(parameters.qemu, 'true') }}:
+ - script: docker run --rm --privileged multiarch/qemu-user-static:register --reset
+ displayName: 'Register Docker QEMU'
+
+- task: docker@0
+ displayName: Build
+ inputs:
+ action: 'Run an image'
+ imageName: ${{ parameters.imageName }}
+ volumes: |
+ $(Build.SourcesDirectory):/src
+ $(Build.BinariesDirectory):/build
+ envVars: ${{ parameters.environmentVariables }}
+ workDir: '/build'
+ containerCommand: '/src/ci/build.sh'
+ detached: false
+- task: docker@0
+ displayName: Test
+ inputs:
+ action: 'Run an image'
+ imageName: ${{ parameters.imageName }}
+ volumes: |
+ $(Build.SourcesDirectory):/src
+ $(Build.BinariesDirectory):/build
+ envVars: ${{ parameters.environmentVariables }}
+ workDir: '/build'
+ containerCommand: '/src/ci/test.sh'
+ detached: false
+- task: publishtestresults@2
+ displayName: Publish Test Results
+ condition: succeededOrFailed()
+ inputs:
+ testResultsFiles: 'results_*.xml'
+ searchFolder: '$(Build.BinariesDirectory)'
+ mergeTestResults: true
--- /dev/null
+resources:
+- repo: self
+
+jobs:
+- job: linux_amd64_trusty_gcc_openssl
+ displayName: 'Linux (amd64; Trusty; GCC; OpenSSL)'
+ pool:
+ vmImage: 'Ubuntu 16.04'
+ steps:
+ - template: docker.yml
+ parameters:
+ imageName: 'libgit2/trusty-amd64:latest'
+ environmentVariables: |
+ CC=gcc
+ CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON
+ LEAK_CHECK=valgrind
+ RUN_INVASIVE_TESTS=true
+
+- job: linux_amd64_trusty_gcc_mbedtls
+ displayName: 'Linux (amd64; Trusty; GCC; mbedTLS)'
+ pool:
+ vmImage: 'Ubuntu 16.04'
+ steps:
+ - template: docker.yml
+ parameters:
+ imageName: 'libgit2/trusty-amd64:latest'
+ environmentVariables: |
+ CC=gcc
+ CMAKE_OPTIONS=-DUSE_HTTPS=mbedTLS -DSHA1_BACKEND=mbedTLS -DDEPRECATE_HARD=ON
+ LEAK_CHECK=valgrind
+ RUN_INVASIVE_TESTS=true
+
+- job: linux_amd64_trusty_clang_openssl
+ displayName: 'Linux (amd64; Trusty; Clang; OpenSSL)'
+ pool:
+ vmImage: 'Ubuntu 16.04'
+ steps:
+ - template: docker.yml
+ parameters:
+ imageName: 'libgit2/trusty-amd64:latest'
+ environmentVariables: |
+ CC=clang
+ CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON
+ LEAK_CHECK=valgrind
+ RUN_INVASIVE_TESTS=true
+
+- job: linux_amd64_trusty_clang_mbedtls
+ displayName: 'Linux (amd64; Trusty; Clang; mbedTLS)'
+ pool:
+ vmImage: 'Ubuntu 16.04'
+ steps:
+ - template: docker.yml
+ parameters:
+ imageName: 'libgit2/trusty-amd64:latest'
+ environmentVariables: |
+ CC=clang
+ CMAKE_OPTIONS=-DUSE_HTTPS=mbedTLS -DSHA1_BACKEND=mbedTLS -DDEPRECATE_HARD=ON
+ LEAK_CHECK=valgrind
+ RUN_INVASIVE_TESTS=true
+
+- job: macos
+ displayName: 'macOS'
+ pool:
+ vmImage: 'macOS 10.13'
+ steps:
+ - bash: . '$(Build.SourcesDirectory)/ci/setup-osx.sh'
+ displayName: Setup
+ - template: bash.yml
+ parameters:
+ environmentVariables:
+ TMPDIR: $(Agent.TempDirectory)
+ PKG_CONFIG_PATH: /usr/local/opt/openssl/lib/pkgconfig
+ LEAK_CHECK: leaks
+ CMAKE_OPTIONS: -G Ninja -DDEPRECATE_HARD=ON
+ RUN_INVASIVE_TESTS: true
+ SKIP_SSH_TESTS: true
+
+- job: windows_vs_amd64
+ displayName: 'Windows (amd64; Visual Studio)'
+ pool: Hosted
+ steps:
+ - template: powershell.yml
+ parameters:
+ environmentVariables:
+ CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013 Win64" -DDEPRECATE_HARD=ON
+ RUN_INVASIVE_TESTS: true
+
+- job: windows_vs_x86
+ displayName: 'Windows (x86; Visual Studio)'
+ pool: Hosted
+ steps:
+ - template: powershell.yml
+ parameters:
+ environmentVariables:
+ CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013" -DDEPRECATE_HARD=ON
+ RUN_INVASIVE_TESTS: true
+
+- job: windows_mingw_amd64
+ displayName: 'Windows (amd64; MinGW)'
+ pool: Hosted
+ steps:
+ - powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1'
+ displayName: Setup
+ env:
+ TEMP: $(Agent.TempDirectory)
+ ARCH: amd64
+ - template: powershell.yml
+ parameters:
+ environmentVariables:
+ CMAKE_OPTIONS: -G"MinGW Makefiles" -DDEPRECATE_HARD=ON
+ PATH: $(Agent.TempDirectory)\mingw64\bin;C:\ProgramData\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\CMake\bin
+ RUN_INVASIVE_TESTS: true
+
+- job: windows_mingw_x86
+ displayName: 'Windows (x86; MinGW)'
+ pool: Hosted
+ steps:
+ - powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1'
+ displayName: Setup
+ workingDirectory: '$(Build.BinariesDirectory)'
+ env:
+ TEMP: $(Agent.TempDirectory)
+ ARCH: x86
+ - template: powershell.yml
+ parameters:
+ environmentVariables:
+ CMAKE_OPTIONS: -G"MinGW Makefiles" -DDEPRECATE_HARD=ON
+ PATH: $(Agent.TempDirectory)\mingw32\bin;C:\ProgramData\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\CMake\bin
+ RUN_INVASIVE_TESTS: true
+
+- job: linux_x86_bionic_gcc_openssl
+ displayName: 'Linux (x86; Bionic; GCC; OpenSSL)'
+ pool:
+ vmImage: 'Ubuntu 16.04'
+ steps:
+ - template: docker.yml
+ parameters:
+ qemu: 'true'
+ imageName: 'libgit2/bionic-x86:latest'
+ environmentVariables: |
+ CC=gcc
+ CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON
+ LEAK_CHECK=valgrind
+ RUN_INVASIVE_TESTS=true
+
+- job: linux_x86_bionic_clang_openssl
+ displayName: 'Linux (x86; Bionic; Clang; OpenSSL)'
+ pool:
+ vmImage: 'Ubuntu 16.04'
+ steps:
+ - template: docker.yml
+ parameters:
+ qemu: 'true'
+ imageName: 'libgit2/bionic-x86:latest'
+ environmentVariables: |
+ CC=clang
+ CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON
+ LEAK_CHECK=valgrind
+ RUN_INVASIVE_TESTS=true
+
+- job: linux_arm32_bionic_gcc_openssl
+ displayName: 'Linux (arm32; Bionic; GCC; OpenSSL)'
+ pool:
+ vmImage: 'Ubuntu 16.04'
+ steps:
+ - template: docker.yml
+ parameters:
+ qemu: 'true'
+ imageName: 'libgit2/bionic-arm32:latest'
+ environmentVariables: |
+ CC=gcc
+ CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON
+ RUN_INVASIVE_TESTS=true
+ SKIP_PROXY_TESTS=true
+
+- job: linux_arm64_bionic_gcc_openssl
+ displayName: 'Linux (arm64; Bionic; GCC; OpenSSL)'
+ pool:
+ vmImage: 'Ubuntu 16.04'
+ steps:
+ - template: docker.yml
+ parameters:
+ qemu: 'true'
+ imageName: 'libgit2/bionic-arm64:latest'
+ environmentVariables: |
+ CC=gcc
+ CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON
+ RUN_INVASIVE_TESTS=true
+ SKIP_PROXY_TESTS=true
--- /dev/null
+# These are the steps used for building on machines with PowerShell.
+steps:
+- powershell: . '$(Build.SourcesDirectory)\ci\build.ps1'
+ displayName: Build
+ workingDirectory: '$(Build.BinariesDirectory)'
+ env: ${{ parameters.environmentVariables }}
+- powershell: . '$(Build.SourcesDirectory)\ci\test.ps1'
+ displayName: Test
+ workingDirectory: '$(Build.BinariesDirectory)'
+ env: ${{ parameters.environmentVariables }}
+- task: PublishTestResults@2
+ displayName: Publish Test Results
+ condition: succeededOrFailed()
+ inputs:
+ testResultsFiles: 'results_*.xml'
+ searchFolder: '$(Build.BinariesDirectory)'
+ mergeTestResults: true
+++ /dev/null
-# These are the steps used for building on machines with bash.
-steps:
-- bash: . '$(Build.SourcesDirectory)/ci/build.sh'
- displayName: Build
- workingDirectory: '$(Build.BinariesDirectory)'
- env: ${{ parameters.environmentVariables }}
-- bash: . '$(Build.SourcesDirectory)/ci/test.sh'
- displayName: Test
- workingDirectory: '$(Build.BinariesDirectory)'
- env: ${{ parameters.environmentVariables }}
-- task: PublishTestResults@2
- displayName: Publish Test Results
- condition: succeededOrFailed()
- inputs:
- testResultsFiles: 'results_*.xml'
- searchFolder: '$(Build.BinariesDirectory)'
- mergeTestResults: true
echo "Source directory: ${SOURCE_DIR}"
echo "Build directory: ${BUILD_DIR}"
echo ""
-echo "Operating system version:"
+
+if [ "$(uname -s)" = "Darwin" ]; then
+ echo "macOS version:"
+ sw_vers | indent
+fi
+
+if [ -f "/etc/debian_version" ]; then
+ echo "Debian version:"
+ lsb_release -a | indent
+fi
+
+echo "Kernel version:"
uname -a 2>&1 | indent
+
echo "CMake version:"
cmake --version 2>&1 | indent
echo "Compiler version:"
echo "## Configuring build environment"
echo "##############################################################################"
-echo cmake ${SOURCE_DIR} -DENABLE_WERROR=ON -DBUILD_EXAMPLES=ON ${CMAKE_OPTIONS}
-cmake ${SOURCE_DIR} -DENABLE_WERROR=ON -DBUILD_EXAMPLES=ON ${CMAKE_OPTIONS}
+echo cmake ${SOURCE_DIR} -DENABLE_WERROR=ON -DBUILD_EXAMPLES=ON -DBUILD_FUZZERS=ON -DUSE_STANDALONE_FUZZERS=ON ${CMAKE_OPTIONS}
+cmake ${SOURCE_DIR} -DENABLE_WERROR=ON -DBUILD_EXAMPLES=ON -DBUILD_FUZZERS=ON -DUSE_STANDALONE_FUZZERS=ON ${CMAKE_OPTIONS}
echo ""
echo "##############################################################################"
--- /dev/null
+#!/bin/bash
+
+set -e
+
+# Environment check
+[ -z "$COVERITY_TOKEN" ] && echo "Need to set a coverity token" && exit 1
+
+SOURCE_DIR=${SOURCE_DIR:-$( cd "$( dirname "${BASH_SOURCE[0]}" )" && dirname $( pwd ) )}
+BUILD_DIR=$(pwd)
+
+case $(uname -m) in
+ i?86) BITS=32 ;;
+ amd64|x86_64) BITS=64 ;;
+esac
+SCAN_TOOL=https://scan.coverity.com/download/cxx/linux${BITS}
+TOOL_BASE=$(pwd)/_coverity-scan
+
+# Install coverity tools
+if [ ! -d "$TOOL_BASE" ]; then
+ echo "Downloading coverity..."
+ mkdir -p "$TOOL_BASE"
+ pushd "$TOOL_BASE"
+ wget -O coverity_tool.tgz $SCAN_TOOL \
+ --post-data "project=libgit2&token=$COVERITY_TOKEN"
+ tar xzf coverity_tool.tgz
+ popd
+ TOOL_DIR=$(find "$TOOL_BASE" -type d -name 'cov-analysis*')
+ ln -s "$TOOL_DIR" "$TOOL_BASE"/cov-analysis
+fi
+
+cp "${SOURCE_DIR}/script/user_nodefs.h" "$TOOL_BASE"/cov-analysis/config/user_nodefs.h
+
+COV_BUILD="$TOOL_BASE/cov-analysis/bin/cov-build"
+
+# Configure and build
+cmake ${SOURCE_DIR}
+
+COVERITY_UNSUPPORTED=1 \
+ $COV_BUILD --dir cov-int \
+ cmake --build .
+
--- /dev/null
+#!/bin/bash
+
+set -e
+
+# Results check
+[ ! -d "cov-int" ] && echo "Coverity directory not found" && exit 1
+
+# Upload results
+tar czf libgit2.tgz cov-int
+
+SOURCE_DIR=${SOURCE_DIR:-$( cd "$( dirname "${BASH_SOURCE[0]}" )" && dirname $( pwd ) )}
+SHA=$(cd ${SOURCE_DIR} && git rev-parse --short HEAD)
+
+HTML="$(curl \
+ --silent \
+ --write-out "\n%{http_code}" \
+ --form token="$COVERITY_TOKEN" \
+ --form email=libgit2@gmail.com \
+ --form file=@libgit2.tgz \
+ --form version="$SHA" \
+ --form description="libgit2 build" \
+ https://scan.coverity.com/builds?project=libgit2)"
+
+# Body is everything up to the last line
+BODY="$(echo "$HTML" | head -n-1)"
+
+# Status code is the last line
+STATUS_CODE="$(echo "$HTML" | tail -n1)"
+
+if [ "${STATUS_CODE}" != "200" -a "${STATUS_CODE}" != "201" ]; then
+ echo "Received error code ${STATUS_CODE} from Coverity"
+ exit 1
+fi
+++ /dev/null
-#!/bin/bash
-
-set -e
-
-# Environment check
-[ -z "$COVERITY_TOKEN" ] && echo "Need to set a coverity token" && exit 1
-
-SOURCE_DIR=${SOURCE_DIR:-$( cd "$( dirname "${BASH_SOURCE[0]}" )" && dirname $( pwd ) )}
-BUILD_DIR=$(pwd)
-
-case $(uname -m) in
- i?86) BITS=32 ;;
- amd64|x86_64) BITS=64 ;;
-esac
-SCAN_TOOL=https://scan.coverity.com/download/cxx/linux${BITS}
-TOOL_BASE=$(pwd)/_coverity-scan
-
-# Install coverity tools
-if [ ! -d "$TOOL_BASE" ]; then
- echo "Downloading coverity..."
- mkdir -p "$TOOL_BASE"
- pushd "$TOOL_BASE"
- wget -O coverity_tool.tgz $SCAN_TOOL \
- --post-data "project=libgit2&token=$COVERITY_TOKEN"
- tar xzf coverity_tool.tgz
- popd
- TOOL_DIR=$(find "$TOOL_BASE" -type d -name 'cov-analysis*')
- ln -s "$TOOL_DIR" "$TOOL_BASE"/cov-analysis
-fi
-
-cp "${SOURCE_DIR}/script/user_nodefs.h" "$TOOL_BASE"/cov-analysis/config/user_nodefs.h
-
-COV_BUILD="$TOOL_BASE/cov-analysis/bin/cov-build"
-
-# Configure and build
-cmake ${SOURCE_DIR}
-
-COVERITY_UNSUPPORTED=1 \
- $COV_BUILD --dir cov-int \
- cmake --build .
-
-# Upload results
-tar czf libgit2.tgz cov-int
-SHA=$(cd ${SOURCE_DIR} && git rev-parse --short HEAD)
-
-HTML="$(curl \
- --silent \
- --write-out "\n%{http_code}" \
- --form token="$COVERITY_TOKEN" \
- --form email=libgit2@gmail.com \
- --form file=@libgit2.tgz \
- --form version="$SHA" \
- --form description="libgit2 build" \
- https://scan.coverity.com/builds?project=libgit2)"
-# Body is everything up to the last line
-BODY="$(echo "$HTML" | head -n-1)"
-# Status code is the last line
-STATUS_CODE="$(echo "$HTML" | tail -n1)"
-
-echo "${BODY}"
-
-if [ "${STATUS_CODE}" != "200" -a "${STATUS_CODE}" != "201" ]; then
- echo "Received error code ${STATUS_CODE} from Coverity"
- exit 1
-fi
+++ /dev/null
-# These are the steps used in a container-based build in VSTS.
-steps:
-- task: docker@0
- displayName: Build
- inputs:
- action: 'Run an image'
- imageName: ${{ parameters.imageName }}
- volumes: |
- $(Build.SourcesDirectory):/src
- $(Build.BinariesDirectory):/build
- envVars: ${{ parameters.environmentVariables }}
- workDir: '/build'
- containerCommand: '/src/ci/build.sh'
- detached: false
-- task: docker@0
- displayName: Test
- inputs:
- action: 'Run an image'
- imageName: ${{ parameters.imageName }}
- volumes: |
- $(Build.SourcesDirectory):/src
- $(Build.BinariesDirectory):/build
- envVars: ${{ parameters.environmentVariables }}
- workDir: '/build'
- containerCommand: '/src/ci/test.sh'
- detached: false
-- task: publishtestresults@2
- displayName: Publish Test Results
- condition: succeededOrFailed()
- inputs:
- testResultsFiles: 'results_*.xml'
- searchFolder: '$(Build.BinariesDirectory)'
- mergeTestResults: true
+++ /dev/null
-resources:
-- repo: self
-
-jobs:
-- job: coverity
- displayName: 'Coverity'
- pool:
- vmImage: 'Ubuntu 16.04'
- steps:
- - task: Docker@0
- displayName: Build
- inputs:
- action: 'Run an image'
- imageName: 'libgit2/trusty-openssl:latest'
- volumes: |
- $(Build.SourcesDirectory):/src
- $(Build.BinariesDirectory):/build
- envVars: |
- COVERITY_TOKEN=$(COVERITY_TOKEN)
- workDir: '/build'
- containerCommand: '/src/ci/coverity.sh'
- detached: false
+++ /dev/null
-# These are the steps used for building on machines with PowerShell.
-steps:
-- powershell: . '$(Build.SourcesDirectory)\ci\build.ps1'
- displayName: Build
- workingDirectory: '$(Build.BinariesDirectory)'
- env: ${{ parameters.environmentVariables }}
-- powershell: . '$(Build.SourcesDirectory)\ci\test.ps1'
- displayName: Test
- workingDirectory: '$(Build.BinariesDirectory)'
- env: ${{ parameters.environmentVariables }}
-- task: PublishTestResults@2
- displayName: Publish Test Results
- condition: succeededOrFailed()
- inputs:
- testResultsFiles: 'results_*.xml'
- searchFolder: '$(Build.BinariesDirectory)'
- mergeTestResults: true
fi
mkdir -p /var/run/sshd
+
+if [ "$MBEDTLS" ]; then
+ MBEDTLS_DIR=${MBEDTLS_DIR:-$(mktemp -d ${TMPDIR}/mbedtls.XXXXXXXX)}
+
+ git clone --depth 10 --single-branch --branch mbedtls-2.6.1 https://github.com/ARMmbed/mbedtls.git ${MBEDTLS_DIR}
+ cd ${MBEDTLS_DIR}
+
+ CFLAGS=-fPIC cmake -DENABLE_PROGRAMS=OFF -DENABLE_TESTING=OFF -DUSE_SHARED_MBEDTLS_LIBRARY=OFF -DUSE_STATIC_MBEDTLS_LIBRARY=ON .
+ cmake --build .
+
+ if [ -z "$SKIP_MBEDTLS_INSTALL" ]; then
+ make install
+ fi
+fi
set -x
brew update
-brew install pkgconfig zlib curl openssl libssh2
+brew install pkgconfig zlib curl openssl libssh2 ninja
ln -s /Applications/Xcode.app/Contents/Developer/usr/lib/libLeaksAtExit.dylib /usr/local/lib
function run_test {
$TestName = $args[0]
+ $TestCommand = (ctest -N -V -R "^$TestName$") -join "`n"
+
+ if (-Not ($TestCommand -match "(?ms).*\n^[0-9]*: Test command: ")) {
+ echo "Could not find tests: $TestName"
+ exit
+ }
+
$TestCommand = (ctest -N -V -R "^$TestName$") -join "`n" -replace "(?ms).*\n^[0-9]*: Test command: ","" -replace "\n.*",""
$TestCommand += " -r${BuildDir}\results_${TestName}.xml"
- Write-Host $TestCommand
Invoke-Expression $TestCommand
-
if ($LastExitCode -ne 0) { $global:Success = $false }
}
if (-not $Env:SKIP_PROXY_TESTS) {
Write-Host ""
Write-Host "Starting HTTP proxy..."
- Invoke-WebRequest -Method GET -Uri https://github.com/ethomson/poxyproxy/releases/download/v0.1.0/poxyproxy-0.1.0.jar -OutFile poxyproxy.jar
- javaw -jar poxyproxy.jar -d --port 8080 --credentials foo:bar
+ Invoke-WebRequest -Method GET -Uri https://github.com/ethomson/poxyproxy/releases/download/v0.4.0/poxyproxy-0.4.0.jar -OutFile poxyproxy.jar
+ javaw -jar poxyproxy.jar -d --port 8080 --credentials foo:bar --quiet
}
Write-Host ""
run_test offline
+if ($Env:RUN_INVASIVE_TESTS) {
+ Write-Host ""
+ Write-Host "##############################################################################"
+ Write-Host "## Running (invasive) tests"
+ Write-Host "##############################################################################"
+
+ $Env:GITTEST_INVASIVE_FS_SIZE=1
+ $Env:GITTEST_INVASIVE_MEMORY=1
+ $Env:GITTEST_INVASIVE_SPEED=1
+ run_test invasive
+ $Env:GITTEST_INVASIVE_FS_SIZE=$null
+ $Env:GITTEST_INVASIVE_MEMORY=$null
+ $Env:GITTEST_INVASIVE_SPEED=$null
+}
+
if (-not $Env:SKIP_ONLINE_TESTS) {
Write-Host ""
Write-Host "##############################################################################"
Write-Host "Running proxy tests"
Write-Host ""
- $Env:GITTEST_REMOTE_PROXY_URL="localhost:8080"
+ $Env:GITTEST_REMOTE_PROXY_HOST="localhost:8080"
$Env:GITTEST_REMOTE_PROXY_USER="foo"
$Env:GITTEST_REMOTE_PROXY_PASS="bar"
run_test proxy
+ $Env:GITTEST_REMOTE_PROXY_HOST=$null
+ $Env:GITTEST_REMOTE_PROXY_USER=$null
+ $Env:GITTEST_REMOTE_PROXY_PASS=$null
+
taskkill /F /IM javaw.exe
}
SUCCESS=1
VALGRIND="valgrind --leak-check=full --show-reachable=yes --error-exitcode=125 --num-callers=50 --suppressions=\"$SOURCE_DIR/libgit2_clar.supp\""
-LEAKS="MallocStackLogging=1 MallocScribble=1 leaks -quiet -atExit -- nohup"
+LEAKS="MallocStackLogging=1 MallocScribble=1 MallocLogFile=/dev/null CLAR_AT_EXIT=\"leaks -quiet \$PPID\""
cleanup() {
echo "Cleaning up..."
# JUnit-style XML files.
run_test() {
TEST_CMD=$(ctest -N -V -R "^${1}$" | sed -n 's/^[0-9]*: Test command: //p')
+
+ if [ -z "$TEST_CMD" ]; then
+ echo "Could not find tests: $1"
+ exit 1
+ fi
+
TEST_CMD="${TEST_CMD} -r${BUILD_DIR}/results_${1}.xml"
if [ "$LEAK_CHECK" = "valgrind" ]; then
if [ -z "$SKIP_PROXY_TESTS" ]; then
echo "Starting HTTP proxy..."
- curl -L https://github.com/ethomson/poxyproxy/releases/download/v0.1.0/poxyproxy-0.1.0.jar >poxyproxy.jar
- java -jar poxyproxy.jar -d --port 8080 --credentials foo:bar >/dev/null 2>&1 &
+ curl -L https://github.com/ethomson/poxyproxy/releases/download/v0.4.0/poxyproxy-0.4.0.jar >poxyproxy.jar
+ java -jar poxyproxy.jar -d --address 127.0.0.1 --port 8080 --credentials foo:bar --quiet &
fi
if [ -z "$SKIP_SSH_TESTS" ]; then
run_test offline
fi
+if [ -n "$RUN_INVASIVE_TESTS" ]; then
+ echo ""
+ echo "Running invasive tests"
+ echo ""
+
+ export GITTEST_INVASIVE_FS_SIZE=1
+ export GITTEST_INVASIVE_MEMORY=1
+ export GITTEST_INVASIVE_SPEED=1
+ run_test invasive
+ unset GITTEST_INVASIVE_FS_SIZE
+ unset GITTEST_INVASIVE_MEMORY
+ unset GITTEST_INVASIVE_SPEED
+fi
+
if [ -z "$SKIP_ONLINE_TESTS" ]; then
# Run the various online tests. The "online" test suite only includes the
# default online tests that do not require additional configuration. The
echo "Running proxy tests"
echo ""
- export GITTEST_REMOTE_PROXY_URL="localhost:8080"
+ export GITTEST_REMOTE_PROXY_HOST="localhost:8080"
export GITTEST_REMOTE_PROXY_USER="foo"
export GITTEST_REMOTE_PROXY_PASS="bar"
run_test proxy
- unset GITTEST_REMOTE_PROXY_URL
+ unset GITTEST_REMOTE_PROXY_HOST
unset GITTEST_REMOTE_PROXY_USER
unset GITTEST_REMOTE_PROXY_PASS
fi
unset GITTEST_REMOTE_SSH_FINGERPRINT
fi
+if [ -z "$SKIP_FUZZERS" ]; then
+ echo ""
+ echo "##############################################################################"
+ echo "## Running fuzzers"
+ echo "##############################################################################"
+
+ for fuzzer in fuzzers/*_fuzzer; do
+ "${fuzzer}" "${SOURCE_DIR}/fuzzers/corpora/$(basename "${fuzzer%_fuzzer}")" || failure
+ done
+fi
+
cleanup
if [ "$SUCCESS" -ne "1" ]; then
INCLUDE(CheckCCompilerFlag)
+MACRO(ADD_C_FLAG _FLAG)
+ STRING(TOUPPER ${_FLAG} UPCASE)
+ STRING(REGEX REPLACE "[-=]" "_" UPCASE_PRETTY ${UPCASE})
+ STRING(REGEX REPLACE "^_+" "" UPCASE_PRETTY ${UPCASE_PRETTY})
+ CHECK_C_COMPILER_FLAG(${_FLAG} IS_${UPCASE_PRETTY}_SUPPORTED)
+
+ IF(IS_${UPCASE_PRETTY}_SUPPORTED)
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_FLAG}")
+ ELSE()
+ MESSAGE(FATAL_ERROR "Required flag ${_FLAG} is not supported")
+ ENDIF()
+ENDMACRO()
+
MACRO(ADD_C_FLAG_IF_SUPPORTED _FLAG)
STRING(TOUPPER ${_FLAG} UPCASE)
- STRING(REGEX REPLACE "^-" "" UPCASE_PRETTY ${UPCASE})
+ STRING(REGEX REPLACE "[-=]" "_" UPCASE_PRETTY ${UPCASE})
+ STRING(REGEX REPLACE "^_+" "" UPCASE_PRETTY ${UPCASE_PRETTY})
CHECK_C_COMPILER_FLAG(${_FLAG} IS_${UPCASE_PRETTY}_SUPPORTED)
IF(IS_${UPCASE_PRETTY}_SUPPORTED)
MACRO(ENABLE_WARNINGS flag)
- IF(ENABLE_WERROR)
- ADD_C_FLAG_IF_SUPPORTED(-Werror=${flag})
- ELSE()
- ADD_C_FLAG_IF_SUPPORTED(-W${flag})
- ENDIF()
+ ADD_C_FLAG_IF_SUPPORTED(-W${flag})
ENDMACRO()
MACRO(DISABLE_WARNINGS flag)
ADD_C_FLAG_IF_SUPPORTED(-Wno-${flag})
- IF(ENABLE_WERROR)
- ADD_C_FLAG_IF_SUPPORTED(-Wno-error=${flag})
- ENDIF()
ENDMACRO()
+
+IF(ENABLE_WERROR)
+ ADD_C_FLAG_IF_SUPPORTED(-Werror)
+ENDIF()
--- /dev/null
+# - Try to find mbedTLS
+# Once done this will define
+#
+# Read-Only variables
+# MBEDTLS_FOUND - system has mbedTLS
+# MBEDTLS_INCLUDE_DIR - the mbedTLS include directory
+# MBEDTLS_LIBRARY_DIR - the mbedTLS library directory
+# MBEDTLS_LIBRARIES - Link these to use mbedTLS
+# MBEDTLS_LIBRARY - path to mbedTLS library
+# MBEDX509_LIBRARY - path to mbedTLS X.509 library
+# MBEDCRYPTO_LIBRARY - path to mbedTLS Crypto library
+#
+# Hint
+# MBEDTLS_ROOT_DIR can be pointed to a local mbedTLS installation.
+
+SET(_MBEDTLS_ROOT_HINTS
+ ${MBEDTLS_ROOT_DIR}
+ ENV MBEDTLS_ROOT_DIR
+)
+
+SET(_MBEDTLS_ROOT_HINTS_AND_PATHS
+ HINTS ${_MBEDTLS_ROOT_HINTS}
+ PATHS ${_MBEDTLS_ROOT_PATHS}
+)
+
+FIND_PATH(MBEDTLS_INCLUDE_DIR
+ NAMES mbedtls/version.h
+ ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
+ PATH_SUFFIXES include
+)
+
+IF(MBEDTLS_INCLUDE_DIR AND MBEDTLS_LIBRARIES)
+ # Already in cache, be silent
+ SET(MBEDTLS_FIND_QUIETLY TRUE)
+ENDIF()
+
+FIND_LIBRARY(MBEDTLS_LIBRARY
+ NAMES mbedtls libmbedtls
+ ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
+ PATH_SUFFIXES library
+)
+FIND_LIBRARY(MBEDX509_LIBRARY
+ NAMES mbedx509 libmbedx509
+ ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
+ PATH_SUFFIXES library
+)
+FIND_LIBRARY(MBEDCRYPTO_LIBRARY
+ NAMES mbedcrypto libmbedcrypto
+ ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
+ PATH_SUFFIXES library
+)
+
+IF(MBEDTLS_INCLUDE_DIR AND MBEDTLS_LIBRARY AND MBEDX509_LIBRARY AND MBEDCRYPTO_LIBRARY)
+ SET(MBEDTLS_FOUND TRUE)
+ENDIF()
+
+IF(MBEDTLS_FOUND)
+ # split mbedTLS into -L and -l linker options, so we can set them for pkg-config
+ GET_FILENAME_COMPONENT(MBEDTLS_LIBRARY_DIR ${MBEDTLS_LIBRARY} PATH)
+ GET_FILENAME_COMPONENT(MBEDTLS_LIBRARY_FILE ${MBEDTLS_LIBRARY} NAME_WE)
+ GET_FILENAME_COMPONENT(MBEDX509_LIBRARY_FILE ${MBEDX509_LIBRARY} NAME_WE)
+ GET_FILENAME_COMPONENT(MBEDCRYPTO_LIBRARY_FILE ${MBEDCRYPTO_LIBRARY} NAME_WE)
+ STRING(REGEX REPLACE "^lib" "" MBEDTLS_LIBRARY_FILE ${MBEDTLS_LIBRARY_FILE})
+ STRING(REGEX REPLACE "^lib" "" MBEDX509_LIBRARY_FILE ${MBEDX509_LIBRARY_FILE})
+ STRING(REGEX REPLACE "^lib" "" MBEDCRYPTO_LIBRARY_FILE ${MBEDCRYPTO_LIBRARY_FILE})
+ SET(MBEDTLS_LIBRARIES "-L${MBEDTLS_LIBRARY_DIR} -l${MBEDTLS_LIBRARY_FILE} -l${MBEDX509_LIBRARY_FILE} -l${MBEDCRYPTO_LIBRARY_FILE}")
+
+ IF(NOT MBEDTLS_FIND_QUIETLY)
+ MESSAGE(STATUS "Found mbedTLS:")
+ FILE(READ ${MBEDTLS_INCLUDE_DIR}/mbedtls/version.h MBEDTLSCONTENT)
+ STRING(REGEX MATCH "MBEDTLS_VERSION_STRING +\"[0-9|.]+\"" MBEDTLSMATCH ${MBEDTLSCONTENT})
+ IF (MBEDTLSMATCH)
+ STRING(REGEX REPLACE "MBEDTLS_VERSION_STRING +\"([0-9|.]+)\"" "\\1" MBEDTLS_VERSION ${MBEDTLSMATCH})
+ MESSAGE(STATUS " version ${MBEDTLS_VERSION}")
+ ENDIF(MBEDTLSMATCH)
+ MESSAGE(STATUS " TLS: ${MBEDTLS_LIBRARY}")
+ MESSAGE(STATUS " X509: ${MBEDX509_LIBRARY}")
+ MESSAGE(STATUS " Crypto: ${MBEDCRYPTO_LIBRARY}")
+ ENDIF(NOT MBEDTLS_FIND_QUIETLY)
+ELSE(MBEDTLS_FOUND)
+ IF(MBEDTLS_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR "Could not find mbedTLS")
+ ENDIF(MBEDTLS_FIND_REQUIRED)
+ENDIF(MBEDTLS_FOUND)
+
+MARK_AS_ADVANCED(
+ MBEDTLS_INCLUDE_DIR
+ MBEDTLS_LIBRARY_DIR
+ MBEDTLS_LIBRARIES
+ MBEDTLS_LIBRARY
+ MBEDX509_LIBRARY
+ MBEDCRYPTO_LIBRARY
+)
--- /dev/null
+v0.28.1
+-------
+
+This is a bugfix release with the following change:
+
+* The deprecated functions (`git_buf_free` and the `giterr_` family of
+ functions) are now exported properly. In the v0.28 release, they were
+ not given the correct external attributes and they did not have the
+ correct linkage visibility in the v0.28 library.
+
+v0.28
+-----
+
+### Changes or improvements
+
+* The library is now always built with cdecl calling conventions on
+ Windows; the ability to build a stdcall library has been removed.
+
+* Reference log creation now honors `core.logallrefupdates=always`.
+
+* Fix some issues with the error-reporting in the OpenSSL backend.
+
+* HTTP proxy support is now builtin; libcurl is no longer used to support
+ proxies and is removed as a dependency.
+
+* Certificate and credential callbacks can now return `GIT_PASSTHROUGH`
+ to decline to act; libgit2 will behave as if there was no callback set
+ in the first place.
+
+* The line-ending filtering logic - when checking out files - has been
+ updated to match newer git (>= git 2.9) for proper interoperability.
+
+* Symbolic links are now supported on Windows when `core.symlinks` is set
+ to `true`.
+
+* Submodules with names which attempt to perform path traversal now have their
+ configuration ignored. Such names were blindly appended to the
+ `$GIT_DIR/modules` and a malicious name could lead to an attacker writing to
+ an arbitrary location. This matches git's handling of CVE-2018-11235.
+
+* Object validation is now performed during tree creation in the
+ `git_index_write_tree_to` API.
+
+* Configuration variable may now be specified on the same line as a section
+ header; previously this was erroneously a parser error.
+
+* When an HTTP server supports both NTLM and Negotiate authentication
+ mechanisms, we would previously fail to authenticate with any mechanism.
+
+* The `GIT_OPT_SET_PACK_MAX_OBJECTS` option can now set the maximum
+ number of objects allowed in a packfile being downloaded; this can help
+ limit the maximum memory used when fetching from an untrusted remote.
+
+* Line numbers in diffs loaded from patch files were not being populated;
+ they are now included in the results.
+
+* The repository's index is reloaded from disk at the beginning of
+ `git_merge` operations to ensure that it is up-to-date.
+
+* Mailmap handling APIs have been introduced, and the new commit APIs
+ `git_commit_committer_with_mailmap` and `git_commit_author_with_mailmap`
+ will use the mailmap to resolve the committer and author information.
+ In addition, blame will use the mailmap given when the
+ `GIT_BLAME_USE_MAILMAP` option.
+
+* Ignore handling for files in ignored folders would be ignored.
+
+* Worktrees can now be backed by bare repositories.
+
+* Trailing spaces are supported in `.gitignore` files, these spaces were
+ previously (and erroneously) treated as part of the pattern.
+
+* The library can now be built with mbedTLS support for HTTPS.
+
+* The diff status character 'T' will now be presented by the
+ `git_diff_status_char` API for diff entries that change type.
+
+* Revision walks previously would sometimes include commits that should
+ have been ignored; this is corrected.
+
+* Revision walks are now more efficient when the output is unsorted;
+ we now avoid walking all the way to the beginning of history unnecessarily.
+
+* Error-handling around index extension loading has been fixed. We were
+ previously always misreporting a truncated index (#4858).
+
+### API additions
+
+* The index may now be iterated atomically using `git_index_iterator`.
+
+* Remote objects can now be created with extended options using the
+ `git_remote_create_with_opts` API.
+
+* Diff objects can now be applied as changes to the working directory,
+ index or both, emulating the `git apply` command. Additionally,
+ `git_apply_to_tree` can apply those changes to a tree object as a
+ fully in-memory operation.
+
+* You can now swap out memory allocators via the
+ `GIT_OPT_SET_ALLOCATOR` option with `git_libgit2_opts()`.
+
+* You can now ensure that functions do not discard unwritten changes to the
+ index via the `GIT_OPT_ENABLE_UNSAVED_INDEX_SAFETY` option to
+ `git_libgit2_opts()`. This will cause functions that implicitly re-read
+ the index (eg, `git_checkout`) to fail if you have staged changes to the
+ index but you have not written the index to disk. (Unless the checkout
+ has the FORCE flag specified.)
+
+ At present, this defaults to off, but we intend to enable this more
+ broadly in the future, as a warning or error. We encourage you to
+ examine your code to ensure that you are not relying on the current
+ behavior that implicitly removes staged changes.
+
+* Reference specifications can be parsed from an arbitrary string with
+ the `git_refspec_parse` API.
+
+* You can now get the name and path of worktrees using the
+ `git_worktree_name` and `git_worktree_path` APIs, respectively.
+
+* The `ref` field has been added to `git_worktree_add_options` to enable
+ the creation of a worktree from a pre-existing branch.
+
+* It's now possible to analyze merge relationships between any two
+ references, not just against `HEAD`, using `git_merge_analysis_for_ref`.
+
+### API removals
+
+* The `git_buf_free` API is deprecated; it has been renamed to
+ `git_buf_dispose` for consistency. The `git_buf_free` API will be
+ retained for backward compatibility for the foreseeable future.
+
+* The `git_otype` enumeration and its members are deprecated and have
+ been renamed for consistency. The `GIT_OBJ_` enumeration values are
+ now prefixed with `GIT_OBJECT_`. The old enumerations and macros
+ will be retained for backward compatibility for the foreseeable future.
+
+* Several index-related APIs have been renamed for consistency. The
+ `GIT_IDXENTRY_` enumeration values and macros have been renamed to
+ be prefixed with `GIT_INDEX_ENTRY_`. The `GIT_INDEXCAP` enumeration
+ values are now prefixed with `GIT_INDEX_CAPABILITY_`. The old
+ enumerations and macros will be retained for backward compatibility
+ for the foreseeable future.
+
+* The error functions and enumeration values have been renamed for
+ consistency. The `giterr_` functions and values prefix have been
+ renamed to be prefixed with `git_error_`; similarly, the `GITERR_`
+ constants have been renamed to be prefixed with `GIT_ERROR_`.
+ The old enumerations and macros will be retained for backward
+ compatibility for the foreseeable future.
+
+### Breaking API changes
+
+* The default checkout strategy changed from `DRY_RUN` to `SAFE` (#4531).
+
+* Adding a symlink as .gitmodules into the index from the workdir or checking
+ out such files is not allowed as this can make a Git implementation write
+ outside of the repository and bypass the fsck checks for CVE-2018-11235.
+
+v0.27
+---------
+
+### Changes or improvements
+
+* Improved `p_unlink` in `posix_w32.c` to try and make a file writable
+ before sleeping in the retry loop to prevent unnecessary calls to sleep.
+
+* The CMake build infrastructure has been improved to speed up building time.
+
+* A new CMake option "-DUSE_HTTPS=<backend>" makes it possible to explicitly
+ choose an HTTP backend.
+
+* A new CMake option "-DSHA1_BACKEND=<backend>" makes it possible to explicitly
+ choose an SHA1 backend. The collision-detecting backend is now the default.
+
+* A new CMake option "-DUSE_BUNDLED_ZLIB" makes it possible to explicitly use
+ the bundled zlib library.
+
+* A new CMake option "-DENABLE_REPRODUCIBLE_BUILDS" makes it possible to
+ generate a reproducible static archive. This requires support from your
+ toolchain.
+
+* The minimum required CMake version has been bumped to 2.8.11.
+
+* Writing to a configuration file now preserves the case of the key given by the
+ caller for the case-insensitive portions of the key (existing sections are
+ used even if they don't match).
+
+* We now support conditional includes in configuration files.
+
+* Fix for handling re-reading of configuration files with includes.
+
+* Fix for reading patches which contain exact renames only.
+
+* Fix for reading patches with whitespace in the compared files' paths.
+
+* We will now fill `FETCH_HEAD` from all passed refspecs instead of overwriting
+ with the last one.
+
+* There is a new diff option, `GIT_DIFF_INDENT_HEURISTIC` which activates a
+ heuristic which takes into account whitespace and indentation in order to
+ produce better diffs when dealing with ambiguous diff hunks.
+
+* Fix for pattern-based ignore rules where files ignored by a rule cannot be
+ un-ignored by another rule.
+
+* Sockets opened by libgit2 are now being closed on exec(3) if the platform
+ supports it.
+
+* Fix for peeling annotated tags from packed-refs files.
+
+* Fix reading huge loose objects from the object database.
+
+* Fix files not being treated as modified when only the file mode has changed.
+
+* We now explicitly reject adding submodules to the index via
+ `git_index_add_frombuffer`.
+
+* Fix handling of `GIT_DIFF_FIND_RENAMES_FROM_REWRITES` raising `SIGABRT` when
+ one file has been deleted and another file has been rewritten.
+
+* Fix for WinHTTP not properly handling NTLM and Negotiate challenges.
+
+* When using SSH-based transports, we now repeatedly ask for the passphrase to
+ decrypt the private key in case a wrong passphrase is being provided.
+
+* When generating conflict markers, they will now use the same line endings as
+ the rest of the file.
+
+### API additions
+
+* The `git_merge_file_options` structure now contains a new setting,
+ `marker_size`. This allows users to set the size of markers that
+ delineate the sides of merged files in the output conflict file.
+ By default this is 7 (`GIT_MERGE_CONFLICT_MARKER_SIZE`), which
+ produces output markers like `<<<<<<<` and `>>>>>>>`.
+
+* `git_remote_create_detached()` creates a remote that is not associated
+ to any repository (and does not apply configuration like 'insteadof' rules).
+ This is mostly useful for e.g. emulating `git ls-remote` behavior.
+
+* `git_diff_patchid()` lets you generate patch IDs for diffs.
+
+* `git_status_options` now has an additional field `baseline` to allow creating
+ status lists against different trees.
+
+* New family of functions to allow creating notes for a specific notes commit
+ instead of for a notes reference.
+
+* New family of functions to allow parsing message trailers. This API is still
+ experimental and may change in future releases.
+
+### API removals
+
+### Breaking API changes
+
+* Signatures now distinguish between +0000 and -0000 UTC offsets.
+
+* The certificate check callback in the WinHTTP transport will now receive the
+ `message_cb_payload` instead of the `cred_acquire_payload`.
+
+* We are now reading symlinked directories under .git/refs.
+
+* We now refuse creating branches named "HEAD".
+
+* We now refuse reading and writing all-zero object IDs into the
+ object database.
+
+* We now read the effective user's configuration file instead of the real user's
+ configuration in case libgit2 runs as part of a setuid binary.
+
+* The `git_odb_open_rstream` function and its `readstream` callback in the
+ `git_odb_backend` interface have changed their signatures to allow providing
+ the object's size and type to the caller.
+
+v0.26
+-----
+
+### Changes or improvements
+
+* Support for opening, creating and modifying worktrees.
+
+* We can now detect SHA1 collisions resulting from the SHAttered attack. These
+ checks can be enabled at build time via `-DUSE_SHA1DC`.
+
+* Fix for missing implementation of `git_merge_driver_source` getters.
+
+* Fix for installed pkg-config file being broken when the prefix contains
+ spaces.
+
+* We now detect when the hashsum of on-disk objects does not match their
+ expected hashsum.
+
+* We now support open-ended ranges (e.g. "master..", "...master") in our
+ revision range parsing code.
+
+* We now correctly compute ignores with leading "/" in subdirectories.
+
+* We now optionally call `fsync` on loose objects, packfiles and their indexes,
+ loose references and packed reference files.
+
+* We can now build against OpenSSL v1.1 and against LibreSSL.
+
+* `GIT_MERGE_OPTIONS_INIT` now includes a setting to perform rename detection.
+ This aligns this structure with the default by `git_merge` and
+ `git_merge_trees` when `NULL` was provided for the options.
+
+* Improvements for reading index v4 files.
+
+* Perform additional retries for filesystem operations on Windows when files
+ are temporarily locked by other processes.
+
+### API additions
+
+* New family of functions to handle worktrees:
+
+ * `git_worktree_list()` lets you look up worktrees for a repository.
+ * `git_worktree_lookup()` lets you get a specific worktree.
+ * `git_worktree_open_from_repository()` lets you get the associated worktree
+ of a repository.
+ a worktree.
+ * `git_worktree_add` lets you create new worktrees.
+ * `git_worktree_prune` lets you remove worktrees from disk.
+ * `git_worktree_lock()` and `git_worktree_unlock()` let you lock
+ respectively unlock a worktree.
+ * `git_repository_open_from_worktree()` lets you open a repository via
+ * `git_repository_head_for_worktree()` lets you get the current `HEAD` for a
+ linked worktree.
+ * `git_repository_head_detached_for_worktree()` lets you check whether a
+ linked worktree is in detached HEAD mode.
+
+* `git_repository_item_path()` lets you retrieve paths for various repository
+ files.
+
+* `git_repository_commondir()` lets you retrieve the common directory of a
+ repository.
+
+* `git_branch_is_checked_out()` allows you to check whether a branch is checked
+ out in a repository or any of its worktrees.
+
+* `git_repository_submodule_cache_all()` and
+ `git_repository_submodule_cache_clear()` functions allow you to prime or clear
+ the submodule cache of a repository.
+
+* You can disable strict hash verifications via the
+ `GIT_OPT_ENABLE_STRICT_HASH_VERIFICATION` option with `git_libgit2_opts()`.
+
+* You can enable us calling `fsync` for various files inside the ".git"
+ directory by setting the `GIT_OPT_ENABLE_FSYNC_GITDIR` option with
+ `git_libgit2_opts()`.
+
+* You can now enable "offset deltas" when creating packfiles and negotiating
+ packfiles with a remote server by setting `GIT_OPT_ENABLE_OFS_DELTA` option
+ with `GIT_libgit2_opts()`.
+
+* You can now set the default share mode on Windows for opening files using
+ `GIT_OPT_SET_WINDOWS_SHAREMODE` option with `git_libgit2_opts()`.
+ You can query the current share mode with `GIT_OPT_GET_WINDOWS_SHAREMODE`.
+
+* `git_transport_smart_proxy_options()' enables you to get the proxy options for
+ smart transports.
+
+* The `GIT_FILTER_INIT` macro and the `git_filter_init` function are provided
+ to initialize a `git_filter` structure.
+
+### Breaking API changes
+
+* `clone_checkout_strategy` has been removed from
+ `git_submodule_update_option`. The checkout strategy used to clone will
+ be the same strategy specified in `checkout_opts`.
+
+v0.25
+-------
+
+### Changes or improvements
+
+* Fix repository discovery with `git_repository_discover` and
+ `git_repository_open_ext` to match git's handling of a ceiling
+ directory at the current directory. git only checks ceiling
+ directories when its search ascends to a parent directory. A ceiling
+ directory matching the starting directory will not prevent git from
+ finding a repository in the starting directory or a parent directory.
+
+* Do not fail when deleting remotes in the presence of broken
+ global configs which contain branches.
+
+* Support for reading and writing git index v4 files
+
+* Improve the performance of the revwalk and bring us closer to git's code.
+
+* The reference db has improved support for concurrency and returns `GIT_ELOCKED`
+ when an operation could not be performed due to locking.
+
+* Nanosecond resolution is now activated by default, following git's change to
+ do this.
+
+* We now restrict the set of ciphers we let OpenSSL use by default.
+
+* Users can now register their own merge drivers for use with `.gitattributes`.
+ The library also gained built-in support for the union merge driver.
+
+* The default for creating references is now to validate that the object does
+ exist.
+
+* Add `git_proxy_options` which is used by the different networking
+ implementations to let the caller specify the proxy settings instead of
+ relying on the environment variables.
+
+### API additions
+
+* You can now get the user-agent used by libgit2 using the
+ `GIT_OPT_GET_USER_AGENT` option with `git_libgit2_opts()`.
+ It is the counterpart to `GIT_OPT_SET_USER_AGENT`.
+
+* The `GIT_OPT_SET_SSL_CIPHERS` option for `git_libgit2_opts()` lets you specify
+ a custom list of ciphers to use for OpenSSL.
+
+* `git_commit_create_buffer()` creates a commit and writes it into a
+ user-provided buffer instead of writing it into the object db. Combine it with
+ `git_commit_create_with_signature()` in order to create a commit with a
+ cryptographic signature.
+
+* `git_blob_create_fromstream()` and
+ `git_blob_create_fromstream_commit()` allow you to create a blob by
+ writing into a stream. Useful when you do not know the final size or
+ want to copy the contents from another stream.
+
+* New flags for `git_repository_open_ext`:
+
+ * `GIT_REPOSITORY_OPEN_NO_DOTGIT` - Do not check for a repository by
+ appending `/.git` to the `start_path`; only open the repository if
+ `start_path` itself points to the git directory.
+ * `GIT_REPOSITORY_OPEN_FROM_ENV` - Find and open a git repository,
+ respecting the environment variables used by the git command-line
+ tools. If set, `git_repository_open_ext` will ignore the other
+ flags and the `ceiling_dirs` argument, and will allow a NULL
+ `path` to use `GIT_DIR` or search from the current directory. The
+ search for a repository will respect `$GIT_CEILING_DIRECTORIES`
+ and `$GIT_DISCOVERY_ACROSS_FILESYSTEM`. The opened repository
+ will respect `$GIT_INDEX_FILE`, `$GIT_NAMESPACE`,
+ `$GIT_OBJECT_DIRECTORY`, and `$GIT_ALTERNATE_OBJECT_DIRECTORIES`.
+ In the future, this flag will also cause `git_repository_open_ext`
+ to respect `$GIT_WORK_TREE` and `$GIT_COMMON_DIR`; currently,
+ `git_repository_open_ext` with this flag will error out if either
+ `$GIT_WORK_TREE` or `$GIT_COMMON_DIR` is set.
+
+* `git_diff_from_buffer()` can create a `git_diff` object from the contents
+ of a git-style patch file.
+
+* `git_index_version()` and `git_index_set_version()` to get and set
+ the index version
+
+* `git_odb_expand_ids()` lets you check for the existence of multiple
+ objects at once.
+
+* The new `git_blob_dup()`, `git_commit_dup()`, `git_tag_dup()` and
+ `git_tree_dup()` functions provide type-specific wrappers for
+ `git_object_dup()` to reduce noise and increase type safety for callers.
+
+* `git_reference_dup()` lets you duplicate a reference to aid in ownership
+ management and cleanup.
+
+* `git_signature_from_buffer()` lets you create a signature from a string in the
+ format that appear in objects.
+
+* `git_tree_create_updated()` lets you create a tree based on another one
+ together with a list of updates. For the covered update cases, it's more
+ efficient than the `git_index` route.
+
+* `git_apply_patch()` applies hunks from a `git_patch` to a buffer.
+
+* `git_diff_to_buf()` lets you print an entire diff directory to a buffer,
+ similar to how `git_patch_to_buf()` works.
+
+* `git_proxy_init_options()` is added to initialize a `git_proxy_options`
+ structure at run-time.
+
+* `git_merge_driver_register()`, `git_merge_driver_unregister()` let you
+ register and unregister a custom merge driver to be used when `.gitattributes`
+ specifies it.
+
+* `git_merge_driver_lookup()` can be used to look up a merge driver by name.
+
+* `git_merge_driver_source_repo()`, `git_merge_driver_source_ancestor()`,
+ `git_merge_driver_source_ours()`, `git_merge_driver_source_theirs()`,
+ `git_merge_driver_source_file_options()` added as accessors to
+ `git_merge_driver_source`.
+
+### API removals
+
+* `git_blob_create_fromchunks()` has been removed in favour of
+ `git_blob_create_fromstream()`.
+
+### Breaking API changes
+
+* `git_packbuilder_object_count` and `git_packbuilder_written` now
+ return a `size_t` instead of a `uint32_t` for more thorough
+ compatibility with the rest of the library.
+
+* `git_packbuiler_progress` now provides explicitly sized `uint32_t`
+ values instead of `unsigned int`.
+
+* `git_diff_file` now includes an `id_abbrev` field that reflects the
+ number of nibbles set in the `id` field.
+
+* `git_odb_backend` now has a `freshen` function pointer. This optional
+ function pointer is similar to the `exists` function, but it will update
+ a last-used marker. For filesystem-based object databases, this updates
+ the timestamp of the file containing the object, to indicate "freshness".
+ If this is `NULL`, then it will not be called and the `exists` function
+ will be used instead.
+
+* `git_remote_connect()` now accepts `git_proxy_options` argument, and
+ `git_fetch_options` and `git_push_options` each have a `proxy_opts` field.
+
+* `git_merge_options` now provides a `default_driver` that can be used
+ to provide the name of a merge driver to be used to handle files changed
+ during a merge.
+
+v0.24
+-------
+
+### Changes or improvements
+
+* Custom merge drivers can now be registered, which allows callers to
+ configure callbacks to honor `merge=driver` configuration in
+ `.gitattributes`.
+
+* Custom filters can now be registered with wildcard attributes, for
+ example `filter=*`. Consumers should examine the attributes parameter
+ of the `check` function for details.
+
+* Symlinks are now followed when locking a file, which can be
+ necessary when multiple worktrees share a base repository.
+
+* You can now set your own user-agent to be sent for HTTP requests by
+ using the `GIT_OPT_SET_USER_AGENT` with `git_libgit2_opts()`.
+
+* You can set custom HTTP header fields to be sent along with requests
+ by passing them in the fetch and push options.
+
+* Tree objects are now assumed to be sorted. If a tree is not
+ correctly formed, it will give bad results. This is the git approach
+ and cuts a significant amount of time when reading the trees.
+
+* Filter registration is now protected against concurrent
+ registration.
+
+* Filenames which are not valid on Windows in an index no longer cause
+ to fail to parse it on that OS.
+
+* Rebases can now be performed purely in-memory, without touching the
+ repository's workdir.
+
+* When adding objects to the index, or when creating new tree or commit
+ objects, the inputs are validated to ensure that the dependent objects
+ exist and are of the correct type. This object validation can be
+ disabled with the GIT_OPT_ENABLE_STRICT_OBJECT_CREATION option.
+
+* The WinHTTP transport's handling of bad credentials now behaves like
+ the others, asking for credentials again.
+
+### API additions
+
+* `git_config_lock()` has been added, which allow for
+ transactional/atomic complex updates to the configuration, removing
+ the opportunity for concurrent operations and not committing any
+ changes until the unlock.
+
+* `git_diff_options` added a new callback `progress_cb` to report on the
+ progress of the diff as files are being compared. The documentation of
+ the existing callback `notify_cb` was updated to reflect that it only
+ gets called when new deltas are added to the diff.
+
+* `git_fetch_options` and `git_push_options` have gained a `custom_headers`
+ field to set the extra HTTP header fields to send.
+
+* `git_stream_register_tls()` lets you register a callback to be used
+ as the constructor for a TLS stream instead of the libgit2 built-in
+ one.
+
+* `git_commit_header_field()` allows you to look up a specific header
+ field in a commit.
+
+* `git_commit_extract_signature()` extracts the signature from a
+ commit and gives you both the signature and the signed data so you
+ can verify it.
+
+### API removals
+
+* No APIs were removed in this version.
+
+### Breaking API changes
+
+* The `git_merge_tree_flag_t` is now `git_merge_flag_t`. Subsequently,
+ its members are no longer prefixed with `GIT_MERGE_TREE_FLAG` but are
+ now prefixed with `GIT_MERGE_FLAG`, and the `tree_flags` field of the
+ `git_merge_options` structure is now named `flags`.
+
+* The `git_merge_file_flags_t` enum is now `git_merge_file_flag_t` for
+ consistency with other enum type names.
+
+* `git_cert` descendent types now have a proper `parent` member
+
+* It is the responsibility of the refdb backend to decide what to do
+ with the reflog on ref deletion. The file-based backend must delete
+ it, a database-backed one may wish to archive it.
+
+* `git_config_backend` has gained two entries. `lock` and `unlock`
+ with which to implement the transactional/atomic semantics for the
+ configuration backend.
+
+* `git_index_add` and `git_index_conflict_add()` will now use the case
+ as provided by the caller on case insensitive systems. Previous
+ versions would keep the case as it existed in the index. This does
+ not affect the higher-level `git_index_add_bypath` or
+ `git_index_add_frombuffer` functions.
+
+* The `notify_payload` field of `git_diff_options` was renamed to `payload`
+ to reflect that it's also the payload for the new progress callback.
+
+* The `git_config_level_t` enum has gained a higher-priority value
+ `GIT_CONFIG_LEVEL_PROGRAMDATA` which represent a rough Windows equivalent
+ to the system level configuration.
+
+* `git_rebase_options` now has a `merge_options` field.
+
+* The index no longer performs locking itself. This is not something
+ users of the library should have been relying on as it's not part of
+ the concurrency guarantees.
+
+* `git_remote_connect()` now takes a `custom_headers` argument to set
+ the extra HTTP header fields to send.
+
+v0.23
+------
+
+### Changes or improvements
+
+* Patience and minimal diff drivers can now be used for merges.
+
+* Merges can now ignore whitespace changes.
+
+* Updated binary identification in CRLF filtering to avoid false positives in
+ UTF-8 files.
+
+* Rename and copy detection is enabled for small files.
+
+* Checkout can now handle an initial checkout of a repository, making
+ `GIT_CHECKOUT_SAFE_CREATE` unnecessary for users of clone.
+
+* The signature parameter in the ref-modifying functions has been
+ removed. Use `git_repository_set_ident()` and
+ `git_repository_ident()` to override the signature to be used.
+
+* The local transport now auto-scales the number of threads to use
+ when creating the packfile instead of sticking to one.
+
+* Reference renaming now uses the right id for the old value.
+
+* The annotated version of branch creation, HEAD detaching and reset
+ allow for specifying the expression from the user to be put into the
+ reflog.
+
+* `git_rebase_commit` now returns `GIT_EUNMERGED` when you attempt to
+ commit with unstaged changes.
+
+* On Mac OS X, we now use SecureTransport to provide the cryptographic
+ support for HTTPS connections insead of OpenSSL.
+
+* Checkout can now accept an index for the baseline computations via the
+ `baseline_index` member.
+
+* The configuration for fetching is no longer stored inside the
+ `git_remote` struct but has been moved to a `git_fetch_options`. The
+ remote functions now take these options or the callbacks instead of
+ setting them beforehand.
+
+* `git_submodule` instances are no longer cached or shared across
+ lookup. Each submodule represents the configuration at the time of
+ loading.
+
+* The index now uses diffs for `add_all()` and `update_all()` which
+ gives it a speed boost and closer semantics to git.
+
+* The ssh transport now reports the stderr output from the server as
+ the error message, which allows you to get the "repository not
+ found" messages.
+
+* `git_index_conflict_add()` will remove staged entries that exist for
+ conflicted paths.
+
+* The flags for a `git_diff_file` will now have the `GIT_DIFF_FLAG_EXISTS`
+ bit set when a file exists on that side of the diff. This is useful
+ for understanding whether a side of the diff exists in the presence of
+ a conflict.
+
+* The constructor for a write-stream into the odb now takes
+ `git_off_t` instead of `size_t` for the size of the blob, which
+ allows putting large files into the odb on 32-bit systems.
+
+* The remote's push and pull URLs now honor the url.$URL.insteadOf
+ configuration. This allows modifying URL prefixes to a custom
+ value via gitconfig.
+
+* `git_diff_foreach`, `git_diff_blobs`, `git_diff_blob_to_buffer`,
+ and `git_diff_buffers` now accept a new binary callback of type
+ `git_diff_binary_cb` that includes the binary diff information.
+
+* The race condition mitigations described in `racy-git.txt` have been
+ implemented.
+
+* If libcurl is installed, we will use it to connect to HTTP(S)
+ servers.
+
+### API additions
+
+* The `git_merge_options` gained a `file_flags` member.
+
+* Parsing and retrieving a configuration value as a path is exposed
+ via `git_config_parse_path()` and `git_config_get_path()`
+ respectively.
+
+* `git_repository_set_ident()` and `git_repository_ident()` serve to
+ set and query which identity will be used when writing to the
+ reflog.
+
+* `git_config_entry_free()` frees a config entry.
+
+* `git_config_get_string_buf()` provides a way to safely retrieve a
+ string from a non-snapshot configuration.
+
+* `git_annotated_commit_from_revspec()` allows to get an annotated
+ commit from an extended sha synatx string.
+
+* `git_repository_set_head_detached_from_annotated()`,
+ `git_branch_create_from_annotated()` and
+ `git_reset_from_annotated()` allow for the caller to provide an
+ annotated commit through which they can control what expression is
+ put into the reflog as the source/target.
+
+* `git_index_add_frombuffer()` can now create a blob from memory
+ buffer and add it to the index which is attached to a repository.
+
+* The structure `git_fetch_options` has been added to determine the
+ runtime configuration for fetching, such as callbacks, pruning and
+ autotag behaviour. It has the runtime initializer
+ `git_fetch_init_options()`.
+
+* The enum `git_fetch_prune_t` has been added, letting you specify the
+ pruning behaviour for a fetch.
+
+* A push operation will notify the caller of what updates it indends
+ to perform on the remote, which provides similar information to
+ git's pre-push hook.
+
+* `git_stash_apply()` can now apply a stashed state from the stash list,
+ placing the data into the working directory and index.
+
+* `git_stash_pop()` will apply a stashed state (like `git_stash_apply()`)
+ but will remove the stashed state after a successful application.
+
+* A new error code `GIT_EEOF` indicates an early EOF from the
+ server. This typically indicates an error with the URL or
+ configuration of the server, and tools can use this to show messages
+ about failing to communicate with the server.
+
+* A new error code `GIT_EINVALID` indicates that an argument to a
+ function is invalid, or an invalid operation was requested.
+
+* `git_diff_index_to_workdir()` and `git_diff_tree_to_index()` will now
+ produce deltas of type `GIT_DELTA_CONFLICTED` to indicate that the index
+ side of the delta is a conflict.
+
+* The `git_status` family of functions will now produce status of type
+ `GIT_STATUS_CONFLICTED` to indicate that a conflict exists for that file
+ in the index.
+
+* `git_index_entry_is_conflict()` is a utility function to determine if
+ a given index entry has a non-zero stage entry, indicating that it is
+ one side of a conflict.
+
+* It is now possible to pass a keypair via a buffer instead of a
+ path. For this, `GIT_CREDTYPE_SSH_MEMORY` and
+ `git_cred_ssh_key_memory_new()` have been added.
+
+* `git_filter_list_contains` will indicate whether a particular
+ filter will be run in the given filter list.
+
+* `git_commit_header_field()` has been added, which allows retrieving
+ the contents of an arbitrary header field.
+
+* `git_submodule_set_branch()` allows to set the configured branch for
+ a submodule.
+
+### API removals
+
+* `git_remote_save()` and `git_remote_clear_refspecs()` have been
+ removed. Remote's configuration is changed via the configuration
+ directly or through a convenience function which performs changes to
+ the configuration directly.
+
+* `git_remote_set_callbacks()`, `git_remote_get_callbacks()` and
+ `git_remote_set_transport()` have been removed and the remote no
+ longer stores this configuration.
+
+* `git_remote_set_fetch_refpecs()` and
+ `git_remote_set_push_refspecs()` have been removed. There is no
+ longer a way to set the base refspecs at run-time.
+
+* `git_submodule_save()` has been removed. The submodules are no
+ longer configured via the objects.
+
+* `git_submodule_reload_all()` has been removed as we no longer cache
+ submodules.
+
+### Breaking API changes
+
+* `git_smart_subtransport_cb` now has a `param` parameter.
+
+* The `git_merge_options` structure member `flags` has been renamed
+ to `tree_flags`.
+
+* The `git_merge_file_options` structure member `flags` is now
+ an unsigned int. It was previously a `git_merge_file_flags_t`.
+
+* `GIT_CHECKOUT_SAFE_CREATE` has been removed. Most users will generally
+ be able to switch to `GIT_CHECKOUT_SAFE`, but if you require missing
+ file handling during checkout, you may now use `GIT_CHECKOUT_SAFE |
+ GIT_CHECKOUT_RECREATE_MISSING`.
+
+* The `git_clone_options` and `git_submodule_update_options`
+ structures no longer have a `signature` field.
+
+* The following functions have removed the signature and/or log message
+ parameters in favour of git-emulating ones.
+
+ * `git_branch_create()`, `git_branch_move()`
+ * `git_rebase_init()`, `git_rebase_abort()`
+ * `git_reference_symbolic_create_matching()`,
+ `git_reference_symbolic_create()`, `git_reference_create()`,
+ `git_reference_create_matching()`,
+ `git_reference_symbolic_set_target()`,
+ `git_reference_set_target()`, `git_reference_rename()`
+ * `git_remote_update_tips()`, `git_remote_fetch()`, `git_remote_push()`
+ * `git_repository_set_head()`,
+ `git_repository_set_head_detached()`,
+ `git_repository_detach_head()`
+ * `git_reset()`
+
+* `git_config_get_entry()` now gives back a ref-counted
+ `git_config_entry`. You must free it when you no longer need it.
+
+* `git_config_get_string()` will return an error if used on a
+ non-snapshot configuration, as there can be no guarantee that the
+ returned pointer is valid.
+
+* `git_note_default_ref()` now uses a `git_buf` to return the string,
+ as the string is otherwise not guaranteed to stay allocated.
+
+* `git_rebase_operation_current()` will return `GIT_REBASE_NO_OPERATION`
+ if it is called immediately after creating a rebase session but before
+ you have applied the first patch.
+
+* `git_rebase_options` now contains a `git_checkout_options` struct
+ that will be used for functions that modify the working directory,
+ namely `git_rebase_init`, `git_rebase_next` and
+ `git_rebase_abort`. As a result, `git_rebase_open` now also takes
+ a `git_rebase_options` and only the `git_rebase_init` and
+ `git_rebase_open` functions take a `git_rebase_options`, where they
+ will persist the options to subsequent `git_rebase` calls.
+
+* The `git_clone_options` struct now has fetch options in a
+ `fetch_opts` field instead of remote callbacks in
+ `remote_callbacks`.
+
+* The remote callbacks has gained a new member `push_negotiation`
+ which gets called before sending the update commands to the server.
+
+* The following functions no longer act on a remote instance but
+ change the repository's configuration. Their signatures have changed
+ accordingly:
+
+ * `git_remote_set_url()`, `git_remote_seturl()`
+ * `git_remote_add_fetch()`, `git_remote_add_push()` and
+ * `git_remote_set_autotag()`
+
+* `git_remote_connect()` and `git_remote_prune()` now take a pointer
+ to the callbacks.
+
+* `git_remote_fetch()` and `git_remote_download()` now take a pointer
+ to fetch options which determine the runtime configuration.
+
+* The `git_remote_autotag_option_t` values have been changed. It has
+ gained a `_UNSPECIFIED` default value to specify no override for the
+ configured setting.
+
+* `git_remote_update_tips()` now takes a pointer to the callbacks as
+ well as a boolean whether to write `FETCH_HEAD` and the autotag
+ setting.
+
+* `git_remote_create_anonymous()` no longer takes a fetch refspec as
+ url-only remotes cannot have configured refspecs.
+
+* The `git_submodule_update_options` struct now has fetch options in
+ the `fetch_opts` field instead of callbacks in the
+ `remote_callbacks` field.
+
+* The following functions no longer act on a submodule instance but
+ change the repository's configuration. Their signatures have changed
+ accordingly:
+
+ * `git_submodule_set_url()`, `git_submodule_set_ignore()`,
+ `git_submodule_set_update()`,
+ `git_submodule_set_fetch_recurse_submodules()`.
+
+* `git_submodule_status()` no longer takes a submodule instance but a
+ repsitory, a submodule name and an ignore setting.
+
+* The `push` function in the `git_transport` interface now takes a
+ pointer to the remote callbacks.
+
+* The `git_index_entry` struct's fields' types have been changed to
+ more accurately reflect what is in fact stored in the
+ index. Specifically, time and file size are 32 bits intead of 64, as
+ these values are truncated.
+
+* `GIT_EMERGECONFLICT` is now `GIT_ECONFLICT`, which more accurately
+ describes the nature of the error.
+
+* It is no longer allowed to call `git_buf_grow()` on buffers
+ borrowing the memory they point to.
+
+v0.22
+------
+
+### Changes or improvements
+
+* `git_signature_new()` now requires a non-empty email address.
+
+* Use CommonCrypto libraries for SHA-1 calculation on Mac OS X.
+
+* Disable SSL compression and SSLv2 and SSLv3 ciphers in favor of TLSv1
+ in OpenSSL.
+
+* The fetch behavior of remotes with autotag set to `GIT_REMOTE_DOWNLOAD_TAGS_ALL`
+ has been changed to match git 1.9.0 and later. In this mode, libgit2 now
+ fetches all tags in addition to whatever else needs to be fetched.
+
+* `git_checkout()` now handles case-changing renames correctly on
+ case-insensitive filesystems; for example renaming "readme" to "README".
+
+* The search for libssh2 is now done via pkg-config instead of a
+ custom search of a few directories.
+
+* Add support for core.protectHFS and core.protectNTFS. Add more
+ validation for filenames which we write such as references.
+
+* The local transport now generates textual progress output like
+ git-upload-pack does ("counting objects").
+
+* `git_checkout_index()` can now check out an in-memory index that is not
+ necessarily the repository's index, so you may check out an index
+ that was produced by git_merge and friends while retaining the cached
+ information.
+
+* Remove the default timeout for receiving / sending data over HTTP using
+ the WinHTTP transport layer.
+
+* Add SPNEGO (Kerberos) authentication using GSSAPI on Unix systems.
+
+* Provide built-in objects for the empty blob (e69de29) and empty
+ tree (4b825dc) objects.
+
+* The index' tree cache is now filled upon read-tree and write-tree
+ and the cache is written to disk.
+
+* LF -> CRLF filter refuses to handle mixed-EOL files
+
+* LF -> CRLF filter now runs when * text = auto (with Git for Windows 1.9.4)
+
+* File unlocks are atomic again via rename. Read-only files on Windows are
+ made read-write if necessary.
+
+* Share open packfiles across repositories to share descriptors and mmaps.
+
+* Use a map for the treebuilder, making insertion O(1)
+
+* The build system now accepts an option EMBED_SSH_PATH which when set
+ tells it to include a copy of libssh2 at the given location. This is
+ enabled for MSVC.
+
+* Add support for refspecs with the asterisk in the middle of a
+ pattern.
+
+* Fetching now performs opportunistic updates. To achieve this, we
+ introduce a difference between active and passive refspecs, which
+ make `git_remote_download()` and `git_remote_fetch()` to take a list of
+ resfpecs to be the active list, similarly to how git fetch accepts a
+ list on the command-line.
+
+* The THREADSAFE option to build libgit2 with threading support has
+ been flipped to be on by default.
+
+* The remote object has learnt to prune remote-tracking branches. If
+ the remote is configured to do so, this will happen via
+ `git_remote_fetch()`. You can also call `git_remote_prune()` after
+ connecting or fetching to perform the prune.
+
+
+### API additions
+
+* Introduce `git_buf_text_is_binary()` and `git_buf_text_contains_nul()` for
+ consumers to perform binary detection on a git_buf.
+
+* `git_branch_upstream_remote()` has been introduced to provide the
+ branch.<name>.remote configuration value.
+
+* Introduce `git_describe_commit()` and `git_describe_workdir()` to provide
+ a description of the current commit (and working tree, respectively)
+ based on the nearest tag or reference
+
+* Introduce `git_merge_bases()` and the `git_oidarray` type to expose all
+ merge bases between two commits.
+
+* Introduce `git_merge_bases_many()` to expose all merge bases between
+ multiple commits.
+
+* Introduce rebase functionality (using the merge algorithm only).
+ Introduce `git_rebase_init()` to begin a new rebase session,
+ `git_rebase_open()` to open an in-progress rebase session,
+ `git_rebase_commit()` to commit the current rebase operation,
+ `git_rebase_next()` to apply the next rebase operation,
+ `git_rebase_abort()` to abort an in-progress rebase and `git_rebase_finish()`
+ to complete a rebase operation.
+
+* Introduce `git_note_author()` and `git_note_committer()` to get the author
+ and committer information on a `git_note`, respectively.
+
+* A factory function for ssh has been added which allows to change the
+ path of the programs to execute for receive-pack and upload-pack on
+ the server, `git_transport_ssh_with_paths()`.
+
+* The ssh transport supports asking the remote host for accepted
+ credential types as well as multiple challeges using a single
+ connection. This requires to know which username you want to connect
+ as, so this introduces the USERNAME credential type which the ssh
+ transport will use to ask for the username.
+
+* The `GIT_EPEEL` error code has been introduced when we cannot peel a tag
+ to the requested object type; if the given object otherwise cannot be
+ peeled, `GIT_EINVALIDSPEC` is returned.
+
+* Introduce `GIT_REPOSITORY_INIT_RELATIVE_GITLINK` to use relative paths
+ when writing gitlinks, as is used by git core for submodules.
+
+* `git_remote_prune()` has been added. See above for description.
+
+
+* Introduce reference transactions, which allow multiple references to
+ be locked at the same time and updates be queued. This also allows
+ us to safely update a reflog with arbitrary contents, as we need to
+ do for stash.
+
+### API removals
+
+* `git_remote_supported_url()` and `git_remote_is_valid_url()` have been
+ removed as they have become essentially useless with rsync-style ssh paths.
+
+* `git_clone_into()` and `git_clone_local_into()` have been removed from the
+ public API in favour of `git_clone callbacks`.
+
+* The option to ignore certificate errors via `git_remote_cert_check()`
+ is no longer present. Instead, `git_remote_callbacks` has gained a new
+ entry which lets the user perform their own certificate checks.
+
+### Breaking API changes
+
+* `git_cherry_pick()` is now `git_cherrypick()`.
+
+* The `git_submodule_update()` function was renamed to
+ `git_submodule_update_strategy()`. `git_submodule_update()` is now used to
+ provide functionalty similar to "git submodule update".
+
+* `git_treebuilder_create()` was renamed to `git_treebuilder_new()` to better
+ reflect it being a constructor rather than something which writes to
+ disk.
+
+* `git_treebuilder_new()` (was `git_treebuilder_create()`) now takes a
+ repository so that it can query repository configuration.
+ Subsequently, `git_treebuilder_write()` no longer takes a repository.
+
+* `git_threads_init()` and `git_threads_shutdown()` have been renamed to
+ `git_libgit2_init()` and `git_libgit2_shutdown()` to better explain what
+ their purpose is, as it's grown to be more than just about threads.
+
+* `git_libgit2_init()` and `git_libgit2_shutdown()` now return the number of
+ initializations of the library, so consumers may schedule work on the
+ first initialization.
+
+* The `git_transport_register()` function no longer takes a priority and takes
+ a URL scheme name (eg "http") instead of a prefix like "http://"
+
+* `git_index_name_entrycount()` and `git_index_reuc_entrycount()` now
+ return size_t instead of unsigned int.
+
+* The `context_lines` and `interhunk_lines` fields in `git_diff`_options are
+ now `uint32_t` instead of `uint16_t`. This allows to set them to `UINT_MAX`,
+ in effect asking for "infinite" context e.g. to iterate over all the
+ unmodified lines of a diff.
+
+* `git_status_file()` now takes an exact path. Use `git_status_list_new()` if
+ pathspec searching is needed.
+
+* `git_note_create()` has changed the position of the notes reference
+ name to match `git_note_remove()`.
+
+* Rename `git_remote_load()` to `git_remote_lookup()` to bring it in line
+ with the rest of the lookup functions.
+
+* `git_remote_rename()` now takes the repository and the remote's
+ current name. Accepting a remote indicates we want to change it,
+ which we only did partially. It is much clearer if we accept a name
+ and no loaded objects are changed.
+
+* `git_remote_delete()` now accepts the repository and the remote's name
+ instead of a loaded remote.
+
+* `git_merge_head` is now `git_annotated_commit`, to better reflect its usage
+ for multiple functions (including rebase)
+
+* The `git_clone_options` struct no longer provides the `ignore_cert_errors` or
+ `remote_name` members for remote customization.
+
+ Instead, the `git_clone_options` struct has two new members, `remote_cb` and
+ `remote_cb_payload`, which allow the caller to completely override the remote
+ creation process. If needed, the caller can use this callback to give their
+ remote a name other than the default (origin) or disable cert checking.
+
+ The `remote_callbacks` member has been preserved for convenience, although it
+ is not used when a remote creation callback is supplied.
+
+* The `git_clone`_options struct now provides `repository_cb` and
+ `repository_cb_payload` to allow the user to create a repository with
+ custom options.
+
+* The `git_push` struct to perform a push has been replaced with
+ `git_remote_upload()`. The refspecs and options are passed as a
+ function argument. `git_push_update_tips()` is now also
+ `git_remote_update_tips()` and the callbacks are in the same struct as
+ the rest.
+
+* The `git_remote_set_transport()` function now sets a transport factory function,
+ rather than a pre-existing transport instance.
+
+* The `git_transport` structure definition has moved into the sys/transport.h
+ file.
+
+* libgit2 no longer automatically sets the OpenSSL locking
+ functions. This is not something which we can know to do. A
+ last-resort convenience function is provided in sys/openssl.h,
+ `git_openssl_set_locking()` which can be used to set the locking.
--- /dev/null
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [libgit2@gmail.com][email]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[email]: mailto:libgit2@gmail.com
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
--- /dev/null
+# Welcome to libgit2!
+
+We're making it easy to do interesting things with git, and we'd love to have
+your help.
+
+## Licensing
+
+By contributing to libgit2, you agree to release your contribution under
+the terms of the license. Except for the `examples` and the
+`deps` directories, all code is released under the [GPL v2 with
+linking exception](../COPYING).
+
+The `examples` code is governed by the
+[CC0 Public Domain Dedication](../examples/COPYING), so that you may copy
+from them into your own application.
+
+The bundled dependencies in the `deps` directories are governed
+by the following licenses:
+
+- http-parser is licensed under [MIT license](../deps/http-parser/COPYING)
+- regex is governed by [LGPL v2.1+ license](../deps/regex/COPYING)
+- winhttp is governed by [LGPL v2.1+](../deps/winhttp/COPYING.LGPL) and [GPL v2 with linking exception](../deps/winhttp/COPYING.GPL)
+- zlib is governed by [zlib license](../deps/zlib/COPYING)
+
+## Discussion & Chat
+
+We hang out in the
+[`#libgit2`](http://webchat.freenode.net/?channels=#libgit2)) channel on
+irc.freenode.net.
+
+Also, feel free to open an
+[Issue](https://github.com/libgit2/libgit2/issues/new) to start a discussion
+about any concerns you have. We like to use Issues for that so there is an
+easily accessible permanent record of the conversation.
+
+## Libgit2 Versions
+
+The `master` branch is the main branch where development happens.
+Releases are tagged
+(e.g. [v0.21.0](https://github.com/libgit2/libgit2/releases/tag/v0.21.0) )
+and when a critical bug fix needs to be backported, it will be done on a
+`<tag>-maint` maintenance branch.
+
+## Reporting Bugs
+
+First, know which version of libgit2 your problem is in and include it in
+your bug report. This can either be a tag (e.g.
+[v0.17.0](https://github.com/libgit2/libgit2/releases/tag/v0.17.0)) or a
+commit SHA
+(e.g. [01be7863](https://github.com/libgit2/libgit2/commit/01be7863)).
+Using [`git describe`](http://git-scm.com/docs/git-describe) is a
+great way to tell us what version you're working with.
+
+If you're not running against the latest `master` branch version,
+please compile and test against that to avoid re-reporting an issue that's
+already been fixed.
+
+It's *incredibly* helpful to be able to reproduce the problem. Please
+include a list of steps, a bit of code, and/or a zipped repository (if
+possible). Note that some of the libgit2 developers are employees of
+GitHub, so if your repository is private, find us on IRC and we'll figure
+out a way to help you.
+
+## Pull Requests
+
+Our work flow is a [typical GitHub
+flow](https://guides.github.com/introduction/flow/index.html), where
+contributors fork the [libgit2 repository](https://github.com/libgit2/libgit2),
+make their changes on branch, and submit a
+[Pull Request](https://help.github.com/articles/using-pull-requests)
+(a.k.a. "PR"). Pull requests should usually be targeted at the `master`
+branch.
+
+Life will be a lot easier for you (and us) if you follow this pattern
+(i.e. fork, named branch, submit PR). If you use your fork's `master`
+branch directly, things can get messy.
+
+Please include a nice description of your changes when you submit your PR;
+if we have to read the whole diff to figure out why you're contributing
+in the first place, you're less likely to get feedback and have your change
+merged in.
+
+In addition to outlining your thought process in the PR's description, please
+also try to document it in your commits. We welcome it if every commit has a
+description of why you have been doing your changes alongside with your
+reasoning why this is a good idea. The messages shall be written in
+present-tense and in an imperative style (e.g. "Add feature foobar", not "Added
+feature foobar" or "Adding feature foobar"). Lines should be wrapped at 80
+characters so people with small screens are able to read the commit messages in
+their terminal without any problem.
+
+To make it easier to attribute commits to certain parts of our code base, we
+also prefer to have the commit subject be prefixed with a "scope". E.g. if you
+are changing code in our merging subsystem, make sure to prefix the subject with
+"merge:". The first word following the colon shall start with an lowercase
+letter. The maximum line length for the subject is 70 characters, preferably
+shorter.
+
+If you are starting to work on a particular area, feel free to submit a PR
+that highlights your work in progress (and note in the PR title that it's
+not ready to merge). These early PRs are welcome and will help in getting
+visibility for your fix, allow others to comment early on the changes and
+also let others know that you are currently working on something.
+
+Before wrapping up a PR, you should be sure to:
+
+* Write tests to cover any functional changes
+* Update documentation for any changed public APIs
+* Add to the [`changelog.md`](changelog.md) file describing any major changes
+
+## Unit Tests
+
+We believe that our unit tests allow us to keep the quality of libgit2
+high: any new changes must not cause unit test failures, and new changes
+should include unit tests that cover the bug fixes or new features.
+For bug fixes, we prefer unit tests that illustrate the failure before
+the change, but pass with your changes.
+
+In addition to new tests, please ensure that your changes do not cause
+any other test failures. Running the entire test suite is helpful
+before you submit a pull request. When you build libgit2, the test
+suite will also be built. You can run most of the tests by simply running
+the resultant `libgit2_clar` binary. If you want to run a specific
+unit test, you can name it with the `-s` option. For example:
+
+ libgit2_clar -sstatus::worktree::long_filenames
+
+Or you can run an entire class of tests. For example, to run all the
+worktree status tests:
+
+ libgit2_clar -sstatus::worktree
+
+The default test run is fairly exhaustive, but it will exclude some
+unit tests by default: in particular, those that talk to network
+servers and the tests that manipulate the filesystem in onerous
+ways (and may need to have special privileges to run). To run the
+network tests:
+
+ libgit2_clar -ionline
+
+In addition, various tests may be enabled by environment variables,
+like the ones that write exceptionally large repositories or manipulate
+the filesystem structure in unexpected ways. These tests *may be
+dangerous* to run on a normal machine and may harm your filesystem. It's
+not recommended that you run these; instead, the continuous integration
+servers will run these (in a sandbox).
+
+## Porting Code From Other Open-Source Projects
+
+`libgit2` is licensed under the terms of the GPL v2 with a linking
+exception. Any code brought in must be compatible with those terms.
+
+The most common case is porting code from core Git. Git is a pure GPL
+project, which means that in order to port code to this project, we need the
+explicit permission of the author. Check the
+[`git.git-authors`](https://github.com/libgit2/libgit2/blob/development/git.git-authors)
+file for authors who have already consented.
+
+Other licenses have other requirements; check the license of the library
+you're porting code *from* to see what you need to do. As a general rule,
+MIT and BSD (3-clause) licenses are typically no problem. Apache 2.0
+license typically doesn't work due to GPL incompatibility.
+
+If your pull request uses code from core Git, another project, or code
+from a forum / Stack Overflow, then *please* flag this in your PR and make
+sure you've given proper credit to the original author in the code
+snippet.
+
+## Style Guide
+
+The public API of `libgit2` is [ANSI C](http://en.wikipedia.org/wiki/ANSI_C)
+(a.k.a. C89) compatible. Internally, `libgit2` is written using a portable
+subset of C99 - in order to compile with GCC, Clang, MSVC, etc., we keep
+local variable declarations at the tops of blocks only and avoid `//` style
+comments. Additionally, `libgit2` follows some extra conventions for
+function and type naming, code formatting, and testing.
+
+We like to keep the source code consistent and easy to read. Maintaining
+this takes some discipline, but it's been more than worth it. Take a look
+at the [conventions file](conventions.md).
+
+## Starter Projects
+
+See our [projects list](projects.md).
--- /dev/null
+# Libgit2 Conventions
+
+We like to keep the source consistent and readable. Herein are some
+guidelines that should help with that.
+
+## External API
+
+We have a few rules to avoid surprising ways of calling functions and
+some rules for consumers of the library to avoid stepping on each
+other's toes.
+
+ - Property accessors return the value directly (e.g. an `int` or
+ `const char *`) but if a function can fail, we return a `int` value
+ and the output parameters go first in the parameter list, followed
+ by the object that a function is operating on, and then any other
+ arguments the function may need.
+
+ - If a function returns an object as a return value, that function is
+ a getter and the object's lifetime is tied to the parent
+ object. Objects which are returned as the first argument as a
+ pointer-to-pointer are owned by the caller and it is responsible
+ for freeing it. Strings are returned via `git_buf` in order to
+ allow for re-use and safe freeing.
+
+ - Most of what libgit2 does relates to I/O so as a general rule
+ you should assume that any function can fail due to errors as even
+ getting data from the filesystem can result in all sorts of errors
+ and complex failure cases.
+
+ - Paths inside the Git system are separated by a slash (0x2F). If a
+ function accepts a path on disk, then backslashes (0x5C) are also
+ accepted on Windows.
+
+ - Do not mix allocators. If something has been allocated by libgit2,
+ you do not know which is the right free function in the general
+ case. Use the free functions provided for each object type.
+
+## Compatibility
+
+`libgit2` runs on many different platforms with many different compilers.
+
+The public API of `libgit2` is [ANSI C](http://en.wikipedia.org/wiki/ANSI_C)
+(a.k.a. C89) compatible.
+
+Internally, `libgit2` is written using a portable subset of C99 - in order
+to maximize compatibility (e.g. with MSVC) we avoid certain C99
+extensions. Specifically, we keep local variable declarations at the tops
+of blocks only and we avoid `//` style comments.
+
+Also, to the greatest extent possible, we try to avoid lots of `#ifdef`s
+inside the core code base. This is somewhat unavoidable, but since it can
+really hamper maintainability, we keep it to a minimum.
+
+## Match Surrounding Code
+
+If there is one rule to take away from this document, it is *new code should
+match the surrounding code in a way that makes it impossible to distinguish
+the new from the old.* Consistency is more important to us than anyone's
+personal opinion about where braces should be placed or spaces vs. tabs.
+
+If a section of code is being completely rewritten, it is okay to bring it
+in line with the standards that are laid out here, but we will not accept
+submissions that contain a large number of changes that are merely
+reformatting.
+
+## Naming Things
+
+All external types and functions start with `git_` and all `#define` macros
+start with `GIT_`. The `libgit2` API is mostly broken into related
+functional modules each with a corresponding header. All functions in a
+module should be named like `git_modulename_functioname()`
+(e.g. `git_repository_open()`).
+
+Functions with a single output parameter should name that parameter `out`.
+Multiple outputs should be named `foo_out`, `bar_out`, etc.
+
+Parameters of type `git_oid` should be named `id`, or `foo_id`. Calls that
+return an OID should be named `git_foo_id`.
+
+Where a callback function is used, the function should also include a
+user-supplied extra input that is a `void *` named "payload" that will be
+passed through to the callback at each invocation.
+
+## Typedefs
+
+Wherever possible, use `typedef`. In some cases, if a structure is just a
+collection of function pointers, the pointer types don't need to be
+separately typedef'd, but loose function pointer types should be.
+
+## Exports
+
+All exported functions must be declared as:
+
+```c
+GIT_EXTERN(result_type) git_modulename_functionname(arg_list);
+```
+
+## Internals
+
+Functions whose *modulename* is followed by two underscores,
+for example `git_odb__read_packed`, are semi-private functions.
+They are primarily intended for use within the library itself,
+and may disappear or change their signature in a future release.
+
+## Parameters
+
+Out parameters come first.
+
+Whenever possible, pass argument pointers as `const`. Some structures (such
+as `git_repository` and `git_index`) have mutable internal structure that
+prevents this.
+
+Callbacks should always take a `void *` payload as their last parameter.
+Callback pointers are grouped with their payloads, and typically come last
+when passed as arguments:
+
+```c
+int git_foo(git_repository *repo, git_foo_cb callback, void *payload);
+```
+
+## Memory Ownership
+
+Some APIs allocate memory which the caller is responsible for freeing; others
+return a pointer into a buffer that's owned by some other object. Make this
+explicit in the documentation.
+
+## Return codes
+
+Most public APIs should return an `int` error code. As is typical with most
+C library functions, a zero value indicates success and a negative value
+indicates failure.
+
+Some bindings will transform these returned error codes into exception
+types, so returning a semantically appropriate error code is important.
+Check
+[`include/git2/errors.h`](https://github.com/libgit2/libgit2/blob/development/include/git2/errors.h)
+for the return codes already defined.
+
+In your implementation, use `git_error_set()` to provide extended error
+information to callers.
+
+If a `libgit2` function internally invokes another function that reports an
+error, but the error is not propagated up, use `git_error_clear()` to prevent
+callers from getting the wrong error message later on.
+
+
+## Structs
+
+Most public types should be opaque, e.g.:
+
+```C
+typedef struct git_odb git_odb;
+```
+
+...with allocation functions returning an "instance" created within
+the library, and not within the application. This allows the type
+to grow (or shrink) in size without rebuilding client code.
+
+To preserve ABI compatibility, include an `int version` field in all transparent
+structures, and initialize to the latest version in the constructor call.
+Increment the "latest" version whenever the structure changes, and try to only
+append to the end of the structure.
+
+## Option Structures
+
+If a function's parameter count is too high, it may be desirable to package
+up the options in a structure. Make them transparent, include a version
+field, and provide an initializer constant or constructor. Using these
+structures should be this easy:
+
+```C
+git_foo_options opts = GIT_FOO_OPTIONS_INIT;
+opts.baz = BAZ_OPTION_ONE;
+git_foo(&opts);
+```
+
+## Enumerations
+
+Typedef all enumerated types. If each option stands alone, use the enum
+type for passing them as parameters; if they are flags to be OR'ed together,
+pass them as `unsigned int` or `uint32_t` or some appropriate type.
+
+## Code Layout
+
+Try to keep lines less than 80 characters long. This is a loose
+requirement, but going significantly over 80 columns is not nice.
+
+Use common sense to wrap most code lines; public function declarations
+can use a couple of different styles:
+
+```c
+/** All on one line is okay if it fits */
+GIT_EXTERN(int) git_foo_simple(git_oid *id);
+
+/** Otherwise one argument per line is a good next step */
+GIT_EXTERN(int) git_foo_id(
+ git_oid **out,
+ int a,
+ int b);
+```
+
+Indent with tabs; set your editor's tab width to eight for best effect.
+
+Avoid trailing whitespace and only commit Unix-style newlines (i.e. no CRLF
+in the repository - just set `core.autocrlf` to true if you are writing code
+on a Windows machine).
+
+## Documentation
+
+All comments should conform to Doxygen "javadoc" style conventions for
+formatting the public API documentation. Try to document every parameter,
+and keep the comments up to date if you change the parameter list.
+
+## Public Header Template
+
+Use this template when creating a new public header.
+
+```C
+#ifndef INCLUDE_git_${filename}_h__
+#define INCLUDE_git_${filename}_h__
+
+#include "git/common.h"
+
+/**
+ * @file git/${filename}.h
+ * @brief Git some description
+ * @defgroup git_${filename} some description routines
+ * @ingroup Git
+ * @{
+ */
+GIT_BEGIN_DECL
+
+/* ... definitions ... */
+
+/** @} */
+GIT_END_DECL
+#endif
+```
+
+## Inlined functions
+
+All inlined functions must be declared as:
+
+```C
+GIT_INLINE(result_type) git_modulename_functionname(arg_list);
+```
+
+`GIT_INLINE` (or `inline`) should not be used in public headers in order
+to preserve ANSI C compatibility.
+
+## Tests
+
+`libgit2` uses the [clar](https://github.com/vmg/clar) testing framework.
+
+All PRs should have corresponding tests.
+
+* If the PR fixes an existing issue, the test should fail prior to applying
+ the PR and succeed after applying it.
+* If the PR is for new functionality, then the tests should exercise that
+ new functionality to a certain extent. We don't require 100% coverage
+ right now (although we are getting stricter over time).
+
+When adding new tests, we prefer if you attempt to reuse existing test data
+(in `tests-clar/resources/`) if possible. If you are going to add new test
+repositories, please try to strip them of unnecessary files (e.g. sample
+hooks, etc).
--- /dev/null
+# Differences from Git
+
+In some instances, the functionality of libgit2 deviates slightly from Git. This can be because of technical limitations when developing a library, licensing limitations when converting functionality from Git to libgit2, or various other reasons.
+
+Repository and Workdir Path Reporting
+-------------------------------------
+
+When asking Git for the absolute path of a repository via `git rev-parse --absolute-git-dir`, it will output the path to the ".git" folder without a trailing slash. In contrast to that, the call `git_repository_path(repo)` will return the path with a trailing slash:
+
+```
+git rev-parse --absolute-git-dir -> /home/user/projects/libgit2/.git
+git_repository_path(repo) -> /home/user/projects/libgit2/.git/
+```
+
+The same difference exists when listing worktrees:
+
+```
+git worktree list -> /home/user/projects/libgit2
+git_repository_workdir(repo) -> /home/user/projects/libgit2/
+```
+
+Windows Junction Points
+-----------------------
+
+In libgit2, junction points are treated like symbolic links. They're handled specially in `git_win32__file_attribute_to_stat` in `src/win/w32_util.h`. This means that libgit2 tracks the directory itself as a link.
+
+In Git for Windows, junction points are treated like regular directories. This means that Git for Windows tracks the contents of the directory.
(e.g. running out of memory or system corruption).
When a negative value is returned, an error message is also set. The
-message can be accessed via the `giterr_last` function which will return a
+message can be accessed via the `git_error_last` function which will return a
pointer to a `git_error` structure containing the error message text and
the class of error (i.e. what part of the library generated the error).
int error = git_repository_open(&repo, "path/to/repo");
if (error < 0) {
- fprintf(stderr, "Could not open repository: %s\n", giterr_last()->message);
+ fprintf(stderr, "Could not open repository: %s\n", git_error_last()->message);
exit(1);
}
fprintf(stderr, "Could not find repository at path '%s'\n", path);
else
fprintf(stderr, "Unable to open repository: %s\n",
- giterr_last()->message);
+ git_error_last()->message);
exit(1);
}
Some of the higher-level language bindings may use a range of information
from libgit2 to convert error return codes into exceptions, including the
specific error return codes and even the class of error and the error
-message returned by `giterr_last`, but the full range of that logic is
+message returned by `git_error_last`, but the full range of that logic is
beyond the scope of this document.
Example internal implementation
{
/* perform some logic to open the repository */
if (p_exists(path) < 0) {
- giterr_set(GITERR_REPOSITORY, "The path '%s' doesn't exist", path);
+ git_error_set(GIT_ERROR_REPOSITORY, "The path '%s' doesn't exist", path);
return GIT_ENOTFOUND;
}
}
~~~
+Note that some error codes have been defined with a specific meaning in the
+context of callbacks:
+- `GIT_EUSER` provides a way to bubble up a non libgit2-related failure, which
+ allows it to be preserved all the way up to the initial function call (a `git_cred`
+ setup trying to access an unavailable LDAP server for instance).
+- `GIT_EPASSTHROUGH` provides a way to tell libgit2 that it should behave as if
+ no callback was provided. This is of special interest to bindings, which would
+ always provide a C function as a "trampoline", and decide at runtime what to do.
+
The public error API
--------------------
-- `const git_error *giterr_last(void)`: The main function used to look up
+- `const git_error *git_error_last(void)`: The main function used to look up
the last error. This may return NULL if no error has occurred.
Otherwise this should return a `git_error` object indicating the class
of error and the error message that was generated by the library.
+ Do not use this function unless the prior call to a libgit2 API
+ returned an error, as it can otherwise give misleading results.
+ libgit2's error strings are not cleared aggressively,
+ and this function may return an error string that reflects a prior error,
+ possibly even reflecting internal state.
The last error is stored in thread-local storage when libgit2 is
compiled with thread support, so you do not have to worry about another
bugs, but in the meantime, please code defensively and check for NULL
when calling this function.
-- `void giterr_clear(void)`: This function clears the last error. The
+- `void git_error_clear(void)`: This function clears the last error. The
library will call this when an error is generated by low level function
and the higher level function handles the error.
function's error message is not cleared by higher level code that
handles the error and returns zero. Please report these as bugs, but in
the meantime, a zero return value from a libgit2 API does not guarantee
- that `giterr_last()` will return NULL.
+ that `git_error_last()` will return NULL.
-- `void giterr_set_str(int error_class, const char *message)`: This
+- `void git_error_set(int error_class, const char *message)`: This
function can be used when writing a custom backend module to set the
libgit2 error message. See the documentation on this function for its
use. Normal usage of libgit2 will probably never need to call this API.
-- `void giterr_set_oom(void)`: This is a standard function for reporting
+- `void git_error_set_oom(void)`: This is a standard function for reporting
an out-of-memory error. It is written in a manner that it doesn't have
to allocate any extra memory in order to record the error, so this is
the best way to report that scenario.
negative value but not set an error message and some other functions may
return zero (no error) and yet leave an error message set. Please report
these cases as issues and they will be fixed. In the meanwhile, please
-code defensively, checking that the return value of `giterr_last` is not
-NULL before using it, and not relying on `giterr_last` to return NULL when
+code defensively, checking that the return value of `git_error_last` is not
+NULL before using it, and not relying on `git_error_last` to return NULL when
a function returns 0 for success.
The internal error API
----------------------
-- `void giterr_set(int error_class, const char *fmt, ...)`: This is the
+- `void git_error_set(int error_class, const char *fmt, ...)`: This is the
main internal function for setting an error. It works like `printf` to
- format the error message. See the notes of `giterr_set_str` for a
+ format the error message. See the notes of `git_error_set_str` for a
general description of how error messages are stored (and also about
- special handling for `error_class` of `GITERR_OS`).
+ special handling for `error_class` of `GIT_ERROR_OS`).
Writing error messages
----------------------
...
if (git_commit_lookup(parent, repo, parent_id) < 0) {
- giterr_set(GITERR_COMMIT, "Overwrite lookup error message");
+ git_error_set(GIT_ERROR_COMMIT, "Overwrite lookup error message");
return -1; /* mask error code */
}
--- /dev/null
+# Fuzzing
+
+libgit2 is currently using [libFuzzer](https://libfuzzer.info) to perform
+automated fuzz testing. libFuzzer only works with clang.
+
+## Prerequisites** for building fuzz targets:
+
+1. All the prerequisites for [building libgit2](https://github.com/libgit2/libgit2).
+2. A recent version of clang. 6.0 is preferred. [pre-build Debian/Ubuntu
+ packages](https://github.com/libgit2/libgit2)
+
+## Build
+
+1. Create a build directory beneath the libgit2 source directory, and change
+ into it: `mkdir build && cd build`
+2. Choose one sanitizers to add. The currently supported sanitizers are
+ [`address`](https://clang.llvm.org/docs/AddressSanitizer.html),
+ [`undefined`](https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html),
+ and [`leak`/`address,leak`](https://clang.llvm.org/docs/LeakSanitizer.html).
+3. Create the cmake build environment and configure the build with the
+ sanitizer chosen: `CC=/usr/bin/clang-6.0 CFLAGS="-fsanitize=address" cmake
+ -DBUILD_CLAR=OFF -DBUILD_FUZZERS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo ..`.
+ Note that building the fuzzer targets is incompatible with the
+ tests and examples.
+4. Build libgit2: `cmake --build .`
+5. Exit the cmake build environment: `cd ..`
+
+## Run the fuzz targets
+
+1. `ASAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolize-6.0
+ LSAN_OPTIONS=allocator_may_return_null=1
+ ASAN_OPTIONS=allocator_may_return_null=1 ./build/fuzz/fuzz_packfile_raw
+ fuzz/corpora/fuzz_packfile_raw/`
+
+The `LSAN_OPTIONS` and `ASAN_OPTIONS` are there to allow `malloc(3)` to return
+`NULL`. The `LLVM_PROFILE_FILE` is there to override the path where libFuzzer
+will write the coverage report.
+
+## Get coverage
+
+In order to get coverage information, you need to add the "-fcoverage-mapping"
+and "-fprofile-instr-generate CFLAGS, and then run the fuzz target with
+`-runs=0`. That will produce a file called `default.profraw` (this behavior can
+be overridden by setting the `LLVM_PROFILE_FILE="yourfile.profraw"` environment
+variable).
+
+1. `llvm-profdata-6.0 merge -sparse default.profraw -o
+ fuzz_packfile_raw.profdata` transforms the data from a sparse representation
+ into a format that can be used by the other tools.
+2. `llvm-cov-6.0 report ./build/fuzz/fuzz_packfile_raw
+ -instr-profile=fuzz_packfile_raw.profdata` shows a high-level per-file
+ coverage report.
+3. `llvm-cov-6.0 show ./build/fuzz/fuzz_packfile_raw
+ -instr-profile=fuzz_packfile_raw.profdata [source file]` shows a line-by-line
+ coverage analysis of all the codebase (or a single source file).
+
+## Standalone mode
+
+In order to ensure that there are no regresions, each fuzzer target can be run
+in a standalone mode. This can be done by passing `-DUSE_STANDALONE_FUZZERS=ON`.
+This makes it compatible with gcc. This does not use the fuzzing engine, but
+just invokes every file in the chosen corpus.
+
+In order to get full coverage, though, you might want to also enable one of the
+sanitizers. You might need a recent version of clang to get full support.
+
+## References
+
+* [libFuzzer](https://llvm.org/docs/LibFuzzer.html) documentation.
+* [Source-based Code
+ Coverage](https://clang.llvm.org/docs/SourceBasedCodeCoverage.html).
--- /dev/null
+Projects For LibGit2
+====================
+
+So, you want to start helping out with `libgit2`? That's fantastic! We
+welcome contributions and we promise we'll try to be nice.
+
+This is a list of libgit2 related projects that new contributors can take
+on. It includes a number of good starter projects as well as some larger
+ideas that no one is actively working on.
+
+## Before You Start
+
+Please start by reading the [README.md](../README.md),
+[contributing.md](contributing.md), and [conventions.md](conventions.md)
+files before diving into one of these projects. Those explain our work
+flow and coding conventions to help ensure that your work will be easily
+integrated into libgit2.
+
+Next, work through the build instructions and make sure you can clone the
+repository, compile it, and run the tests successfully. That will make
+sure that your development environment is set up correctly and you are
+ready to start on libgit2 development.
+
+## Starter Projects
+
+These are good small projects to get started with libgit2.
+
+* Look at the `examples/` programs, find an existing one that mirrors a
+ core Git command and add a missing command-line option. There are many
+ gaps right now and this helps demonstrate how to use the library. Here
+ are some specific ideas (though there are many more):
+ * Fix the `examples/diff.c` implementation of the `-B`
+ (a.k.a. `--break-rewrites`) command line option to actually look for
+ the optional `[<n>][/<m>]` configuration values. There is an
+ existing comment that reads `/* TODO: parse thresholds */`. The
+ trick to this one will be doing it in a manner that is clean and
+ simple, but still handles the various cases correctly (e.g. `-B/70%`
+ is apparently a legal setting).
+ * As an extension to the matching idea for `examples/log.c`, add the
+ `-i` option to use `strcasestr()` for matches.
+ * For `examples/log.c`, implement the `--first-parent` option now that
+ libgit2 supports it in the revwalk API.
+* Pick a Git command that is not already emulated in `examples/` and write
+ a new example that mirrors the behavior. Examples don't have to be
+ perfect emulations, but should demonstrate how to use the libgit2 APIs
+ to get results that are similar to Git commands. This lets you (and us)
+ easily exercise a particular facet of the API and measure compatibility
+ and feature parity with core git.
+* Submit a PR to clarify documentation! While we do try to document all of
+ the APIs, your fresh eyes on the documentation will find areas that are
+ confusing much more easily.
+
+If none of these appeal to you, take a look at our issues list to see if
+there are any unresolved issues you'd like to jump in on.
+
+## Larger Projects
+
+These are ideas for larger projects mostly taken from our backlog of
+[Issues](https://github.com/libgit2/libgit2/issues). Please don't dive
+into one of these as a first project for libgit2 - we'd rather get to
+know you first by successfully shipping your work on one of the smaller
+projects above.
+
+Some of these projects are broken down into subprojects and/or have
+some incremental steps listed towards the larger goal. Those steps
+might make good smaller projects by themselves.
+
+* Port part of the Git test suite to run against the command line emulation
+ in `examples/`
+ * Pick a Git command that is emulated in our `examples/` area
+ * Extract the Git tests that exercise that command
+ * Convert the tests to call our emulation
+ * These tests could go in `examples/tests/`...
+* Add hooks API to enumerate and manage hooks (not run them at this point)
+ * Enumeration of available hooks
+ * Lookup API to see which hooks have a script and get the script
+ * Read/write API to load a hook script and write a hook script
+ * Eventually, callback API to invoke a hook callback when libgit2
+ executes the action in question
+* Isolate logic of ignore evaluation into a standalone API
+* Upgrade internal libxdiff code to latest from core Git
+* Tree builder improvements:
+ * Extend to allow building a tree hierarchy
+* Apply-patch API
+* Add a patch editing API to enable "git add -p" type operations
+* Textconv API to filter binary data before generating diffs (something
+ like the current Filter API, probably).
+* Performance profiling and improvement
+* Support "git replace" ref replacements
+* Include conflicts in diff results and in status
+ * GIT_DELTA_CONFLICT for items in conflict (with multiple files)
+ * Appropriate flags for status
+* Support sparse checkout (i.e. "core.sparsecheckout" and ".git/info/sparse-checkout")
Let's release v0.X, codenamed: <something witty>
- - [ ] Bump the versions in the headers
+ - [ ] Bump the versions in the headers (`include/git2/version.h`)
+ - [ ] Bump the versions in the clib manifest (`package.json`)
- [ ] Make a release candidate
- [ ] Plug any final leaks
- [ ] Fix any last-minute issues
- - [ ] Make sure CHANGELOG reflects everything worth discussing
- - [ ] Update the version in CHANGELOG and the header
+ - [ ] Make sure changelog.md reflects everything worth discussing
+ - [ ] Update the version in changelog.md and the header
- [ ] Produce a release candidate
- [ ] Tag
- [ ] Create maint/v0.X
Preparing the first release candidate includes updating the version number of libgit2 to the new version number. To do so, a pull request shall be submitted that adjusts the version number in the following places:
-- CHANGELOG.md
+- docs/changelog.md
- include/git2/version.h
+- package.json
As soon as the pull request is merged, the merge commit shall be tagged with a lightweight tag.
-The tagging happens via GitHub's "releases" tab which lets us attach release notes to a particular tag. In the description we include the changes in `CHANGELOG.md` between the last full release. Use the following as a base for the release notes
+The tagging happens via GitHub's "releases" tab which lets us attach release notes to a particular tag. In the description we include the changes in `docs/changelog.md` between the last full release. Use the following as a base for the release notes
This is the first release of the v0.X series, <codename>. The changelog follows.
--- /dev/null
+Threads in libgit2
+==================
+
+You may safely use any libgit2 object from any thread, though there
+may be issues depending on the cryptographic libraries libgit2 or its
+dependencies link to (more on this later). For libgit2 itself,
+provided you take the following into consideration you won't run into
+issues:
+
+Sharing objects
+---------------
+
+Use an object from a single thread at a time. Most data structures do
+not guard against concurrent access themselves. This is because they
+are rarely used in isolation and it makes more sense to synchronize
+access via a larger lock or similar mechanism.
+
+There are some objects which are read-only/immutable and are thus safe
+to share across threads, such as references and configuration
+snapshots.
+
+Error messages
+--------------
+
+The error message is thread-local. The `git_error_last()` call must
+happen on the same thread as the error in order to get the
+message. Often this will be the case regardless, but if you use
+something like the [GCD](http://en.wikipedia.org/wiki/Grand_Central_Dispatch)
+on Mac OS X (where code is executed on an arbitrary thread), the code
+must make sure to retrieve the error code on the thread where the error
+happened.
+
+Threads and cryptographic libraries
+=======================================
+
+On Windows
+----------
+
+When built as a native Windows DLL, libgit2 uses WinCNG and WinHTTP,
+both of which are thread-safe. You do not need to do anything special.
+
+When using libssh2 which itself uses WinCNG, there are no special
+steps necessary. If you are using a MinGW or similar environment where
+libssh2 uses OpenSSL or libgcrypt, then the general case affects
+you.
+
+On Mac OS X
+-----------
+
+By default we use libcurl to perform the encryption. The
+system-provided libcurl uses SecureTransport, so no special steps are
+necessary. If you link against another libcurl (e.g. from homebrew)
+refer to the general case.
+
+If the option to use libcurl was deactivated, the library makes use of
+CommonCrypto and SecureTransport for cryptographic support. These are
+thread-safe and you do not need to do anything special.
+
+Note that libssh2 may still use OpenSSL itself. In that case, the
+general case still affects you if you use ssh.
+
+General Case
+------------
+
+If it's available, by default we use libcurl to provide HTTP tunneling support,
+which may be linked against a number of cryptographic libraries and has its
+own
+[recommendations for thread safety](https://curl.haxx.se/libcurl/c/threadsafe.html).
+
+If there are no alternative TLS implementations (currently only
+SecureTransport), libgit2 uses OpenSSL in order to use HTTPS as a transport.
+OpenSSL is thread-safe starting at version 1.1.0. If your copy of libgit2 is
+linked against that version, you do not need to take any further steps.
+
+Older versions of OpenSSL are made to be thread-implementation agnostic, and the
+users of the library must set which locking function it should use. libgit2
+cannot know what to set as the user of libgit2 may also be using OpenSSL independently and
+the locking settings must then live outside the lifetime of libgit2.
+
+Even if libgit2 doesn't use OpenSSL directly, OpenSSL can still be used by
+libssh2 or libcurl depending on the configuration. If OpenSSL is used by
+more than one library, you only need to set up threading for OpenSSL once.
+
+If libgit2 is linked against OpenSSL, it provides a last-resort convenience function
+`git_openssl_set_locking()` (available in `sys/openssl.h`) to use the
+platform-native mutex mechanisms to perform the locking, which you can use
+if you do not want to use OpenSSL outside of libgit2, or you
+know that libgit2 will outlive the rest of the operations. It is then not
+safe to use OpenSSL multi-threaded after libgit2's shutdown function
+has been called. Note `git_openssl_set_locking()` only works if
+libgit2 uses OpenSSL directly - if OpenSSL is only used as a dependency
+of libssh2 or libcurl as described above, `git_openssl_set_locking()` is a no-op.
+
+If your programming language offers a package/bindings for OpenSSL,
+you should very strongly prefer to use that in order to set up
+locking, as they provide a level of coordination which is impossible
+when using this function.
+
+See the
+[OpenSSL documentation](https://www.openssl.org/docs/crypto/threads.html)
+on threading for more details, and http://trac.libssh2.org/wiki/MultiThreading
+for a specific example of providing the threading callbacks.
+
+libssh2 may be linked against OpenSSL or libgcrypt. If it uses OpenSSL,
+see the above paragraphs. If it uses libgcrypt, then you need to
+set up its locking before using it multi-threaded. libgit2 has no
+direct connection to libgcrypt and thus has no convenience functions for
+it (but libgcrypt has macros). Read libgcrypt's
+[threading documentation for more information](http://www.gnupg.org/documentation/manuals/gcrypt/Multi_002dThreading.html)
+
+It is your responsibility as an application author or packager to know
+what your dependencies are linked against and to take the appropriate
+steps to ensure the cryptographic libraries are thread-safe. We agree
+that this situation is far from ideal but at this time it is something
+the application authors need to deal with.
--- /dev/null
+Troubleshooting libgit2 Problems
+================================
+
+CMake Failures
+--------------
+
+* **`Asked for OpenSSL TLS backend, but it wasn't found`**
+ CMake cannot find your SSL/TLS libraries. By default, libgit2 always
+ builds with HTTPS support, and you are encouraged to install the
+ OpenSSL libraries for your system (eg, `apt-get install libssl-dev`).
+
+ For development, if you simply want to disable HTTPS support entirely,
+ pass the `-DUSE_HTTPS=OFF` argument to `cmake` when configuring it.
INCLUDE_DIRECTORIES(${LIBGIT2_INCLUDES})
+INCLUDE_DIRECTORIES(SYSTEM ${LIBGIT2_SYSTEM_INCLUDES})
FILE(GLOB_RECURSE SRC_EXAMPLE_GIT2 network/*.c network/*.h common.?)
ADD_EXECUTABLE(cgit2 ${SRC_EXAMPLE_GIT2})
+SET_TARGET_PROPERTIES(cgit2 PROPERTIES C_STANDARD 90)
+
+# Ensure that we do not use deprecated functions internally
+ADD_DEFINITIONS(-DGIT_DEPRECATE_HARD)
+
IF(WIN32 OR ANDROID)
TARGET_LINK_LIBRARIES(cgit2 git2)
ELSE()
IF(NOT ${app_name} STREQUAL "common")
ADD_EXECUTABLE(${app_name} ${src_app} "common.c")
TARGET_LINK_LIBRARIES(${app_name} git2)
+ SET_TARGET_PROPERTIES(${app_name} PROPERTIES C_STANDARD 90)
ENDIF()
ENDFOREACH()
case SHOW_PRETTY:
switch (git_object_type(obj)) {
- case GIT_OBJ_BLOB:
+ case GIT_OBJECT_BLOB:
show_blob((const git_blob *)obj);
break;
- case GIT_OBJ_COMMIT:
+ case GIT_OBJECT_COMMIT:
show_commit((const git_commit *)obj);
break;
- case GIT_OBJ_TREE:
+ case GIT_OBJECT_TREE:
show_tree((const git_tree *)obj);
break;
- case GIT_OBJ_TAG:
+ case GIT_OBJECT_TAG:
show_tag((const git_tag *)obj);
break;
default:
--- /dev/null
+/*
+ * libgit2 "checkout" example - shows how to perform checkouts
+ *
+ * Written by the libgit2 contributors
+ *
+ * To the extent possible under law, the author(s) have dedicated all copyright
+ * and related and neighboring rights to this software to the public domain
+ * worldwide. This software is distributed without any warranty.
+ *
+ * You should have received a copy of the CC0 Public Domain Dedication along
+ * with this software. If not, see
+ * <http://creativecommons.org/publicdomain/zero/1.0/>.
+ */
+
+#include "common.h"
+#include <assert.h>
+
+/* Define the printf format specifer to use for size_t output */
+#if defined(_MSC_VER) || defined(__MINGW32__)
+# define PRIuZ "Iu"
+# define PRIxZ "Ix"
+# define PRIdZ "Id"
+#else
+# define PRIuZ "zu"
+# define PRIxZ "zx"
+# define PRIdZ "zd"
+#endif
+
+/**
+ * The following example demonstrates how to do checkouts with libgit2.
+ *
+ * Recognized options are :
+ * --force: force the checkout to happen.
+ * --[no-]progress: show checkout progress, on by default.
+ * --perf: show performance data.
+ */
+
+typedef struct {
+ int force : 1;
+ int progress : 1;
+ int perf : 1;
+} checkout_options;
+
+static void print_usage(void)
+{
+ fprintf(stderr, "usage: checkout [options] <branch>\n"
+ "Options are :\n"
+ " --git-dir: use the following git repository.\n"
+ " --force: force the checkout.\n"
+ " --[no-]progress: show checkout progress.\n"
+ " --perf: show performance data.\n");
+ exit(1);
+}
+
+static void parse_options(const char **repo_path, checkout_options *opts, struct args_info *args)
+{
+ if (args->argc <= 1)
+ print_usage();
+
+ memset(opts, 0, sizeof(*opts));
+
+ /* Default values */
+ opts->progress = 1;
+
+ for (args->pos = 1; args->pos < args->argc; ++args->pos) {
+ const char *curr = args->argv[args->pos];
+ int bool_arg;
+
+ if (strcmp(curr, "--") == 0) {
+ break;
+ } else if (!strcmp(curr, "--force")) {
+ opts->force = 1;
+ } else if (match_bool_arg(&bool_arg, args, "--progress")) {
+ opts->progress = bool_arg;
+ } else if (match_bool_arg(&bool_arg, args, "--perf")) {
+ opts->perf = bool_arg;
+ } else if (match_str_arg(repo_path, args, "--git-dir")) {
+ continue;
+ } else {
+ break;
+ }
+ }
+}
+
+/**
+ * This function is called to report progression, ie. it's called once with
+ * a NULL path and the number of total steps, then for each subsequent path,
+ * the current completed_step value.
+ */
+static void print_checkout_progress(const char *path, size_t completed_steps, size_t total_steps, void *payload)
+{
+ (void)payload;
+ if (path == NULL) {
+ printf("checkout started: %" PRIuZ " steps\n", total_steps);
+ } else {
+ printf("checkout: %s %" PRIuZ "/%" PRIuZ "\n", path, completed_steps, total_steps);
+ }
+}
+
+/**
+ * This function is called when the checkout completes, and is used to report the
+ * number of syscalls performed.
+ */
+static void print_perf_data(const git_checkout_perfdata *perfdata, void *payload)
+{
+ (void)payload;
+ printf("perf: stat: %" PRIuZ " mkdir: %" PRIuZ " chmod: %" PRIuZ "\n",
+ perfdata->stat_calls, perfdata->mkdir_calls, perfdata->chmod_calls);
+}
+
+/**
+ * This is the main "checkout <branch>" function, responsible for performing
+ * a branch-based checkout.
+ */
+static int perform_checkout_ref(git_repository *repo, git_annotated_commit *target, checkout_options *opts)
+{
+ git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT;
+ git_commit *target_commit = NULL;
+ int err;
+
+ /** Setup our checkout options from the parsed options */
+ checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE;
+ if (opts->force)
+ checkout_opts.checkout_strategy = GIT_CHECKOUT_FORCE;
+
+ if (opts->progress)
+ checkout_opts.progress_cb = print_checkout_progress;
+
+ if (opts->perf)
+ checkout_opts.perfdata_cb = print_perf_data;
+
+ /** Grab the commit we're interested to move to */
+ err = git_commit_lookup(&target_commit, repo, git_annotated_commit_id(target));
+ if (err != 0) {
+ fprintf(stderr, "failed to lookup commit: %s\n", git_error_last()->message);
+ goto cleanup;
+ }
+
+ /**
+ * Perform the checkout so the workdir corresponds to what target_commit
+ * contains.
+ *
+ * Note that it's okay to pass a git_commit here, because it will be
+ * peeled to a tree.
+ */
+ err = git_checkout_tree(repo, (const git_object *)target_commit, &checkout_opts);
+ if (err != 0) {
+ fprintf(stderr, "failed to checkout tree: %s\n", git_error_last()->message);
+ goto cleanup;
+ }
+
+ /**
+ * Now that the checkout has completed, we have to update HEAD.
+ *
+ * Depending on the "origin" of target (ie. it's an OID or a branch name),
+ * we might need to detach HEAD.
+ */
+ if (git_annotated_commit_ref(target)) {
+ err = git_repository_set_head(repo, git_annotated_commit_ref(target));
+ } else {
+ err = git_repository_set_head_detached_from_annotated(repo, target);
+ }
+ if (err != 0) {
+ fprintf(stderr, "failed to update HEAD reference: %s\n", git_error_last()->message);
+ goto cleanup;
+ }
+
+cleanup:
+ git_commit_free(target_commit);
+
+ return err;
+}
+
+/** That example's entry point */
+int main(int argc, char **argv)
+{
+ git_repository *repo = NULL;
+ struct args_info args = ARGS_INFO_INIT;
+ checkout_options opts;
+ git_repository_state_t state;
+ git_annotated_commit *checkout_target = NULL;
+ int err = 0;
+ const char *path = ".";
+
+ /** Parse our command line options */
+ parse_options(&path, &opts, &args);
+
+ /** Initialize the library */
+ err = git_libgit2_init();
+ if (!err)
+ check_lg2(err, "Failed to initialize libgit2", NULL);
+
+ /** Open the repository corresponding to the options */
+ check_lg2(git_repository_open_ext(&repo, path, 0, NULL),
+ "Could not open repository", NULL);
+
+ /** Make sure we're not about to checkout while something else is going on */
+ state = git_repository_state(repo);
+ if (state != GIT_REPOSITORY_STATE_NONE) {
+ fprintf(stderr, "repository is in unexpected state %d\n", state);
+ goto cleanup;
+ }
+
+ if (args.pos >= args.argc) {
+ fprintf(stderr, "unhandled\n");
+ err = -1;
+ goto cleanup;
+ } else if (strcmp("--", args.argv[args.pos])) {
+ /**
+ * Try to checkout the given path
+ */
+
+ fprintf(stderr, "unhandled path-based checkout\n");
+ err = 1;
+ goto cleanup;
+ } else {
+ /**
+ * Try to resolve a "refish" argument to a target libgit2 can use
+ */
+ err = resolve_refish(&checkout_target, repo, args.argv[args.pos]);
+ if (err != 0) {
+ fprintf(stderr, "failed to resolve %s: %s\n", args.argv[args.pos], git_error_last()->message);
+ goto cleanup;
+ }
+ err = perform_checkout_ref(repo, checkout_target, &opts);
+ }
+
+cleanup:
+ git_annotated_commit_free(checkout_target);
+
+ git_repository_free(repo);
+ git_libgit2_shutdown();
+
+ return err;
+}
* <http://creativecommons.org/publicdomain/zero/1.0/>.
*/
+#include <assert.h>
+
#include "common.h"
void check_lg2(int error, const char *message, const char *extra)
if (!error)
return;
- if ((lg2err = giterr_last()) != NULL && lg2err->message != NULL) {
+ if ((lg2err = git_error_last()) != NULL && lg2err->message != NULL) {
lg2msg = lg2err->message;
lg2spacer = " - ";
}
return 1;
}
+int match_bool_arg(int *out, struct args_info *args, const char *opt)
+{
+ const char *found = args->argv[args->pos];
+
+ if (!strcmp(found, opt)) {
+ *out = 1;
+ return 1;
+ }
+
+ if (!strncmp(found, "--no-", strlen("--no-")) &&
+ !strcmp(found + strlen("--no-"), opt + 2)) {
+ *out = 0;
+ return 1;
+ }
+
+ *out = -1;
+ return 0;
+}
+
int is_integer(int *out, const char *str, int allow_negative)
{
return match_int_internal(out, str, allow_negative, NULL);
"looking up object", treeish);
check_lg2(
- git_object_peel((git_object **)out, obj, GIT_OBJ_TREE),
+ git_object_peel((git_object **)out, obj, GIT_OBJECT_TREE),
"resolving object to tree", treeish);
git_object_free(obj);
return p;
}
+int resolve_refish(git_annotated_commit **commit, git_repository *repo, const char *refish)
+{
+ git_reference *ref;
+ git_object *obj;
+ int err = 0;
+
+ assert(commit != NULL);
+
+ err = git_reference_dwim(&ref, repo, refish);
+ if (err == GIT_OK) {
+ git_annotated_commit_from_ref(commit, repo, ref);
+ git_reference_free(ref);
+ return 0;
+ }
+
+ err = git_revparse_single(&obj, repo, refish);
+ if (err == GIT_OK) {
+ err = git_annotated_commit_lookup(commit, repo, git_object_id(obj));
+ git_object_free(obj);
+ }
+
+ return err;
+}
extern int match_int_arg(
int *out, struct args_info *args, const char *opt, int allow_negative);
+/**
+ * Check current `args` entry against a "bool" `opt` (ie. --[no-]progress).
+ * If `opt` matches positively, out will be set to 1, or if `opt` matches
+ * negatively, out will be set to 0, and in both cases 1 will be returned.
+ * If neither the positive or the negative form of opt matched, out will be -1,
+ * and 0 will be returned.
+ */
+extern int match_bool_arg(int *out, struct args_info *args, const char *opt);
+
/**
* Basic output function for plain text diff output
* Pass `FILE*` such as `stdout` or `stderr` as payload (or NULL == `stdout`)
* A realloc that exits on failure
*/
extern void *xrealloc(void *oldp, size_t newsz);
+
+/**
+ * Convert a refish to an annotated commit.
+ */
+extern int resolve_refish(git_annotated_commit **commit, git_repository *repo, const char *refish);
fputs(b.ptr, stdout);
- git_buf_free(&b);
+ git_buf_dispose(&b);
git_diff_stats_free(stats);
}
const git_oid *oid;
git_object *obj;
- if (git_reference_type(ref) == GIT_REF_SYMBOLIC)
+ if (git_reference_type(ref) == GIT_REFERENCE_SYMBOLIC)
check_lg2(git_reference_resolve(&resolved, ref),
"Unable to resolve symbolic reference",
git_reference_name(ref));
oid = git_reference_target(resolved ? resolved : ref);
git_oid_fmt(hex, oid);
hex[GIT_OID_HEXSZ] = 0;
- check_lg2(git_object_lookup(&obj, repo, oid, GIT_OBJ_ANY),
+ check_lg2(git_object_lookup(&obj, repo, oid, GIT_OBJECT_ANY),
"Unable to lookup object", hex);
printf("%s %-6s\t%s\n",
*/
static void check_error(int error_code, const char *action)
{
- const git_error *error = giterr_last();
+ const git_error *error = git_error_last();
if (!error_code)
return;
*/
git_oid_fromstr(oid, hex);
- // Once we've converted the string into the oid value, we can get the raw
- // value of the SHA by accessing `oid.id`
-
- // Next we will convert the 20 byte raw SHA1 value to a human readable 40
- // char hex value.
+ /*
+ * Once we've converted the string into the oid value, we can get the raw
+ * value of the SHA by accessing `oid.id`
+ *
+ * Next we will convert the 20 byte raw SHA1 value to a human readable 40
+ * char hex value.
+ */
printf("\n*Raw to Hex*\n");
out[GIT_OID_HEXSZ] = '\0';
int error;
git_odb_object *obj;
git_odb *odb;
- git_otype otype;
+ git_object_t otype;
git_repository_odb(&odb, repo);
* we'll write a new blob object that just contains a simple string.
* Notice that we have to specify the object type as the `git_otype` enum.
*/
- git_odb_write(oid, odb, "test data", sizeof("test data") - 1, GIT_OBJ_BLOB);
+ git_odb_write(oid, odb, "test data", sizeof("test data") - 1, GIT_OBJECT_BLOB);
/**
* Now that we've written the object, we can check out what SHA1 was
static void tag_parsing(git_repository *repo)
{
git_commit *commit;
- git_otype type;
+ git_object_t type;
git_tag *tag;
git_oid oid;
const char *name, *message;
*/
git_tag_target((git_object **)&commit, tag);
name = git_tag_name(tag); /* "test" */
- type = git_tag_target_type(tag); /* GIT_OBJ_COMMIT (otype enum) */
+ type = git_tag_target_type(tag); /* GIT_OBJECT_COMMIT (object_t enum) */
message = git_tag_message(tag); /* "tag message\n" */
printf("Tag Name: %s\nTag Type: %s\nTag Message: %s\n",
name, git_object_type2string(type), message);
git_reference_lookup(&ref, repo, refname);
switch (git_reference_type(ref)) {
- case GIT_REF_OID:
+ case GIT_REFERENCE_DIRECT:
git_oid_fmt(oid_hex, git_reference_target(ref));
printf("%s [%s]\n", refname, oid_hex);
break;
- case GIT_REF_SYMBOLIC:
+ case GIT_REFERENCE_SYMBOLIC:
printf("%s => %s\n", refname, git_reference_symbolic_target(ref));
break;
default:
git_object_id(revs.from), git_object_id(revs.to)),
"Could not find merge base", revstr);
check_lg2(
- git_object_lookup(&revs.to, s->repo, &base, GIT_OBJ_COMMIT),
+ git_object_lookup(&revs.to, s->repo, &base, GIT_OBJECT_COMMIT),
"Could not find merge base commit", NULL);
push_rev(s, revs.to, hide);
--- /dev/null
+/*
+ * libgit2 "ls-files" example - shows how to view all files currently in the index
+ *
+ * Written by the libgit2 contributors
+ *
+ * To the extent possible under law, the author(s) have dedicated all copyright
+ * and related and neighboring rights to this software to the public domain
+ * worldwide. This software is distributed without any warranty.
+ *
+ * You should have received a copy of the CC0 Public Domain Dedication along
+ * with this software. If not, see
+ * <http://creativecommons.org/publicdomain/zero/1.0/>.
+ */
+
+#include "common.h"
+#include "array.h"
+
+/**
+ * This example demonstrates the libgit2 index APIs to roughly
+ * simulate the output of `git ls-files`.
+ * `git ls-files` has many options and this currently does not show them.
+ *
+ * `git ls-files` base command shows all paths in the index at that time.
+ * This includes staged and committed files, but unstaged files will not display.
+ *
+ * This currently supports the default behavior and the `--error-unmatch` option.
+ */
+
+typedef struct {
+ int error_unmatch;
+ char *files[1024];
+ size_t file_count;
+} ls_options;
+
+static void usage(const char *message, const char *arg)
+{
+ if (message && arg)
+ fprintf(stderr, "%s: %s\n", message, arg);
+ else if (message)
+ fprintf(stderr, "%s\n", message);
+ fprintf(stderr, "usage: ls-files [--error-unmatch] [--] [<file>...]\n");
+ exit(1);
+}
+
+static int parse_options(ls_options *opts, int argc, char *argv[])
+{
+ int parsing_files = 0;
+ int i;
+
+ memset(opts, 0, sizeof(ls_options));
+
+ if (argc < 2)
+ return 0;
+
+ for (i = 1; i < argc; ++i) {
+ char *a = argv[i];
+
+ /* if it doesn't start with a '-' or is after the '--' then it is a file */
+ if (a[0] != '-' || parsing_files) {
+ parsing_files = 1;
+
+ /* watch for overflows (just in case) */
+ if (opts->file_count == 1024) {
+ fprintf(stderr, "ls-files can only support 1024 files at this time.\n");
+ return -1;
+ }
+
+ opts->files[opts->file_count++] = a;
+ } else if (!strcmp(a, "--")) {
+ parsing_files = 1;
+ } else if (!strcmp(a, "--error-unmatch")) {
+ opts->error_unmatch = 1;
+ } else {
+ usage("Unsupported argument", a);
+ return -1;
+ }
+ }
+
+ return 0;
+}
+
+static int print_paths(ls_options *opts, git_index *index)
+{
+ size_t i;
+ const git_index_entry *entry;
+
+ /* if there are no files explicitly listed by the user print all entries in the index */
+ if (opts->file_count == 0) {
+ size_t entry_count = git_index_entrycount(index);
+
+ for (i = 0; i < entry_count; i++) {
+ entry = git_index_get_byindex(index, i);
+ puts(entry->path);
+ }
+ return 0;
+ }
+
+ /* loop through the files found in the args and print them if they exist */
+ for (i = 0; i < opts->file_count; ++i) {
+ const char *path = opts->files[i];
+
+ if ((entry = git_index_get_bypath(index, path, GIT_INDEX_STAGE_NORMAL)) != NULL) {
+ puts(path);
+ } else if (opts->error_unmatch) {
+ fprintf(stderr, "error: pathspec '%s' did not match any file(s) known to git.\n", path);
+ fprintf(stderr, "Did you forget to 'git add'?\n");
+ return -1;
+ }
+ }
+
+ return 0;
+}
+
+int main(int argc, char *argv[])
+{
+ ls_options opts;
+ git_repository *repo = NULL;
+ git_index *index = NULL;
+ int error;
+
+ if ((error = parse_options(&opts, argc, argv)) < 0)
+ return error;
+
+ git_libgit2_init();
+
+ if ((error = git_repository_open_ext(&repo, ".", 0, NULL)) < 0)
+ goto cleanup;
+
+ if ((error = git_repository_index(&index, repo)) < 0)
+ goto cleanup;
+
+ error = print_paths(&opts, index);
+
+cleanup:
+ git_index_free(index);
+ git_repository_free(repo);
+ git_libgit2_shutdown();
+
+ return error;
+}
}
}
-static int resolve_refish(git_annotated_commit **commit, git_repository *repo, const char *refish)
-{
- git_reference *ref;
- int err = 0;
- git_oid oid;
-
- assert(commit != NULL);
-
- err = git_reference_dwim(&ref, repo, refish);
- if (err == GIT_OK) {
- git_annotated_commit_from_ref(commit, repo, ref);
- git_reference_free(ref);
- return 0;
- }
-
- err = git_oid_fromstr(&oid, refish);
- if (err == GIT_OK) {
- err = git_annotated_commit_lookup(commit, repo, &oid);
- }
-
- return err;
-}
-
static int resolve_heads(git_repository *repo, merge_options *opts)
{
git_annotated_commit **annotated = calloc(opts->heads_count, sizeof(git_annotated_commit *));
for (i = 0; i < opts->heads_count; i++) {
err = resolve_refish(&annotated[annotated_count++], repo, opts->heads[i]);
if (err != 0) {
- fprintf(stderr, "failed to resolve refish %s: %s\n", opts->heads[i], giterr_last()->message);
+ fprintf(stderr, "failed to resolve refish %s: %s\n", opts->heads[i], git_error_last()->message);
annotated_count--;
continue;
}
}
/* Lookup the target object */
- err = git_object_lookup(&target, repo, target_oid, GIT_OBJ_COMMIT);
+ err = git_object_lookup(&target, repo, target_oid, GIT_OBJECT_COMMIT);
if (err != 0) {
fprintf(stderr, "failed to lookup OID %s\n", git_oid_tostr_s(target_oid));
return -1;
/* Maybe that's a ref, so DWIM it */
err = git_reference_dwim(&merge_ref, repo, opts->heads[0]);
- check_lg2(err, "failed to DWIM reference", giterr_last()->message);
+ check_lg2(err, "failed to DWIM reference", git_error_last()->message);
/* Grab a signature */
check_lg2(git_signature_now(&sign, "Me", "me@example.com"), "failed to create signature", NULL);
if (err < 0) goto cleanup;
/* Setup our parent commits */
- err = git_reference_peel((git_object **)&parents[0], head_ref, GIT_OBJ_COMMIT);
+ err = git_reference_peel((git_object **)&parents[0], head_ref, GIT_OBJECT_COMMIT);
check_lg2(err, "failed to peel head reference", NULL);
for (i = 0; i < opts->annotated_count; i++) {
git_commit_lookup(&parents[i + 1], repo, git_annotated_commit_id(opts->annotated[i]));
static int sideband_progress(const char *str, int len, void *payload)
{
- (void)payload; // unused
+ (void)payload; /* unused */
printf("remote: %.*s", len, str);
fflush(stdout);
const char *path = argv[2];
int error;
- (void)repo; // unused
+ (void)repo; /* unused */
- // Validate args
+ /* Validate args */
if (argc < 3) {
printf ("USAGE: %s <url> <path>\n", argv[0]);
return -1;
}
- // Set up options
+ /* Set up options */
checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE;
checkout_opts.progress_cb = checkout_progress;
checkout_opts.progress_payload = &pd;
clone_opts.fetch_opts.callbacks.credentials = cred_acquire_cb;
clone_opts.fetch_opts.callbacks.payload = &pd;
- // Do the clone
+ /* Do the clone */
error = git_clone(&cloned_repo, url, path, &clone_opts);
printf("\n");
if (error != 0) {
- const git_error *err = giterr_last();
+ const git_error *err = git_error_last();
if (err) printf("ERROR %d: %s\n", err->klass, err->message);
else printf("ERROR %d: no detailed info\n", error);
}
/* Run the command. If something goes wrong, print the error message to stderr */
error = fn(repo, args.argc - args.pos, &args.argv[args.pos]);
if (error < 0) {
- if (giterr_last() == NULL)
+ if (git_error_last() == NULL)
fprintf(stderr, "Error without message");
else
- fprintf(stderr, "Bad news:\n %s\n", giterr_last()->message);
+ fprintf(stderr, "Bad news:\n %s\n", git_error_last()->message);
}
return !!error;
#endif
#include "common.h"
-// This could be run in the main loop whilst the application waits for
-// the indexing to finish in a worker thread
+/*
+ * This could be run in the main loop whilst the application waits for
+ * the indexing to finish in a worker thread
+ */
static int index_cb(const git_transfer_progress *stats, void *data)
{
(void)data;
return EXIT_FAILURE;
}
- if (git_indexer_new(&idx, ".", 0, NULL, NULL, NULL) < 0) {
+ if (git_indexer_new(&idx, ".", 0, NULL, NULL) < 0) {
puts("bad idx");
return -1;
}
size_t refs_len, i;
git_remote_callbacks callbacks = GIT_REMOTE_CALLBACKS_INIT;
- // Find the remote by name
+ /* Find the remote by name */
error = git_remote_lookup(&remote, repo, name);
if (error < 0) {
error = git_remote_create_anonymous(&remote, repo, name);
check_lg2(git_repository_open(&repo, buf.ptr),
"Could not open repository", NULL);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
switch (opt.cmd)
{
"Failed to lookup rev", name);
switch (git_object_type(obj)) {
- case GIT_OBJ_TAG:
+ case GIT_OBJECT_TAG:
print_tag((git_tag *) obj, state);
break;
- case GIT_OBJ_COMMIT:
+ case GIT_OBJECT_COMMIT:
print_commit((git_commit *) obj, name, state);
break;
default:
printf("Deleted tag '%s' (was %s)\n", opts->tag_name, abbrev_oid.ptr);
- git_buf_free(&abbrev_oid);
+ git_buf_dispose(&abbrev_oid);
git_object_free(obj);
}
--- /dev/null
+LINK_DIRECTORIES(${LIBGIT2_LIBDIRS})
+INCLUDE_DIRECTORIES(${LIBGIT2_INCLUDES})
+
+IF(BUILD_FUZZERS AND NOT USE_STANDALONE_FUZZERS)
+ ADD_C_FLAG(-fsanitize=fuzzer)
+ENDIF ()
+
+FILE(GLOB SRC_FUZZ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *_fuzzer.c)
+FOREACH(fuzz_target_src ${SRC_FUZZ})
+ STRING(REPLACE ".c" "" fuzz_target_name ${fuzz_target_src})
+ SET(${fuzz_target_name}_SOURCES ${fuzz_target_src} ${LIBGIT2_OBJECTS})
+ IF(USE_STANDALONE_FUZZERS)
+ LIST(APPEND ${fuzz_target_name}_SOURCES "standalone_driver.c")
+ ENDIF()
+ ADD_EXECUTABLE(${fuzz_target_name} ${${fuzz_target_name}_SOURCES})
+ SET_TARGET_PROPERTIES(${fuzz_target_name} PROPERTIES C_STANDARD 90)
+ TARGET_LINK_LIBRARIES(${fuzz_target_name} ${LIBGIT2_LIBS})
+ENDFOREACH()
--- /dev/null
+/*
+ * libgit2 config file parser fuzz target.
+ *
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#include <git2.h>
+#include "config_backend.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <limits.h>
+#include <errno.h>
+
+#define UNUSED(x) (void)(x)
+
+int foreach_cb(const git_config_entry *entry, void *payload)
+{
+ UNUSED(entry);
+ UNUSED(payload);
+
+ return 0;
+}
+
+int LLVMFuzzerInitialize(int *argc, char ***argv)
+{
+ UNUSED(argc);
+ UNUSED(argv);
+
+ if (git_libgit2_init() < 0)
+ abort();
+
+ return 0;
+}
+
+int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
+{
+ git_config *cfg = NULL;
+ git_config_backend *backend = NULL;
+ int err = 0;
+
+ if ((err = git_config_new(&cfg)) != 0) {
+ goto out;
+ }
+
+ if ((err = git_config_backend_from_string(&backend, (const char*)data, size)) != 0) {
+ goto out;
+ }
+ if ((err = git_config_add_backend(cfg, backend, 0, NULL, 0)) != 0) {
+ goto out;
+ }
+ /* Now owned by the config */
+ backend = NULL;
+
+ git_config_foreach(cfg, foreach_cb, NULL);
+ out:
+ git_config_backend_free(backend);
+ git_config_free(cfg);
+
+ return 0;
+}
--- /dev/null
+[core]
+ repositoryformatversion = 0
+ filemode = true
+ bare = false
+ logallrefupdates = true
+[remote "origin"]
+ url = git@github.com:libgit2/libgit2
+ fetch = +refs/heads/*:refs/remotes/origin/*
+[branch "master"]
+ remote = origin
+ merge = refs/heads/master
--- /dev/null
+libgit2 - the Git linkable library
+==================================
+
+[](http://travis-ci.org/libgit2/libgit2)
+[](https://ci.appveyor.com/project/libgit2/libgit2/branch/master)
+[](https://scan.coverity.com/projects/639)
+
+`libgit2` is a portable, pure C implementation of the Git core methods
+provided as a linkable library with a solid API, allowing to build Git
+functionality into your application. Language bindings like
+[Rugged](https://github.com/libgit2/rugged) (Ruby),
+[LibGit2Sharp](https://github.com/libgit2/libgit2sharp) (.NET),
+[pygit2](http://www.pygit2.org/) (Python) and
+[NodeGit](http://nodegit.org) (Node) allow you to build Git tooling
+in your favorite language.
+
+`libgit2` is used to power Git GUI clients like
+[GitKraken](https://gitkraken.com/) and [gmaster](https://gmaster.io/)
+and on Git hosting providers like [GitHub](https://github.com/),
+[GitLab](https://gitlab.com/) and
+[Visual Studio Team Services](https://visualstudio.com/team-services/).
+We perform the merge every time you click "merge pull request".
+
+`libgit2` is licensed under a **very permissive license** (GPLv2 with a special
+Linking Exception). This basically means that you can link it (unmodified)
+with any kind of software without having to release its source code.
+Additionally, the example code has been released to the public domain (see the
+[separate license](examples/COPYING) for more information).
+
+Quick Start
+===========
+
+**Prerequisites** for building libgit2:
+
+1. [CMake](https://cmake.org/), and is recommended to be installed into
+ your `PATH`.
+2. [Python](https://www.python.org) is used by our test framework, and
+ should be installed into your `PATH`.
+3. C compiler: libgit2 is C90 and should compile on most compilers.
+ * Windows: Visual Studio is recommended
+ * Mac: Xcode is recommended
+ * Unix: gcc or clang is recommended.
+
+**Build**
+
+1. Create a build directory beneath the libgit2 source directory, and change
+ into it: `mkdir build && cd build`
+2. Create the cmake build environment: `cmake ..`
+3. Build libgit2: `cmake --build .`
+
+Trouble with these steps? Read `TROUBLESHOOTING.md`. More detailed build
+guidance is available below.
+
+Getting Help
+============
+
+**Join us on Slack**
+
+Visit [slack.libgit2.org](http://slack.libgit2.org/) to sign up, then join
+us in `#libgit2`. If you prefer IRC, you can also point your client to our
+slack channel once you've registered.
+
+**Getting Help**
+
+If you have questions about the library, please be sure to check out the
+[API documentation](http://libgit2.github.com/libgit2/). If you still have
+questions, reach out to us on Slack or post a question on
+[StackOverflow](http://stackoverflow.com/questions/tagged/libgit2) (with the `libgit2` tag).
+
+**Reporting Bugs**
+
+Please open a [GitHub Issue](https://github.com/libgit2/libgit2/issues) and
+include as much information as possible. If possible, provide sample code
+that illustrates the problem you're seeing. If you're seeing a bug only
+on a specific repository, please provide a link to it if possible.
+
+We ask that you not open a GitHub Issue for help, only for bug reports.
+
+**Reporting Security Issues**
+
+In case you think to have found a security issue with libgit2, please do not
+open a public issue. Instead, you can report the issue to the private mailing
+list [security@libgit2.com](mailto:security@libgit2.com).
+
+What It Can Do
+==============
+
+libgit2 provides you with the ability to manage Git repositories in the
+programming language of your choice. It's used in production to power many
+applications including GitHub.com, Plastic SCM and Visual Studio Team Services.
+
+It does not aim to replace the git tool or its user-facing commands. Some APIs
+resemble the plumbing commands as those align closely with the concepts of the
+Git system, but most commands a user would type are out of scope for this
+library to implement directly.
+
+The library provides:
+
+* SHA conversions, formatting and shortening
+* abstracted ODB backend system
+* commit, tag, tree and blob parsing, editing, and write-back
+* tree traversal
+* revision walking
+* index file (staging area) manipulation
+* reference management (including packed references)
+* config file management
+* high level repository management
+* thread safety and reentrancy
+* descriptive and detailed error messages
+* ...and more (over 175 different API calls)
+
+As libgit2 is purely a consumer of the Git system, we have to
+adjust to changes made upstream. This has two major consequences:
+
+* Some changes may require us to change provided interfaces. While we try to
+ implement functions in a generic way so that no future changes are required,
+ we cannot promise a completely stable API.
+* As we have to keep up with changes in behavior made upstream, we may lag
+ behind in some areas. We usually to document these incompatibilities in our
+ issue tracker with the label "git change".
+
+Optional dependencies
+=====================
+
+While the library provides git functionality without the need for
+dependencies, it can make use of a few libraries to add to it:
+
+- pthreads (non-Windows) to enable threadsafe access as well as multi-threaded pack generation
+- OpenSSL (non-Windows) to talk over HTTPS and provide the SHA-1 functions
+- LibSSH2 to enable the SSH transport
+- iconv (OSX) to handle the HFS+ path encoding peculiarities
+
+Initialization
+===============
+
+The library needs to keep track of some global state. Call
+
+ git_libgit2_init();
+
+before calling any other libgit2 functions. You can call this function many times. A matching number of calls to
+
+ git_libgit2_shutdown();
+
+will free the resources. Note that if you have worker threads, you should
+call `git_libgit2_shutdown` *after* those threads have exited. If you
+require assistance coordinating this, simply have the worker threads call
+`git_libgit2_init` at startup and `git_libgit2_shutdown` at shutdown.
+
+Threading
+=========
+
+See [THREADING](THREADING.md) for information
+
+Conventions
+===========
+
+See [CONVENTIONS](CONVENTIONS.md) for an overview of the external
+and internal API/coding conventions we use.
+
+Building libgit2 - Using CMake
+==============================
+
+Building
+--------
+
+`libgit2` builds cleanly on most platforms without any external dependencies.
+Under Unix-like systems, like Linux, \*BSD and Mac OS X, libgit2 expects `pthreads` to be available;
+they should be installed by default on all systems. Under Windows, libgit2 uses the native Windows API
+for threading.
+
+The `libgit2` library is built using [CMake](<https://cmake.org/>) (version 2.8 or newer) on all platforms.
+
+On most systems you can build the library using the following commands
+
+ $ mkdir build && cd build
+ $ cmake ..
+ $ cmake --build .
+
+Alternatively you can point the CMake GUI tool to the CMakeLists.txt file and generate platform specific build project or IDE workspace.
+
+Running Tests
+-------------
+
+Once built, you can run the tests from the `build` directory with the command
+
+ $ ctest -V
+
+Alternatively you can run the test suite directly using,
+
+ $ ./libgit2_clar
+
+Invoking the test suite directly is useful because it allows you to execute
+individual tests, or groups of tests using the `-s` flag. For example, to
+run the index tests:
+
+ $ ./libgit2_clar -sindex
+
+To run a single test named `index::racy::diff`, which corresponds to the test
+function (`test_index_racy__diff`)[https://github.com/libgit2/libgit2/blob/master/tests/index/racy.c#L23]:
+
+ $ ./libgit2_clar -sindex::racy::diff
+
+The test suite will print a `.` for every passing test, and an `F` for any
+failing test. An `S` indicates that a test was skipped because it is not
+applicable to your platform or is particularly expensive.
+
+**Note:** There should be _no_ failing tests when you build an unmodified
+source tree from a [release](https://github.com/libgit2/libgit2/releases),
+or from the [master branch](https://github.com/libgit2/libgit2/tree/master).
+Please contact us or [open an issue](https://github.com/libgit2/libgit2/issues)
+if you see test failures.
+
+Installation
+------------
+
+To install the library you can specify the install prefix by setting:
+
+ $ cmake .. -DCMAKE_INSTALL_PREFIX=/install/prefix
+ $ cmake --build . --target install
+
+Advanced Usage
+--------------
+
+For more advanced use or questions about CMake please read <https://cmake.org/Wiki/CMake_FAQ>.
+
+The following CMake variables are declared:
+
+- `BIN_INSTALL_DIR`: Where to install binaries to.
+- `LIB_INSTALL_DIR`: Where to install libraries to.
+- `INCLUDE_INSTALL_DIR`: Where to install headers to.
+- `BUILD_SHARED_LIBS`: Build libgit2 as a Shared Library (defaults to ON)
+- `BUILD_CLAR`: Build [Clar](https://github.com/vmg/clar)-based test suite (defaults to ON)
+- `THREADSAFE`: Build libgit2 with threading support (defaults to ON)
+- `STDCALL`: Build libgit2 as `stdcall`. Turn off for `cdecl` (Windows; defaults to ON)
+
+Compiler and linker options
+---------------------------
+
+CMake lets you specify a few variables to control the behavior of the
+compiler and linker. These flags are rarely used but can be useful for
+64-bit to 32-bit cross-compilation.
+
+- `CMAKE_C_FLAGS`: Set your own compiler flags
+- `CMAKE_FIND_ROOT_PATH`: Override the search path for libraries
+- `ZLIB_LIBRARY`, `OPENSSL_SSL_LIBRARY` AND `OPENSSL_CRYPTO_LIBRARY`:
+Tell CMake where to find those specific libraries
+
+MacOS X
+-------
+
+If you want to build a universal binary for Mac OS X, CMake sets it
+all up for you if you use `-DCMAKE_OSX_ARCHITECTURES="i386;x86_64"`
+when configuring.
+
+Android
+-------
+
+Extract toolchain from NDK using, `make-standalone-toolchain.sh` script.
+Optionally, crosscompile and install OpenSSL inside of it. Then create CMake
+toolchain file that configures paths to your crosscompiler (substitute `{PATH}`
+with full path to the toolchain):
+
+ SET(CMAKE_SYSTEM_NAME Linux)
+ SET(CMAKE_SYSTEM_VERSION Android)
+
+ SET(CMAKE_C_COMPILER {PATH}/bin/arm-linux-androideabi-gcc)
+ SET(CMAKE_CXX_COMPILER {PATH}/bin/arm-linux-androideabi-g++)
+ SET(CMAKE_FIND_ROOT_PATH {PATH}/sysroot/)
+
+ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+ SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+Add `-DCMAKE_TOOLCHAIN_FILE={pathToToolchainFile}` to cmake command
+when configuring.
+
+Language Bindings
+==================================
+
+Here are the bindings to libgit2 that are currently available:
+
+* C++
+ * libqgit2, Qt bindings <https://projects.kde.org/projects/playground/libs/libqgit2/repository/>
+* Chicken Scheme
+ * chicken-git <https://wiki.call-cc.org/egg/git>
+* D
+ * dlibgit <https://github.com/s-ludwig/dlibgit>
+* Delphi
+ * GitForDelphi <https://github.com/libgit2/GitForDelphi>
+* Erlang
+ * Geef <https://github.com/carlosmn/geef>
+* Go
+ * git2go <https://github.com/libgit2/git2go>
+* GObject
+ * libgit2-glib <https://wiki.gnome.org/Projects/Libgit2-glib>
+* Guile
+ * Guile-Git <https://gitlab.com/guile-git/guile-git>
+* Haskell
+ * hgit2 <https://github.com/jwiegley/gitlib>
+* Java
+ * Jagged <https://github.com/ethomson/jagged>
+* Julia
+ * LibGit2.jl <https://github.com/jakebolewski/LibGit2.jl>
+* Lua
+ * luagit2 <https://github.com/libgit2/luagit2>
+* .NET
+ * libgit2sharp <https://github.com/libgit2/libgit2sharp>
+* Node.js
+ * nodegit <https://github.com/nodegit/nodegit>
+* Objective-C
+ * objective-git <https://github.com/libgit2/objective-git>
+* OCaml
+ * ocaml-libgit2 <https://github.com/fxfactorial/ocaml-libgit2>
+* Parrot Virtual Machine
+ * parrot-libgit2 <https://github.com/letolabs/parrot-libgit2>
+* Perl
+ * Git-Raw <https://github.com/jacquesg/p5-Git-Raw>
+* PHP
+ * php-git <https://github.com/libgit2/php-git>
+* PowerShell
+ * PSGit <https://github.com/PoshCode/PSGit>
+* Python
+ * pygit2 <https://github.com/libgit2/pygit2>
+* R
+ * git2r <https://github.com/ropensci/git2r>
+* Ruby
+ * Rugged <https://github.com/libgit2/rugged>
+* Rust
+ * git2-rs <https://github.com/alexcrichton/git2-rs>
+* Swift
+ * SwiftGit2 <https://github.com/SwiftGit2/SwiftGit2>
+* Vala
+ * libgit2.vapi <https://github.com/apmasell/vapis/blob/master/libgit2.vapi>
+
+If you start another language binding to libgit2, please let us know so
+we can add it to the list.
+
+How Can I Contribute?
+==================================
+
+We welcome new contributors! We have a number of issues marked as
+["up for grabs"](https://github.com/libgit2/libgit2/issues?q=is%3Aissue+is%3Aopen+label%3A%22up+for+grabs%22)
+and
+["easy fix"](https://github.com/libgit2/libgit2/issues?utf8=✓&q=is%3Aissue+is%3Aopen+label%3A%22easy+fix%22)
+that are good places to jump in and get started. There's much more detailed
+information in our list of [outstanding projects](PROJECTS.md).
+
+Please be sure to check the [contribution guidelines](CONTRIBUTING.md) to
+understand our workflow, and the libgit2 [coding conventions](CONVENTIONS.md).
+
+License
+==================================
+
+`libgit2` is under GPL2 **with linking exception**. This means you can link to
+and use the library from any program, proprietary or open source; paid or
+gratis. However, if you modify libgit2 itself, you must distribute the
+source to your modified version of libgit2.
+
+See the [COPYING file](COPYING) for the full license text.
--- /dev/null
+tree 3e7ac388cadae960fe7e22175ce0da878afe9d18
+parent 8b89f362a34fcccdf1c6c5f3445895b71d9c6d56
+parent c590b41fe4057a84a9bd31a5605ceef2c309b0f8
+author Patrick Steinhardt <ps@pks.im> 1538760730 +0200
+committer GitHub <noreply@github.com> 1538760730 +0200
+gpgsig -----BEGIN PGP SIGNATURE-----
+
+ wsBcBAABCAAQBQJbt6AaCRBK7hj4Ov3rIwAAdHIIAKZGIpS0dAirVRt5NVFj3ZtC
+ o2Q3ADC0XpYLKkEsClhG7pVtr7MRZZ8+qaJpbxn9j9WZZ4UtEeDjseos+pMNn9Mf
+ OQQntNzGAbHSw0apyYT+mTUKaVONPev4fw9Lnc/RJ/iWwHx+4gmgNqLwV3foaCW9
+ w1JzCL+BVJyZI80jrEehihhUnpIUOuMBwGjzSt54Zn5JqviC4cIldF2sXFGQqvsq
+ 3WDNnEUYanU6cLAdb9Pd6bVBI1EJnRLxehSeYiSaRPmLhQyhkH8KZ5lSi8iuH1C4
+ bjA6HaEUwCeq0k9Le6BUu93BExEOFcuu8+zEKCrwCdSwdEQ3Iakv8dh7XlT9iUY=
+ =nGP0
+ -----END PGP SIGNATURE-----
+
+
+Merge pull request #4834 from pks-t/pks/v0.27.5
+
+Security release v0.27.5
\ No newline at end of file
--- /dev/null
+object a8d447f68076d1520f69649bb52629941be7031f
+type commit
+tag testtag
+tagger Patrick Steinhardt <ps@pks.im> 1539253015 +0200
+
+Tag message
--- /dev/null
+ÐPACK
\ No newline at end of file
--- /dev/null
+i
\ No newline at end of file
--- /dev/null
+º
\ No newline at end of file
--- /dev/null
+R
\ No newline at end of file
--- /dev/null
+\
\ No newline at end of file
--- /dev/null
+\ fÿ
\ No newline at end of file
--- /dev/null
+9
\ No newline at end of file
--- /dev/null
+ÐPACK\ 5ïïð\8e
\ No newline at end of file
--- /dev/null
+x
\ No newline at end of file
--- /dev/null
+©
\ No newline at end of file
--- /dev/null
+À
\ No newline at end of file
--- /dev/null
+
\ No newline at end of file
--- /dev/null
+h
\ No newline at end of file
--- /dev/null
+Pw
\ No newline at end of file
--- /dev/null
+\88
\ No newline at end of file
--- /dev/null
+ÿÿÿ@
\ No newline at end of file
--- /dev/null
+1
\ No newline at end of file
--- /dev/null
+z
\ No newline at end of file
--- /dev/null
+/
\ No newline at end of file
--- /dev/null
+%
\ No newline at end of file
--- /dev/null
+¶
\ No newline at end of file
--- /dev/null
+P
\ No newline at end of file
--- /dev/null
+ÏÏ
\ No newline at end of file
--- /dev/null
+ï
\ No newline at end of file
--- /dev/null
+?
\ No newline at end of file
--- /dev/null
+j
\ No newline at end of file
--- /dev/null
+ÿ÷
\ No newline at end of file
--- /dev/null
+m
\ No newline at end of file
--- /dev/null
+±
\ No newline at end of file
--- /dev/null
+è\e
\ No newline at end of file
--- /dev/null
+÷
\ No newline at end of file
--- /dev/null
+ø
\ No newline at end of file
--- /dev/null
+\98o
\ No newline at end of file
--- /dev/null
+o
\ No newline at end of file
--- /dev/null
+H
\ No newline at end of file
--- /dev/null
+c
\ No newline at end of file
--- /dev/null
+\85
\ No newline at end of file
--- /dev/null
+\98Pÿð\ 3\ 5ÿðï\ 6ÿðï
\ No newline at end of file
--- /dev/null
+\9ePACK\ 3³³
\ No newline at end of file
--- /dev/null
+ù
\ No newline at end of file
--- /dev/null
+Ì
\ No newline at end of file
--- /dev/null
+K
\ No newline at end of file
--- /dev/null
+
\ No newline at end of file
--- /dev/null
+w
\ No newline at end of file
--- /dev/null
+ý
\ No newline at end of file
--- /dev/null
+þ
\ No newline at end of file
--- /dev/null
+\93
\ No newline at end of file
--- /dev/null
+\ 1
\ No newline at end of file
--- /dev/null
+Ô
\ No newline at end of file
--- /dev/null
+\18
\ No newline at end of file
--- /dev/null
+Á
\ No newline at end of file
--- /dev/null
+û
\ No newline at end of file
--- /dev/null
+n
\ No newline at end of file
--- /dev/null
+®
\ No newline at end of file
--- /dev/null
+â
\ No newline at end of file
--- /dev/null
+E
\ No newline at end of file
--- /dev/null
+\b\ 3!
\ No newline at end of file
--- /dev/null
+F
\ No newline at end of file
--- /dev/null
+Ä
\ No newline at end of file
--- /dev/null
+²
\ No newline at end of file
--- /dev/null
+/*
+ * libgit2 raw packfile fuzz target.
+ *
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#include <string.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include "git2.h"
+#include "git2/sys/transport.h"
+
+#define UNUSED(x) (void)(x)
+
+struct fuzzer_buffer {
+ const unsigned char *data;
+ size_t size;
+};
+
+struct fuzzer_stream {
+ git_smart_subtransport_stream base;
+ const unsigned char *readp;
+ const unsigned char *endp;
+};
+
+struct fuzzer_subtransport {
+ git_smart_subtransport base;
+ git_transport *owner;
+ struct fuzzer_buffer data;
+};
+
+static git_repository *repo;
+
+static int fuzzer_stream_read(git_smart_subtransport_stream *stream,
+ char *buffer,
+ size_t buf_size,
+ size_t *bytes_read)
+{
+ struct fuzzer_stream *fs = (struct fuzzer_stream *) stream;
+ size_t avail = fs->endp - fs->readp;
+
+ *bytes_read = (buf_size > avail) ? avail : buf_size;
+ memcpy(buffer, fs->readp, *bytes_read);
+ fs->readp += *bytes_read;
+
+ return 0;
+}
+
+static int fuzzer_stream_write(git_smart_subtransport_stream *stream,
+ const char *buffer, size_t len)
+{
+ UNUSED(stream);
+ UNUSED(buffer);
+ UNUSED(len);
+ return 0;
+}
+
+static void fuzzer_stream_free(git_smart_subtransport_stream *stream)
+{
+ free(stream);
+}
+
+static int fuzzer_stream_new(
+ struct fuzzer_stream **out,
+ const struct fuzzer_buffer *data)
+{
+ struct fuzzer_stream *stream = malloc(sizeof(*stream));
+ if (!stream)
+ return -1;
+
+ stream->readp = data->data;
+ stream->endp = data->data + data->size;
+ stream->base.read = fuzzer_stream_read;
+ stream->base.write = fuzzer_stream_write;
+ stream->base.free = fuzzer_stream_free;
+
+ *out = stream;
+
+ return 0;
+}
+
+static int fuzzer_subtransport_action(
+ git_smart_subtransport_stream **out,
+ git_smart_subtransport *transport,
+ const char *url,
+ git_smart_service_t action)
+{
+ struct fuzzer_subtransport *ft = (struct fuzzer_subtransport *) transport;
+
+ UNUSED(url);
+ UNUSED(action);
+
+ return fuzzer_stream_new((struct fuzzer_stream **) out, &ft->data);
+}
+
+static int fuzzer_subtransport_close(git_smart_subtransport *transport)
+{
+ UNUSED(transport);
+ return 0;
+}
+
+static void fuzzer_subtransport_free(git_smart_subtransport *transport)
+{
+ free(transport);
+}
+
+static int fuzzer_subtransport_new(
+ struct fuzzer_subtransport **out,
+ git_transport *owner,
+ const struct fuzzer_buffer *data)
+{
+ struct fuzzer_subtransport *sub = malloc(sizeof(*sub));
+ if (!sub)
+ return -1;
+
+ sub->owner = owner;
+ sub->data.data = data->data;
+ sub->data.size = data->size;
+ sub->base.action = fuzzer_subtransport_action;
+ sub->base.close = fuzzer_subtransport_close;
+ sub->base.free = fuzzer_subtransport_free;
+
+ *out = sub;
+
+ return 0;
+}
+
+int fuzzer_subtransport_cb(
+ git_smart_subtransport **out,
+ git_transport *owner,
+ void *payload)
+{
+ struct fuzzer_buffer *buf = (struct fuzzer_buffer *) payload;
+ struct fuzzer_subtransport *sub;
+
+ if (fuzzer_subtransport_new(&sub, owner, buf) < 0)
+ return -1;
+
+ *out = &sub->base;
+ return 0;
+}
+
+int fuzzer_transport_cb(git_transport **out, git_remote *owner, void *param)
+{
+ git_smart_subtransport_definition def = {
+ fuzzer_subtransport_cb,
+ 1,
+ param
+ };
+ return git_transport_smart(out, owner, &def);
+}
+
+void fuzzer_git_abort(const char *op)
+{
+ const git_error *err = git_error_last();
+ fprintf(stderr, "unexpected libgit error: %s: %s\n",
+ op, err ? err->message : "<none>");
+ abort();
+}
+
+int LLVMFuzzerInitialize(int *argc, char ***argv)
+{
+ char tmp[] = "/tmp/git2.XXXXXX";
+
+ UNUSED(argc);
+ UNUSED(argv);
+
+ if (git_libgit2_init() < 0)
+ abort();
+
+ if (git_libgit2_opts(GIT_OPT_SET_PACK_MAX_OBJECTS, 10000000) < 0)
+ abort();
+
+ if (mkdtemp(tmp) != tmp)
+ abort();
+
+ if (git_repository_init(&repo, tmp, 1) < 0)
+ fuzzer_git_abort("git_repository_init");
+
+ return 0;
+}
+
+int LLVMFuzzerTestOneInput(const unsigned char *data, size_t size)
+{
+ struct fuzzer_buffer buffer = { data, size };
+ git_remote_callbacks callbacks = GIT_REMOTE_CALLBACKS_INIT;
+ git_remote *remote;
+
+ if (git_remote_create_anonymous(&remote, repo, "fuzzer://remote-url") < 0)
+ fuzzer_git_abort("git_remote_create");
+
+ callbacks.transport = fuzzer_transport_cb;
+ callbacks.payload = &buffer;
+
+ if (git_remote_connect(remote, GIT_DIRECTION_FETCH,
+ &callbacks, NULL, NULL) < 0)
+ goto out;
+
+ git_remote_download(remote, NULL, NULL);
+
+ out:
+ git_remote_free(remote);
+
+ return 0;
+}
--- /dev/null
+/*
+ * libgit2 packfile fuzzer target.
+ *
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#include "git2.h"
+#include "object.h"
+
+#define UNUSED(x) (void)(x)
+
+int LLVMFuzzerInitialize(int *argc, char ***argv)
+{
+ UNUSED(argc);
+ UNUSED(argv);
+
+ if (git_libgit2_init() < 0)
+ abort();
+
+ return 0;
+}
+
+int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
+{
+ const git_object_t types[] = {
+ GIT_OBJECT_BLOB, GIT_OBJECT_TREE, GIT_OBJECT_COMMIT, GIT_OBJECT_TAG
+ };
+ git_object *object = NULL;
+ size_t i;
+
+ /*
+ * Brute-force parse this as every object type. We want
+ * to stress the parsing logic anyway, so this is fine
+ * to do.
+ */
+ for (i = 0; i < ARRAY_SIZE(types); i++) {
+ if (git_object__from_raw(&object, (const char *) data, size, types[i]) < 0)
+ continue;
+ git_object_free(object);
+ object = NULL;
+ }
+
+ return 0;
+}
--- /dev/null
+/*
+ * libgit2 packfile fuzzer target.
+ *
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <limits.h>
+#include <unistd.h>
+
+#include "git2.h"
+#include "git2/sys/mempack.h"
+
+#define UNUSED(x) (void)(x)
+
+static git_odb *odb = NULL;
+static git_odb_backend *mempack = NULL;
+
+/* Arbitrary object to seed the ODB. */
+static const unsigned char base_obj[] = { 07, 076 };
+static const unsigned int base_obj_len = 2;
+
+int LLVMFuzzerInitialize(int *argc, char ***argv)
+{
+ UNUSED(argc);
+ UNUSED(argv);
+ if (git_libgit2_init() < 0) {
+ fprintf(stderr, "Failed to initialize libgit2\n");
+ abort();
+ }
+ if (git_libgit2_opts(GIT_OPT_SET_PACK_MAX_OBJECTS, 10000000) < 0) {
+ fprintf(stderr, "Failed to limit maximum pack object count\n");
+ abort();
+ }
+ if (git_odb_new(&odb) < 0) {
+ fprintf(stderr, "Failed to create the odb\n");
+ abort();
+ }
+ if (git_mempack_new(&mempack) < 0) {
+ fprintf(stderr, "Failed to create the mempack\n");
+ abort();
+ }
+ if (git_odb_add_backend(odb, mempack, 999) < 0) {
+ fprintf(stderr, "Failed to add the mempack\n");
+ abort();
+ }
+ return 0;
+}
+
+int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
+{
+ git_indexer *indexer = NULL;
+ git_transfer_progress stats = {0, 0};
+ bool append_hash = false;
+ git_oid id;
+ char hash[GIT_OID_HEXSZ + 1] = {0};
+ char path[PATH_MAX];
+
+ if (size == 0)
+ return 0;
+
+ if (!odb || !mempack) {
+ fprintf(stderr, "Global state not initialized\n");
+ abort();
+ }
+ git_mempack_reset(mempack);
+
+ if (git_odb_write(&id, odb, base_obj, base_obj_len, GIT_OBJECT_BLOB) < 0) {
+ fprintf(stderr, "Failed to add an object to the odb\n");
+ abort();
+ }
+
+ if (git_indexer_new(&indexer, ".", 0, odb, NULL) < 0) {
+ fprintf(stderr, "Failed to create the indexer: %s\n",
+ git_error_last()->message);
+ abort();
+ }
+
+ /*
+ * If the first byte in the stream has the high bit set, append the
+ * SHA1 hash so that the packfile is somewhat valid.
+ */
+ append_hash = *data & 0x80;
+ ++data;
+ --size;
+
+ if (git_indexer_append(indexer, data, size, &stats) < 0)
+ goto cleanup;
+ if (append_hash) {
+ git_oid oid;
+ if (git_odb_hash(&oid, data, size, GIT_OBJECT_BLOB) < 0) {
+ fprintf(stderr, "Failed to compute the SHA1 hash\n");
+ abort();
+ }
+ if (git_indexer_append(indexer, &oid, sizeof(oid), &stats) < 0) {
+ goto cleanup;
+ }
+ }
+ if (git_indexer_commit(indexer, &stats) < 0)
+ goto cleanup;
+
+ /*
+ * We made it! We managed to produce a valid packfile.
+ * Let's clean it up.
+ */
+ git_oid_fmt(hash, git_indexer_hash(indexer));
+ printf("Generated packfile %s\n", hash);
+ snprintf(path, sizeof(path), "pack-%s.idx", hash);
+ unlink(path);
+ snprintf(path, sizeof(path), "pack-%s.pack", hash);
+ unlink(path);
+
+cleanup:
+ git_mempack_reset(mempack);
+ git_indexer_free(indexer);
+ return 0;
+}
--- /dev/null
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#include <assert.h>
+#include <dirent.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+
+#include "git2.h"
+#include "fileops.h"
+#include "path.h"
+
+extern int LLVMFuzzerTestOneInput(const unsigned char *data, size_t size);
+extern int LLVMFuzzerInitialize(int *argc, char ***argv);
+
+static int run_one_file(const char *filename)
+{
+ git_buf buf = GIT_BUF_INIT;
+ int error = 0;
+
+ if (git_futils_readbuffer(&buf, filename) < 0) {
+ fprintf(stderr, "Failed to read %s: %m\n", filename);
+ error = -1;
+ goto exit;
+ }
+
+ LLVMFuzzerTestOneInput((const unsigned char *)buf.ptr, buf.size);
+exit:
+ git_buf_dispose(&buf);
+ return error;
+}
+
+int main(int argc, char **argv)
+{
+ git_vector corpus_files = GIT_VECTOR_INIT;
+ char *filename = NULL;
+ unsigned i = 0;
+ int error = 0;
+
+ if (git_libgit2_init() < 0) {
+ fprintf(stderr, "Failed to initialize libgit2\n");
+ abort();
+ }
+
+ if (argc != 2) {
+ fprintf(stderr, "Usage: %s <corpus directory>\n", argv[0]);
+ error = -1;
+ goto exit;
+ }
+
+ fprintf(stderr, "Running %s against %s\n", argv[0], argv[1]);
+ LLVMFuzzerInitialize(&argc, &argv);
+
+ if (git_path_dirload(&corpus_files, argv[1], 0, 0x0) < 0) {
+ fprintf(stderr, "Failed to scan corpus directory: %m\n");
+ error = -1;
+ goto exit;
+ }
+ git_vector_foreach(&corpus_files, i, filename) {
+ fprintf(stderr, "\tRunning %s...\n", filename);
+ if (run_one_file(filename) < 0) {
+ error = -1;
+ goto exit;
+ }
+ }
+ fprintf(stderr, "Done %d runs\n", i);
+
+exit:
+ git_vector_free_deep(&corpus_files);
+ git_libgit2_shutdown();
+ return error;
+}
ok Brian Gernhardt <benji@silverinsanity.com>
ok Christian Couder <chriscool@tuxfamily.org>
ok Daniel Barkalow <barkalow@iabervon.org>
+ok Elijah Newren <newren@gmail.com>
ok Florian Forster <octo@verplant.org>
ok Gustaf Hendeby <hendeby@isy.liu.se>
ok Holger Weiss <holger@zedat.fu-berlin.de>
#define INCLUDE_git_git_h__
#include "git2/annotated_commit.h"
+#include "git2/apply.h"
#include "git2/attr.h"
#include "git2/blob.h"
#include "git2/blame.h"
#include "git2/commit.h"
#include "git2/common.h"
#include "git2/config.h"
+#include "git2/deprecated.h"
#include "git2/describe.h"
#include "git2/diff.h"
#include "git2/errors.h"
#include "git2/ignore.h"
#include "git2/index.h"
#include "git2/indexer.h"
+#include "git2/mailmap.h"
#include "git2/merge.h"
#include "git2/message.h"
#include "git2/net.h"
GIT_EXTERN(const git_oid *) git_annotated_commit_id(
const git_annotated_commit *commit);
+/**
+ * Get the refname that the given `git_annotated_commit` refers to.
+ *
+ * @param commit the given annotated commit
+ * @return ref name.
+ */
+GIT_EXTERN(const char *) git_annotated_commit_ref(
+ const git_annotated_commit *commit);
+
/**
* Frees a `git_annotated_commit`.
*
--- /dev/null
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+#ifndef INCLUDE_git_apply_h__
+#define INCLUDE_git_apply_h__
+
+#include "common.h"
+#include "types.h"
+#include "oid.h"
+#include "diff.h"
+
+/**
+ * @file git2/apply.h
+ * @brief Git patch application routines
+ * @defgroup git_apply Git patch application routines
+ * @ingroup Git
+ * @{
+ */
+GIT_BEGIN_DECL
+
+/**
+ * When applying a patch, callback that will be made per delta (file).
+ *
+ * When the callback:
+ * - returns < 0, the apply process will be aborted.
+ * - returns > 0, the delta will not be applied, but the apply process
+ * continues
+ * - returns 0, the delta is applied, and the apply process continues.
+ *
+ * @param delta The delta to be applied
+ * @param payload User-specified payload
+ */
+typedef int GIT_CALLBACK(git_apply_delta_cb)(
+ const git_diff_delta *delta,
+ void *payload);
+
+/**
+ * When applying a patch, callback that will be made per hunk.
+ *
+ * When the callback:
+ * - returns < 0, the apply process will be aborted.
+ * - returns > 0, the hunk will not be applied, but the apply process
+ * continues
+ * - returns 0, the hunk is applied, and the apply process continues.
+ *
+ * @param hunk The hunk to be applied
+ * @param payload User-specified payload
+ */
+typedef int GIT_CALLBACK(git_apply_hunk_cb)(
+ const git_diff_hunk *hunk,
+ void *payload);
+
+/**
+ * Apply options structure
+ *
+ * Initialize with `GIT_APPLY_OPTIONS_INIT`. Alternatively, you can
+ * use `git_apply_init_options`.
+ *
+ * @see git_apply_to_tree, git_apply
+ */
+typedef struct {
+ unsigned int version;
+
+ git_apply_delta_cb delta_cb;
+ git_apply_hunk_cb hunk_cb;
+ void *payload;
+} git_apply_options;
+
+#define GIT_APPLY_OPTIONS_VERSION 1
+#define GIT_APPLY_OPTIONS_INIT {GIT_APPLY_OPTIONS_VERSION}
+
+/**
+ * Apply a `git_diff` to a `git_tree`, and return the resulting image
+ * as an index.
+ *
+ * @param out the postimage of the application
+ * @param repo the repository to apply
+ * @param preimage the tree to apply the diff to
+ * @param diff the diff to apply
+ * @param options the options for the apply (or null for defaults)
+ */
+GIT_EXTERN(int) git_apply_to_tree(
+ git_index **out,
+ git_repository *repo,
+ git_tree *preimage,
+ git_diff *diff,
+ const git_apply_options *options);
+
+typedef enum {
+ /**
+ * Apply the patch to the workdir, leaving the index untouched.
+ * This is the equivalent of `git apply` with no location argument.
+ */
+ GIT_APPLY_LOCATION_WORKDIR = 0,
+
+ /**
+ * Apply the patch to the index, leaving the working directory
+ * untouched. This is the equivalent of `git apply --cached`.
+ */
+ GIT_APPLY_LOCATION_INDEX = 1,
+
+ /**
+ * Apply the patch to both the working directory and the index.
+ * This is the equivalent of `git apply --index`.
+ */
+ GIT_APPLY_LOCATION_BOTH = 2,
+} git_apply_location_t;
+
+/**
+ * Apply a `git_diff` to the given repository, making changes directly
+ * in the working directory, the index, or both.
+ *
+ * @param repo the repository to apply to
+ * @param diff the diff to apply
+ * @param location the location to apply (workdir, index or both)
+ * @param options the options for the apply (or null for defaults)
+ */
+GIT_EXTERN(int) git_apply(
+ git_repository *repo,
+ git_diff *diff,
+ git_apply_location_t location,
+ const git_apply_options *options);
+
+/** @} */
+GIT_END_DECL
+#endif
size_t num_attr,
const char **names);
-typedef int (*git_attr_foreach_cb)(const char *name, const char *value, void *payload);
+/**
+ * The callback used with git_attr_foreach.
+ *
+ * This callback will be invoked only once per attribute name, even if there
+ * are multiple rules for a given file. The highest priority rule will be
+ * used.
+ *
+ * @see git_attr_foreach.
+ *
+ * @param name The attribute name.
+ * @param value The attribute value. May be NULL if the attribute is explicitly
+ * set to UNSPECIFIED using the '!' sign.
+ * @param payload A user-specified pointer.
+ * @return 0 to continue looping, non-zero to stop. This value will be returned
+ * from git_attr_foreach.
+ */
+typedef int GIT_CALLBACK(git_attr_foreach_cb)(const char *name, const char *value, void *payload);
/**
* Loop over all the git attributes for a path.
* @param path Path inside the repo to check attributes. This does not have
* to exist, but if it does not, then it will be treated as a
* plain file (i.e. not a directory).
- * @param callback Function to invoke on each attribute name and value. The
- * value may be NULL is the attribute is explicitly set to
- * UNSPECIFIED using the '!' sign. Callback will be invoked
- * only once per attribute name, even if there are multiple
- * rules for a given file. The highest priority rule will be
- * used. Return a non-zero value from this to stop looping.
- * The value will be returned from `git_attr_foreach`.
+ * @param callback Function to invoke on each attribute name and value.
+ * See git_attr_foreach_cb.
* @param payload Passed on as extra parameter to callback function.
* @return 0 on success, non-zero callback return value, or error code
*/
/** Restrict the search of commits to those reachable following only the
* first parents. */
GIT_BLAME_FIRST_PARENT = (1<<4),
+ /** Use mailmap file to map author and committer names and email addresses
+ * to canonical real names and email addresses. The mailmap will be read
+ * from the working directory, or HEAD in a bare repository. */
+ GIT_BLAME_USE_MAILMAP = (1<<5),
} git_blame_flag_t;
/**
* Blame options structure
*
- * Use zeros to indicate default settings. It's easiest to use the
- * `GIT_BLAME_OPTIONS_INIT` macro:
- * git_blame_options opts = GIT_BLAME_OPTIONS_INIT;
+ * Initialize with `GIT_BLAME_OPTIONS_INIT`. Alternatively, you can
+ * use `git_blame_init_options`.
*
- * - `flags` is a combination of the `git_blame_flag_t` values above.
- * - `min_match_characters` is the lower bound on the number of alphanumeric
- * characters that must be detected as moving/copying within a file for it to
- * associate those lines with the parent commit. The default value is 20.
- * This value only takes effect if any of the `GIT_BLAME_TRACK_COPIES_*`
- * flags are specified.
- * - `newest_commit` is the id of the newest commit to consider. The default
- * is HEAD.
- * - `oldest_commit` is the id of the oldest commit to consider. The default
- * is the first commit encountered with a NULL parent.
- * - `min_line` is the first line in the file to blame. The default is 1 (line
- * numbers start with 1).
- * - `max_line` is the last line in the file to blame. The default is the last
- * line of the file.
*/
typedef struct git_blame_options {
unsigned int version;
+ /** A combination of `git_blame_flag_t` */
uint32_t flags;
+ /** The lower bound on the number of alphanumeric
+ * characters that must be detected as moving/copying within a file for it to
+ * associate those lines with the parent commit. The default value is 20.
+ * This value only takes effect if any of the `GIT_BLAME_TRACK_COPIES_*`
+ * flags are specified.
+ */
uint16_t min_match_characters;
+ /** The id of the newest commit to consider. The default is HEAD. */
git_oid newest_commit;
+ /**
+ * The id of the oldest commit to consider.
+ * The default is the first commit encountered with a NULL parent.
+ */
git_oid oldest_commit;
+ /**
+ * The first line in the file to blame.
+ * The default is 1 (line numbers start with 1).
+ */
size_t min_line;
+ /**
+ * The last line in the file to blame.
+ * The default is the last line of the file.
+ */
size_t max_line;
} git_blame_options;
#define GIT_BLAME_OPTIONS_INIT {GIT_BLAME_OPTIONS_VERSION}
/**
- * Initializes a `git_blame_options` with default values. Equivalent to
- * creating an instance with GIT_BLAME_OPTIONS_INIT.
+ * Initialize git_blame_options structure
*
- * @param opts The `git_blame_options` struct to initialize
- * @param version Version of struct; pass `GIT_BLAME_OPTIONS_VERSION`
+ * Initializes a `git_blame_options` with default values. Equivalent to creating
+ * an instance with GIT_BLAME_OPTIONS_INIT.
+ *
+ * @param opts The `git_blame_options` struct to initialize.
+ * @param version The struct version; pass `GIT_BLAME_OPTIONS_VERSION`.
* @return Zero on success; -1 on failure.
*/
GIT_EXTERN(int) git_blame_init_options(
* changed.
* - `final_start_line_number` is the 1-based line number where this hunk
* begins, in the final version of the file
+ * - `final_signature` is the author of `final_commit_id`. If
+ * `GIT_BLAME_USE_MAILMAP` has been specified, it will contain the canonical
+ * real name and email address.
* - `orig_commit_id` is the OID of the commit where this hunk was found. This
* will usually be the same as `final_commit_id`, except when
* `GIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES` has been specified.
* - `orig_start_line_number` is the 1-based line number where this hunk begins
* in the file named by `orig_path` in the commit specified by
* `orig_commit_id`.
+ * - `orig_signature` is the author of `orig_commit_id`. If
+ * `GIT_BLAME_USE_MAILMAP` has been specified, it will contain the canonical
+ * real name and email address.
* - `boundary` is 1 iff the hunk has been tracked to a boundary commit (the
* root, or the commit specified in git_blame_options.oldest_commit)
*/
} git_blame_hunk;
-/* Opaque structure to hold blame results */
+/** Opaque structure to hold blame results */
typedef struct git_blame git_blame;
/**
* @param path path to file to consider
* @param options options for the blame operation. If NULL, this is treated as
* though GIT_BLAME_OPTIONS_INIT were passed.
- * @return 0 on success, or an error code. (use giterr_last for information
+ * @return 0 on success, or an error code. (use git_error_last for information
* about the error.)
*/
GIT_EXTERN(int) git_blame_file(
* from git_blame_file)
* @param buffer the (possibly) modified contents of the file
* @param buffer_len number of valid bytes in the buffer
- * @return 0 on success, or an error code. (use giterr_last for information
+ * @return 0 on success, or an error code. (use git_error_last for information
* about the error)
*/
GIT_EXTERN(int) git_blame_buffer(
* attributes set for the blob and the content detected in it.
*
* The output is written into a `git_buf` which the caller must free
- * when done (via `git_buf_free`).
+ * when done (via `git_buf_dispose`).
*
* If no filters need to be applied, then the `out` buffer will just
* be populated with a pointer to the raw content of the blob. In
/**
- * Retrieve the name fo the upstream remote of a local branch
+ * Retrieve the name of the upstream remote of a local branch
*
* @param buf the buffer into which to write the name
* @param repo the repository in which to look
* caller and have the caller take responsibility for freeing that memory.
* This can be awkward if the caller does not have easy access to the same
* allocation functions that libgit2 is using. In those cases, libgit2
- * will fill in a `git_buf` and the caller can use `git_buf_free()` to
+ * will fill in a `git_buf` and the caller can use `git_buf_dispose()` to
* release it when they are done.
*
* A `git_buf` may also be used for the caller to pass in a reference to
*
* @param buffer The buffer to deallocate
*/
-GIT_EXTERN(void) git_buf_free(git_buf *buffer);
+GIT_EXTERN(void) git_buf_dispose(git_buf *buffer);
/**
* Resize the buffer allocation to make more space.
* To emulate `git checkout -f`, use `GIT_CHECKOUT_FORCE`.
*
*
- * There are some additional flags to modified the behavior of checkout:
+ * There are some additional flags to modify the behavior of checkout:
*
* - GIT_CHECKOUT_ALLOW_CONFLICTS makes SAFE mode apply safe file updates
* even if there are conflicts (instead of cancelling the checkout).
} git_checkout_perfdata;
/** Checkout notification callback function */
-typedef int (*git_checkout_notify_cb)(
+typedef int GIT_CALLBACK(git_checkout_notify_cb)(
git_checkout_notify_t why,
const char *path,
const git_diff_file *baseline,
void *payload);
/** Checkout progress notification function */
-typedef void (*git_checkout_progress_cb)(
+typedef void GIT_CALLBACK(git_checkout_progress_cb)(
const char *path,
size_t completed_steps,
size_t total_steps,
void *payload);
/** Checkout perfdata notification function */
-typedef void (*git_checkout_perfdata_cb)(
+typedef void GIT_CALLBACK(git_checkout_perfdata_cb)(
const git_checkout_perfdata *perfdata,
void *payload);
/**
* Checkout options structure
*
- * Zero out for defaults. Initialize with `GIT_CHECKOUT_OPTIONS_INIT` macro to
- * correctly set the `version` field. E.g.
+ * Initialize with `GIT_CHECKOUT_OPTIONS_INIT`. Alternatively, you can
+ * use `git_checkout_init_options`.
*
- * git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
*/
typedef struct git_checkout_options {
unsigned int version;
- unsigned int checkout_strategy; /**< default will be a dry run */
+ unsigned int checkout_strategy; /**< default will be a safe checkout */
int disable_filters; /**< don't apply filters like CRLF conversion */
unsigned int dir_mode; /**< default is 0755 */
} git_checkout_options;
#define GIT_CHECKOUT_OPTIONS_VERSION 1
-#define GIT_CHECKOUT_OPTIONS_INIT {GIT_CHECKOUT_OPTIONS_VERSION}
+#define GIT_CHECKOUT_OPTIONS_INIT {GIT_CHECKOUT_OPTIONS_VERSION, GIT_CHECKOUT_SAFE}
/**
-* Initializes a `git_checkout_options` with default values. Equivalent to
-* creating an instance with GIT_CHECKOUT_OPTIONS_INIT.
-*
-* @param opts the `git_checkout_options` struct to initialize.
-* @param version Version of struct; pass `GIT_CHECKOUT_OPTIONS_VERSION`
-* @return Zero on success; -1 on failure.
-*/
+ * Initialize git_checkout_options structure
+ *
+ * Initializes a `git_checkout_options` with default values. Equivalent to creating
+ * an instance with GIT_CHECKOUT_OPTIONS_INIT.
+ *
+ * @param opts The `git_checkout_options` struct to initialize.
+ * @param version The struct version; pass `GIT_CHECKOUT_OPTIONS_VERSION`.
+ * @return Zero on success; -1 on failure.
+ */
GIT_EXTERN(int) git_checkout_init_options(
git_checkout_options *opts,
unsigned int version);
* @param opts specifies checkout options (may be NULL)
* @return 0 on success, GIT_EUNBORNBRANCH if HEAD points to a non
* existing branch, non-zero value returned by `notify_cb`, or
- * other error code < 0 (use giterr_last for error details)
+ * other error code < 0 (use git_error_last for error details)
*/
GIT_EXTERN(int) git_checkout_head(
git_repository *repo,
* @param index index to be checked out (or NULL to use repository index)
* @param opts specifies checkout options (may be NULL)
* @return 0 on success, non-zero return value from `notify_cb`, or error
- * code < 0 (use giterr_last for error details)
+ * code < 0 (use git_error_last for error details)
*/
GIT_EXTERN(int) git_checkout_index(
git_repository *repo,
* the working directory (or NULL to use HEAD)
* @param opts specifies checkout options (may be NULL)
* @return 0 on success, non-zero return value from `notify_cb`, or error
- * code < 0 (use giterr_last for error details)
+ * code < 0 (use git_error_last for error details)
*/
GIT_EXTERN(int) git_checkout_tree(
git_repository *repo,
#define GIT_CHERRYPICK_OPTIONS_INIT {GIT_CHERRYPICK_OPTIONS_VERSION, 0, GIT_MERGE_OPTIONS_INIT, GIT_CHECKOUT_OPTIONS_INIT}
/**
- * Initializes a `git_cherrypick_options` with default values. Equivalent to
- * creating an instance with GIT_CHERRYPICK_OPTIONS_INIT.
+ * Initialize git_cherrypick_options structure
*
- * @param opts the `git_cherrypick_options` struct to initialize
- * @param version Version of struct; pass `GIT_CHERRYPICK_OPTIONS_VERSION`
+ * Initializes a `git_cherrypick_options` with default values. Equivalent to creating
+ * an instance with GIT_CHERRYPICK_OPTIONS_INIT.
+ *
+ * @param opts The `git_cherrypick_options` struct to initialize.
+ * @param version The struct version; pass `GIT_CHERRYPICK_OPTIONS_VERSION`.
* @return Zero on success; -1 on failure.
*/
GIT_EXTERN(int) git_cherrypick_init_options(
* @param payload an opaque payload
* @return 0, GIT_EINVALIDSPEC, GIT_EEXISTS or an error code
*/
-typedef int (*git_remote_create_cb)(
+typedef int GIT_CALLBACK(git_remote_create_cb)(
git_remote **out,
git_repository *repo,
const char *name,
* @param payload payload specified by the options
* @return 0, or a negative value to indicate error
*/
-typedef int (*git_repository_create_cb)(
+typedef int GIT_CALLBACK(git_repository_create_cb)(
git_repository **out,
const char *path,
int bare,
/**
* Clone options structure
*
- * Use the GIT_CLONE_OPTIONS_INIT to get the default settings, like this:
+ * Initialize with `GIT_CLONE_OPTIONS_INIT`. Alternatively, you can
+ * use `git_clone_init_options`.
*
- * git_clone_options opts = GIT_CLONE_OPTIONS_INIT;
*/
typedef struct git_clone_options {
unsigned int version;
GIT_FETCH_OPTIONS_INIT }
/**
- * Initializes a `git_clone_options` with default values. Equivalent to
- * creating an instance with GIT_CLONE_OPTIONS_INIT.
+ * Initialize git_clone_options structure
*
- * @param opts The `git_clone_options` struct to initialize
- * @param version Version of struct; pass `GIT_CLONE_OPTIONS_VERSION`
+ * Initializes a `git_clone_options` with default values. Equivalent to creating
+ * an instance with GIT_CLONE_OPTIONS_INIT.
+ *
+ * @param opts The `git_clone_options` struct to initialize.
+ * @param version The struct version; pass `GIT_CLONE_OPTIONS_VERSION`.
* @return Zero on success; -1 on failure.
*/
GIT_EXTERN(int) git_clone_init_options(
* function works as though GIT_OPTIONS_INIT were passed.
* @return 0 on success, any non-zero return value from a callback
* function, or a negative value to indicate an error (use
- * `giterr_last` for a detailed error message)
+ * `git_error_last` for a detailed error message)
*/
GIT_EXTERN(int) git_clone(
git_repository **out,
*/
GIT_EXTERN(const git_signature *) git_commit_author(const git_commit *commit);
+/**
+ * Get the committer of a commit, using the mailmap to map names and email
+ * addresses to canonical real names and email addresses.
+ *
+ * Call `git_signature_free` to free the signature.
+ *
+ * @param out a pointer to store the resolved signature.
+ * @param commit a previously loaded commit.
+ * @param mailmap the mailmap to resolve with. (may be NULL)
+ * @return 0 or an error code
+ */
+GIT_EXTERN(int) git_commit_committer_with_mailmap(
+ git_signature **out, const git_commit *commit, const git_mailmap *mailmap);
+
+/**
+ * Get the author of a commit, using the mailmap to map names and email
+ * addresses to canonical real names and email addresses.
+ *
+ * Call `git_signature_free` to free the signature.
+ *
+ * @param out a pointer to store the resolved signature.
+ * @param commit a previously loaded commit.
+ * @param mailmap the mailmap to resolve with. (may be NULL)
+ * @return 0 or an error code
+ */
+GIT_EXTERN(int) git_commit_author_with_mailmap(
+ git_signature **out, const git_commit *commit, const git_mailmap *mailmap);
+
/**
* Get the full raw text of the commit header.
*
* Extract the signature from a commit
*
* If the id is not for a commit, the error class will be
- * `GITERR_INVALID`. If the commit does not have a signature, the
- * error class will be `GITERR_OBJECT`.
+ * `GIT_ERROR_INVALID`. If the commit does not have a signature, the
+ * error class will be `GIT_ERROR_OBJECT`.
*
* @param signature the signature block; existing content will be
* overwritten
__attribute__((visibility("default"))) \
type
#elif defined(_MSC_VER)
-# define GIT_EXTERN(type) __declspec(dllexport) type
+# define GIT_EXTERN(type) __declspec(dllexport) type __cdecl
#else
# define GIT_EXTERN(type) extern type
#endif
+/** Declare a callback function for application use. */
+#if defined(_MSC_VER)
+# define GIT_CALLBACK(name) (__cdecl *name)
+#else
+# define GIT_CALLBACK(name) (*name)
+#endif
+
+/** Declare a function as deprecated. */
+#if defined(__GNUC__)
+# define GIT_DEPRECATED(func) \
+ __attribute__((deprecated)) \
+ __attribute__((used)) \
+ func
+#elif defined(_MSC_VER)
+# define GIT_DEPRECATED(func) __declspec(deprecated) func
+#else
+# define GIT_DEPRECATED(func) func
+#endif
+
/** Declare a function's takes printf style arguments. */
#ifdef __GNUC__
# define GIT_FORMAT_PRINTF(a,b) __attribute__((format (printf, a, b)))
GIT_OPT_GET_WINDOWS_SHAREMODE,
GIT_OPT_SET_WINDOWS_SHAREMODE,
GIT_OPT_ENABLE_STRICT_HASH_VERIFICATION,
+ GIT_OPT_SET_ALLOCATOR,
+ GIT_OPT_ENABLE_UNSAVED_INDEX_SAFETY,
+ GIT_OPT_GET_PACK_MAX_OBJECTS,
+ GIT_OPT_SET_PACK_MAX_OBJECTS
} git_libgit2_opt_t;
/**
* > `GIT_CONFIG_LEVEL_GLOBAL`, `GIT_CONFIG_LEVEL_XDG`, or
* > `GIT_CONFIG_LEVEL_PROGRAMDATA`.
*
- * * opts(GIT_OPT_SET_CACHE_OBJECT_LIMIT, git_otype type, size_t size)
+ * * opts(GIT_OPT_SET_CACHE_OBJECT_LIMIT, git_object_t type, size_t size)
*
* > Set the maximum data size for the given type of object to be
* > considered eligible for caching in memory. Setting to value to
* > zero means that that type of object will not be cached.
- * > Defaults to 0 for GIT_OBJ_BLOB (i.e. won't cache blobs) and 4k
- * > for GIT_OBJ_COMMIT, GIT_OBJ_TREE, and GIT_OBJ_TAG.
+ * > Defaults to 0 for GIT_OBJECT_BLOB (i.e. won't cache blobs) and 4k
+ * > for GIT_OBJECT_COMMIT, GIT_OBJECT_TREE, and GIT_OBJECT_TAG.
*
* * opts(GIT_OPT_SET_CACHE_MAX_SIZE, ssize_t max_storage_bytes)
*
* > additional checksum calculation on each object. This defaults
* > to enabled.
*
+ * opts(GIT_OPT_SET_ALLOCATOR, git_allocator *allocator)
+ *
+ * > Set the memory allocator to a different memory allocator. This
+ * > allocator will then be used to make all memory allocations for
+ * > libgit2 operations. If the given `allocator` is NULL, then the
+ * > system default will be restored.
+ *
+ * opts(GIT_OPT_ENABLE_UNSAVED_INDEX_SAFETY, int enabled)
+ *
+ * > Ensure that there are no unsaved changes in the index before
+ * > beginning any operation that reloads the index from disk (eg,
+ * > checkout). If there are unsaved changes, the instruction will
+ * > fail. (Using the FORCE flag to checkout will still overwrite
+ * > these changes.)
+ *
+ * opts(GIT_OPT_GET_PACK_MAX_OBJECTS, size_t *out)
+ *
+ * > Get the maximum number of objects libgit2 will allow in a pack
+ * > file when downloading a pack file from a remote. This can be
+ * > used to limit maximum memory usage when fetching from an untrusted
+ * > remote.
+ *
+ * opts(GIT_OPT_SET_PACK_MAX_OBJECTS, size_t objects)
+ *
+ * > Set the maximum number of objects libgit2 will allow in a pack
+ * > file when downloading a pack file from a remote.
+ *
* @param option Option key
* @param ... value to set the option
* @return 0 on success, <0 on failure
typedef struct git_config_entry {
const char *name; /**< Name of the entry (normalised) */
const char *value; /**< String value of the entry */
+ unsigned int include_depth; /**< Depth of includes where this variable was found */
git_config_level_t level; /**< Which config file this was found in */
- void (*free)(struct git_config_entry *entry); /**< Free function for this entry */
+ void GIT_CALLBACK(free)(struct git_config_entry *entry); /**< Free function for this entry */
void *payload; /**< Opaque value for the free function. Do not read or write */
} git_config_entry;
*/
GIT_EXTERN(void) git_config_entry_free(git_config_entry *);
-typedef int (*git_config_foreach_cb)(const git_config_entry *, void *);
+/**
+ * A config enumeration callback
+ *
+ * @param entry the entry currently being enumerated
+ * @param payload a user-specified pointer
+ */
+typedef int GIT_CALLBACK(git_config_foreach_cb)(const git_config_entry *entry, void *payload);
+
+/**
+ * An opaque structure for a configuration iterator
+ */
typedef struct git_config_iterator git_config_iterator;
/**
* Open the global/XDG configuration file according to git's rules
*
* Git allows you to store your global configuration at
- * `$HOME/.config` or `$XDG_CONFIG_HOME/git/config`. For backwards
+ * `$HOME/.gitconfig` or `$XDG_CONFIG_HOME/git/config`. For backwards
* compatability, the XDG file shouldn't be used unless the use has
* created it explicitly. With this function you'll open the correct
* one to write to.
/**
* Perform an operation on each config variable matching a regular expression.
*
- * This behaviors like `git_config_foreach` with an additional filter of a
+ * This behaves like `git_config_foreach` with an additional filter of a
* regular expression that filters which config keys are passed to the
* callback.
*
GIT_EXTERN(int) git_config_parse_path(git_buf *out, const char *value);
/**
- * Perform an operation on each config variable in given config backend
+ * Perform an operation on each config variable in a given config backend,
* matching a regular expression.
*
- * This behaviors like `git_config_foreach_match` except instead of all config
- * entries it just enumerates through the given backend entry.
+ * This behaves like `git_config_foreach_match` except that only config
+ * entries from the given backend entry are enumerated.
*
* The regular expression is applied case-sensitively on the normalized form of
* the variable name: the section and variable parts are lower-cased. The
--- /dev/null
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+#ifndef INCLUDE_git_deprecated_h__
+#define INCLUDE_git_deprecated_h__
+
+#include "common.h"
+#include "buffer.h"
+#include "errors.h"
+#include "index.h"
+#include "object.h"
+#include "refs.h"
+
+/*
+ * Users can avoid deprecated functions by defining `GIT_DEPRECATE_HARD`.
+ */
+#ifndef GIT_DEPRECATE_HARD
+
+/**
+ * @file git2/deprecated.h
+ * @brief libgit2 deprecated functions and values
+ * @ingroup Git
+ * @{
+ */
+GIT_BEGIN_DECL
+
+/** @name Deprecated Buffer Functions
+ *
+ * These functions and enumeration values are retained for backward
+ * compatibility. The newer versions of these functions should be
+ * preferred in all new code.
+ *
+ * There is no plan to remove these backward compatibility values at
+ * this time.
+ */
+/**@{*/
+
+/**
+ * Free the memory referred to by the git_buf. This is an alias of
+ * `git_buf_dispose` and is preserved for backward compatibility.
+ *
+ * This function is deprecated, but there is no plan to remove this
+ * function at this time.
+ *
+ * @deprecated Use git_buf_dispose
+ * @see git_buf_dispose
+ */
+GIT_EXTERN(void) git_buf_free(git_buf *buffer);
+
+/**@}*/
+
+/** @name Deprecated Error Functions and Constants
+ *
+ * These functions and enumeration values are retained for backward
+ * compatibility. The newer versions of these functions and values
+ * should be preferred in all new code.
+ *
+ * There is no plan to remove these backward compatibility values at
+ * this time.
+ */
+/**@{*/
+
+#define GITERR_NONE GIT_ERROR_NONE
+#define GITERR_NOMEMORY GIT_ERROR_NOMEMORY
+#define GITERR_OS GIT_ERROR_OS
+#define GITERR_INVALID GIT_ERROR_INVALID
+#define GITERR_REFERENCE GIT_ERROR_REFERENCE
+#define GITERR_ZLIB GIT_ERROR_ZLIB
+#define GITERR_REPOSITORY GIT_ERROR_REPOSITORY
+#define GITERR_CONFIG GIT_ERROR_CONFIG
+#define GITERR_REGEX GIT_ERROR_REGEX
+#define GITERR_ODB GIT_ERROR_ODB
+#define GITERR_INDEX GIT_ERROR_INDEX
+#define GITERR_OBJECT GIT_ERROR_OBJECT
+#define GITERR_NET GIT_ERROR_NET
+#define GITERR_TAG GIT_ERROR_TAG
+#define GITERR_TREE GIT_ERROR_TREE
+#define GITERR_INDEXER GIT_ERROR_INDEXER
+#define GITERR_SSL GIT_ERROR_SSL
+#define GITERR_SUBMODULE GIT_ERROR_SUBMODULE
+#define GITERR_THREAD GIT_ERROR_THREAD
+#define GITERR_STASH GIT_ERROR_STASH
+#define GITERR_CHECKOUT GIT_ERROR_CHECKOUT
+#define GITERR_FETCHHEAD GIT_ERROR_FETCHHEAD
+#define GITERR_MERGE GIT_ERROR_MERGE
+#define GITERR_SSH GIT_ERROR_SSH
+#define GITERR_FILTER GIT_ERROR_FILTER
+#define GITERR_REVERT GIT_ERROR_REVERT
+#define GITERR_CALLBACK GIT_ERROR_CALLBACK
+#define GITERR_CHERRYPICK GIT_ERROR_CHERRYPICK
+#define GITERR_DESCRIBE GIT_ERROR_DESCRIBE
+#define GITERR_REBASE GIT_ERROR_REBASE
+#define GITERR_FILESYSTEM GIT_ERROR_FILESYSTEM
+#define GITERR_PATCH GIT_ERROR_PATCH
+#define GITERR_WORKTREE GIT_ERROR_WORKTREE
+#define GITERR_SHA1 GIT_ERROR_SHA1
+
+/**
+ * Return the last `git_error` object that was generated for the
+ * current thread. This is an alias of `git_error_last` and is
+ * preserved for backward compatibility.
+ *
+ * This function is deprecated, but there is no plan to remove this
+ * function at this time.
+ *
+ * @deprecated Use git_error_last
+ * @see git_error_last
+ */
+GIT_EXTERN(const git_error *) giterr_last(void);
+
+/**
+ * Clear the last error. This is an alias of `git_error_last` and is
+ * preserved for backward compatibility.
+ *
+ * This function is deprecated, but there is no plan to remove this
+ * function at this time.
+ *
+ * @deprecated Use git_error_clear
+ * @see git_error_clear
+ */
+GIT_EXTERN(void) giterr_clear(void);
+
+/**
+ * Sets the error message to the given string. This is an alias of
+ * `git_error_set_str` and is preserved for backward compatibility.
+ *
+ * This function is deprecated, but there is no plan to remove this
+ * function at this time.
+ *
+ * @deprecated Use git_error_set_str
+ * @see git_error_set_str
+ */
+GIT_EXTERN(void) giterr_set_str(int error_class, const char *string);
+
+/**
+ * Indicates that an out-of-memory situation occured. This is an alias
+ * of `git_error_set_oom` and is preserved for backward compatibility.
+ *
+ * This function is deprecated, but there is no plan to remove this
+ * function at this time.
+ *
+ * @deprecated Use git_error_set_oom
+ * @see git_error_set_oom
+ */
+GIT_EXTERN(void) giterr_set_oom(void);
+
+/**@}*/
+
+/** @name Deprecated Index Constants
+ *
+ * These enumeration values are retained for backward compatibility.
+ * The newer versions of these values should be preferred in all new code.
+ *
+ * There is no plan to remove these backward compatibility values at
+ * this time.
+ */
+/**@{*/
+
+#define GIT_IDXENTRY_NAMEMASK GIT_INDEX_ENTRY_NAMEMASK
+#define GIT_IDXENTRY_STAGEMASK GIT_INDEX_ENTRY_STAGEMASK
+#define GIT_IDXENTRY_STAGESHIFT GIT_INDEX_ENTRY_STAGESHIFT
+
+/* The git_indxentry_flag_t enum */
+#define GIT_IDXENTRY_EXTENDED GIT_INDEX_ENTRY_EXTENDED
+#define GIT_IDXENTRY_VALID GIT_INDEX_ENTRY_VALID
+
+#define GIT_IDXENTRY_STAGE(E) GIT_INDEX_ENTRY_STAGE(E)
+#define GIT_IDXENTRY_STAGE_SET(E,S) GIT_INDEX_ENTRY_STAGE_SET(E,S)
+
+/* The git_idxentry_extended_flag_t enum */
+#define GIT_IDXENTRY_INTENT_TO_ADD GIT_INDEX_ENTRY_INTENT_TO_ADD
+#define GIT_IDXENTRY_SKIP_WORKTREE GIT_INDEX_ENTRY_SKIP_WORKTREE
+#define GIT_IDXENTRY_EXTENDED_FLAGS (GIT_INDEX_ENTRY_INTENT_TO_ADD | GIT_INDEX_ENTRY_SKIP_WORKTREE)
+#define GIT_IDXENTRY_EXTENDED2 (1 << 15)
+#define GIT_IDXENTRY_UPDATE (1 << 0)
+#define GIT_IDXENTRY_REMOVE (1 << 1)
+#define GIT_IDXENTRY_UPTODATE (1 << 2)
+#define GIT_IDXENTRY_ADDED (1 << 3)
+#define GIT_IDXENTRY_HASHED (1 << 4)
+#define GIT_IDXENTRY_UNHASHED (1 << 5)
+#define GIT_IDXENTRY_WT_REMOVE (1 << 6)
+#define GIT_IDXENTRY_CONFLICTED (1 << 7)
+#define GIT_IDXENTRY_UNPACKED (1 << 8)
+#define GIT_IDXENTRY_NEW_SKIP_WORKTREE (1 << 9)
+
+/* The git_index_capability_t enum */
+#define GIT_INDEXCAP_IGNORE_CASE GIT_INDEX_CAPABILITY_IGNORE_CASE
+#define GIT_INDEXCAP_NO_FILEMODE GIT_INDEX_CAPABILITY_NO_FILEMODE
+#define GIT_INDEXCAP_NO_SYMLINKS GIT_INDEX_CAPABILITY_NO_SYMLINKS
+#define GIT_INDEXCAP_FROM_OWNER GIT_INDEX_CAPABILITY_FROM_OWNER
+
+/**@}*/
+
+/** @name Deprecated Object Constants
+ *
+ * These enumeration values are retained for backward compatibility. The
+ * newer versions of these values should be preferred in all new code.
+ *
+ * There is no plan to remove these backward compatibility values at
+ * this time.
+ */
+/**@{*/
+
+#define git_otype git_object_t
+
+#define GIT_OBJ_ANY GIT_OBJECT_ANY
+#define GIT_OBJ_BAD GIT_OBJECT_INVALID
+#define GIT_OBJ__EXT1 0
+#define GIT_OBJ_COMMIT GIT_OBJECT_COMMIT
+#define GIT_OBJ_TREE GIT_OBJECT_TREE
+#define GIT_OBJ_BLOB GIT_OBJECT_BLOB
+#define GIT_OBJ_TAG GIT_OBJECT_TAG
+#define GIT_OBJ__EXT2 5
+#define GIT_OBJ_OFS_DELTA GIT_OBJECT_OFS_DELTA
+#define GIT_OBJ_REF_DELTA GIT_OBJECT_REF_DELTA
+
+/**@}*/
+
+/** @name Deprecated Reference Constants
+ *
+ * These enumeration values are retained for backward compatibility. The
+ * newer versions of these values should be preferred in all new code.
+ *
+ * There is no plan to remove these backward compatibility values at
+ * this time.
+ */
+/**@{*/
+
+ /** Basic type of any Git reference. */
+#define git_ref_t git_reference_t
+#define git_reference_normalize_t git_reference_format_t
+
+#define GIT_REF_INVALID GIT_REFERENCE_INVALID
+#define GIT_REF_OID GIT_REFERENCE_DIRECT
+#define GIT_REF_SYMBOLIC GIT_REFERENCE_SYMBOLIC
+#define GIT_REF_LISTALL GIT_REFERENCE_ALL
+
+#define GIT_REF_FORMAT_NORMAL GIT_REFERENCE_FORMAT_NORMAL
+#define GIT_REF_FORMAT_ALLOW_ONELEVEL GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL
+#define GIT_REF_FORMAT_REFSPEC_PATTERN GIT_REFERENCE_FORMAT_REFSPEC_PATTERN
+#define GIT_REF_FORMAT_REFSPEC_SHORTHAND GIT_REFERENCE_FORMAT_REFSPEC_SHORTHAND
+
+/**@}*/
+
+/** @} */
+GIT_END_DECL
+
+#endif
+
+#endif
/**
* Describe options structure
*
- * Initialize with `GIT_DESCRIBE_OPTIONS_INIT` macro to correctly set
- * the `version` field. E.g.
+ * Initialize with `GIT_DESCRIBE_OPTIONS_INIT`. Alternatively, you can
+ * use `git_describe_init_options`.
*
- * git_describe_options opts = GIT_DESCRIBE_OPTIONS_INIT;
*/
typedef struct git_describe_options {
unsigned int version;
GIT_DESCRIBE_DEFAULT_MAX_CANDIDATES_TAGS, \
}
+/**
+ * Initialize git_describe_options structure
+ *
+ * Initializes a `git_describe_options` with default values. Equivalent to creating
+ * an instance with GIT_DESCRIBE_OPTIONS_INIT.
+ *
+ * @param opts The `git_describe_options` struct to initialize.
+ * @param version The struct version; pass `GIT_DESCRIBE_OPTIONS_VERSION`.
+ * @return Zero on success; -1 on failure.
+ */
GIT_EXTERN(int) git_describe_init_options(git_describe_options *opts, unsigned int version);
/**
- * Options for formatting the describe string
+ * Describe format options structure
+ *
+ * Initialize with `GIT_DESCRIBE_FORMAT_OPTIONS_INIT`. Alternatively, you can
+ * use `git_describe_format_init_options`.
+ *
*/
typedef struct {
unsigned int version;
GIT_DESCRIBE_DEFAULT_ABBREVIATED_SIZE, \
}
+/**
+ * Initialize git_describe_format_options structure
+ *
+ * Initializes a `git_describe_format_options` with default values. Equivalent to creating
+ * an instance with GIT_DESCRIBE_FORMAT_OPTIONS_INIT.
+ *
+ * @param opts The `git_describe_format_options` struct to initialize.
+ * @param version The struct version; pass `GIT_DESCRIBE_FORMAT_OPTIONS_VERSION`.
+ * @return Zero on success; -1 on failure.
+ */
GIT_EXTERN(int) git_describe_init_format_options(git_describe_format_options *opts, unsigned int version);
/**
* @param result pointer to store the result. You must free this once
* you're done with it.
* @param committish a committish to describe
- * @param opts the lookup options
+ * @param opts the lookup options (or NULL for defaults)
*/
GIT_EXTERN(int) git_describe_commit(
git_describe_result **result,
* @param out pointer to store the result. You must free this once
* you're done with it.
* @param repo the repository in which to perform the describe
- * @param opts the lookup options
+ * @param opts the lookup options (or NULL for defaults)
*/
GIT_EXTERN(int) git_describe_workdir(
git_describe_result **out,
* @param out The buffer to store the result
* @param result the result from `git_describe_commit()` or
* `git_describe_workdir()`.
- * @param opts the formatting options
+ * @param opts the formatting options (or NULL for defaults)
*/
GIT_EXTERN(int) git_describe_format(
git_buf *out,
/**
* @file git2/diff.h
* @brief Git tree and file differencing routines.
- *
- * Overview
- * --------
- *
- * Calculating diffs is generally done in two phases: building a list of
- * diffs then traversing it. This makes is easier to share logic across
- * the various types of diffs (tree vs tree, workdir vs index, etc.), and
- * also allows you to insert optional diff post-processing phases,
- * such as rename detection, in between the steps. When you are done with
- * a diff object, it must be freed.
- *
- * Terminology
- * -----------
- *
- * To understand the diff APIs, you should know the following terms:
- *
- * - A `diff` represents the cumulative list of differences between two
- * snapshots of a repository (possibly filtered by a set of file name
- * patterns). This is the `git_diff` object.
- *
- * - A `delta` is a file pair with an old and new revision. The old version
- * may be absent if the file was just created and the new version may be
- * absent if the file was deleted. A diff is mostly just a list of deltas.
- *
- * - A `binary` file / delta is a file (or pair) for which no text diffs
- * should be generated. A diff can contain delta entries that are
- * binary, but no diff content will be output for those files. There is
- * a base heuristic for binary detection and you can further tune the
- * behavior with git attributes or diff flags and option settings.
- *
- * - A `hunk` is a span of modified lines in a delta along with some stable
- * surrounding context. You can configure the amount of context and other
- * properties of how hunks are generated. Each hunk also comes with a
- * header that described where it starts and ends in both the old and new
- * versions in the delta.
- *
- * - A `line` is a range of characters inside a hunk. It could be a context
- * line (i.e. in both old and new versions), an added line (i.e. only in
- * the new version), or a removed line (i.e. only in the old version).
- * Unfortunately, we don't know anything about the encoding of data in the
- * file being diffed, so we cannot tell you much about the line content.
- * Line data will not be NUL-byte terminated, however, because it will be
- * just a span of bytes inside the larger file.
- *
* @ingroup Git
* @{
*/
* Options controlling how output will be generated
*/
+ /** Use a heuristic that takes indentation and whitespace into account
+ * which generally can produce better diffs when dealing with ambiguous
+ * diff hunks.
+ */
+ GIT_DIFF_INDENT_HEURISTIC = (1u << 18),
+
/** Treat all files as text, disabling binary attributes & detection */
GIT_DIFF_FORCE_TEXT = (1u << 20),
/** Treat all files as binary, disabling text diffs */
* can apply given diff information to binary files.
*/
GIT_DIFF_SHOW_BINARY = (1u << 30),
-
- /** Use a heuristic that takes indentation and whitespace into account
- * which generally can produce better diffs when dealing with ambiguous
- * diff hunks.
- */
- GIT_DIFF_INDENT_HEURISTIC = (1u << 31),
} git_diff_option_t;
/**
* The diff object that contains all individual file deltas.
*
+ * A `diff` represents the cumulative list of differences between two
+ * snapshots of a repository (possibly filtered by a set of file name
+ * patterns).
+ *
+ * Calculating diffs is generally done in two phases: building a list of
+ * diffs then traversing it. This makes is easier to share logic across
+ * the various types of diffs (tree vs tree, workdir vs index, etc.), and
+ * also allows you to insert optional diff post-processing phases,
+ * such as rename detection, in between the steps. When you are done with
+ * a diff object, it must be freed.
+ *
* This is an opaque structure which will be allocated by one of the diff
- * generator functions below (such as `git_diff_tree_to_tree`). You are
+ * generator functions below (such as `git_diff_tree_to_tree`). You are
* responsible for releasing the object memory when done, using the
* `git_diff_free()` function.
+ *
*/
typedef struct git_diff git_diff;
/**
* Description of changes to one entry.
*
+ * A `delta` is a file pair with an old and new revision. The old version
+ * may be absent if the file was just created and the new version may be
+ * absent if the file was deleted. A diff is mostly just a list of deltas.
+ *
* When iterating over a diff, this will be passed to most callbacks and
* you can use the contents to understand exactly what has changed.
*
/**
* Diff notification callback function.
*
- * The callback will be called for each file, just before the `git_delta_t`
+ * The callback will be called for each file, just before the `git_diff_delta`
* gets inserted into the diff.
*
* When the callback:
* - returns 0, the delta is inserted into the diff, and the diff process
* continues.
*/
-typedef int (*git_diff_notify_cb)(
+typedef int GIT_CALLBACK(git_diff_notify_cb)(
const git_diff *diff_so_far,
const git_diff_delta *delta_to_add,
const char *matched_pathspec,
* @param new_path The path to the new file or NULL.
* @return Non-zero to abort the diff.
*/
-typedef int (*git_diff_progress_cb)(
+typedef int GIT_CALLBACK(git_diff_progress_cb)(
const git_diff *diff_so_far,
const char *old_path,
const char *new_path,
* values. Similarly, passing NULL for the options structure will
* give the defaults. The default values are marked below.
*
- * - `flags` is a combination of the `git_diff_option_t` values above
- * - `context_lines` is the number of unchanged lines that define the
- * boundary of a hunk (and to display before and after)
- * - `interhunk_lines` is the maximum number of unchanged lines between
- * hunk boundaries before the hunks will be merged into a one.
- * - `old_prefix` is the virtual "directory" to prefix to old file names
- * in hunk headers (default "a")
- * - `new_prefix` is the virtual "directory" to prefix to new file names
- * in hunk headers (default "b")
- * - `pathspec` is an array of paths / fnmatch patterns to constrain diff
- * - `max_size` is a file size (in bytes) above which a blob will be marked
- * as binary automatically; pass a negative value to disable.
- * - `notify_cb` is an optional callback function, notifying the consumer of
- * changes to the diff as new deltas are added.
- * - `progress_cb` is an optional callback function, notifying the consumer of
- * which files are being examined as the diff is generated.
- * - `payload` is the payload to pass to the callback functions.
- * - `ignore_submodules` overrides the submodule ignore setting for all
- * submodules in the diff.
*/
typedef struct {
unsigned int version; /**< version for the struct */
- uint32_t flags; /**< defaults to GIT_DIFF_NORMAL */
+
+ /**
+ * A combination of `git_diff_option_t` values above.
+ * Defaults to GIT_DIFF_NORMAL
+ */
+ uint32_t flags;
/* options controlling which files are in the diff */
- git_submodule_ignore_t ignore_submodules; /**< submodule ignore rule */
- git_strarray pathspec; /**< defaults to include all paths */
+ /** Overrides the submodule ignore setting for all submodules in the diff. */
+ git_submodule_ignore_t ignore_submodules;
+
+ /**
+ * An array of paths / fnmatch patterns to constrain diff.
+ * All paths are included by default.
+ */
+ git_strarray pathspec;
+
+ /**
+ * An optional callback function, notifying the consumer of changes to
+ * the diff as new deltas are added.
+ */
git_diff_notify_cb notify_cb;
+
+ /**
+ * An optional callback function, notifying the consumer of which files
+ * are being examined as the diff is generated.
+ */
git_diff_progress_cb progress_cb;
+
+ /** The payload to pass to the callback functions. */
void *payload;
/* options controlling how to diff text is generated */
- uint32_t context_lines; /**< defaults to 3 */
- uint32_t interhunk_lines; /**< defaults to 0 */
- uint16_t id_abbrev; /**< default 'core.abbrev' or 7 if unset */
- git_off_t max_size; /**< defaults to 512MB */
- const char *old_prefix; /**< defaults to "a" */
- const char *new_prefix; /**< defaults to "b" */
+ /**
+ * The number of unchanged lines that define the boundary of a hunk
+ * (and to display before and after). Defaults to 3.
+ */
+ uint32_t context_lines;
+ /**
+ * The maximum number of unchanged lines between hunk boundaries before
+ * the hunks will be merged into one. Defaults to 0.
+ */
+ uint32_t interhunk_lines;
+
+ /**
+ * The abbreviation length to use when formatting object ids.
+ * Defaults to the value of 'core.abbrev' from the config, or 7 if unset.
+ */
+ uint16_t id_abbrev;
+
+ /**
+ * A size (in bytes) above which a blob will be marked as binary
+ * automatically; pass a negative value to disable.
+ * Defaults to 512MB.
+ */
+ git_off_t max_size;
+
+ /**
+ * The virtual "directory" prefix for old file names in hunk headers.
+ * Default is "a".
+ */
+ const char *old_prefix;
+
+ /**
+ * The virtual "directory" prefix for new file names in hunk headers.
+ * Defaults to "b".
+ */
+ const char *new_prefix;
} git_diff_options;
/* The current version of the diff options structure */
{GIT_DIFF_OPTIONS_VERSION, 0, GIT_SUBMODULE_IGNORE_UNSPECIFIED, {NULL,0}, NULL, NULL, NULL, 3}
/**
- * Initializes a `git_diff_options` with default values. Equivalent to
- * creating an instance with GIT_DIFF_OPTIONS_INIT.
+ * Initialize git_diff_options structure
+ *
+ * Initializes a `git_diff_options` with default values. Equivalent to creating
+ * an instance with GIT_DIFF_OPTIONS_INIT.
*
- * @param opts The `git_diff_options` struct to initialize
- * @param version Version of struct; pass `GIT_DIFF_OPTIONS_VERSION`
+ * @param opts The `git_diff_options` struct to initialize.
+ * @param version The struct version; pass `GIT_DIFF_OPTIONS_VERSION`.
* @return Zero on success; -1 on failure.
*/
GIT_EXTERN(int) git_diff_init_options(
* @param progress Goes from 0 to 1 over the diff
* @param payload User-specified pointer from foreach function
*/
-typedef int (*git_diff_file_cb)(
+typedef int GIT_CALLBACK(git_diff_file_cb)(
const git_diff_delta *delta,
float progress,
void *payload);
size_t inflatedlen;
} git_diff_binary_file;
-/** Structure describing the binary contents of a diff. */
+/**
+ * Structure describing the binary contents of a diff.
+ *
+ * A `binary` file / delta is a file (or pair) for which no text diffs
+ * should be generated. A diff can contain delta entries that are
+ * binary, but no diff content will be output for those files. There is
+ * a base heuristic for binary detection and you can further tune the
+ * behavior with git attributes or diff flags and option settings.
+ */
typedef struct {
/**
- * Whether there is data in this binary structure or not. If this
- * is `1`, then this was produced and included binary content. If
- * this is `0` then this was generated knowing only that a binary
+ * Whether there is data in this binary structure or not.
+ *
+ * If this is `1`, then this was produced and included binary content.
+ * If this is `0` then this was generated knowing only that a binary
* file changed but without providing the data, probably from a patch
* that said `Binary files a/file.txt and b/file.txt differ`.
*/
} git_diff_binary;
/**
-* When iterating over a diff, callback that will be made for
-* binary content within the diff.
-*/
-typedef int(*git_diff_binary_cb)(
+ * When iterating over a diff, callback that will be made for
+ * binary content within the diff.
+ */
+typedef int GIT_CALLBACK(git_diff_binary_cb)(
const git_diff_delta *delta,
const git_diff_binary *binary,
void *payload);
/**
* Structure describing a hunk of a diff.
+ *
+ * A `hunk` is a span of modified lines in a delta along with some stable
+ * surrounding context. You can configure the amount of context and other
+ * properties of how hunks are generated. Each hunk also comes with a
+ * header that described where it starts and ends in both the old and new
+ * versions in the delta.
*/
typedef struct {
int old_start; /**< Starting line number in old_file */
/**
* When iterating over a diff, callback that will be made per hunk.
*/
-typedef int (*git_diff_hunk_cb)(
+typedef int GIT_CALLBACK(git_diff_hunk_cb)(
const git_diff_delta *delta,
const git_diff_hunk *hunk,
void *payload);
/**
* Structure describing a line (or data span) of a diff.
+ *
+ * A `line` is a range of characters inside a hunk. It could be a context
+ * line (i.e. in both old and new versions), an added line (i.e. only in
+ * the new version), or a removed line (i.e. only in the old version).
+ * Unfortunately, we don't know anything about the encoding of data in the
+ * file being diffed, so we cannot tell you much about the line content.
+ * Line data will not be NUL-byte terminated, however, because it will be
+ * just a span of bytes inside the larger file.
*/
typedef struct {
char origin; /**< A git_diff_line_t value */
* of text. This uses some extra GIT_DIFF_LINE_... constants for output
* of lines of file and hunk headers.
*/
-typedef int (*git_diff_line_cb)(
+typedef int GIT_CALLBACK(git_diff_line_cb)(
const git_diff_delta *delta, /**< delta that contains this data */
const git_diff_hunk *hunk, /**< hunk containing this data */
const git_diff_line *line, /**< line data */
* Pluggable similarity metric
*/
typedef struct {
- int (*file_signature)(
+ int GIT_CALLBACK(file_signature)(
void **out, const git_diff_file *file,
const char *fullpath, void *payload);
- int (*buffer_signature)(
+ int GIT_CALLBACK(buffer_signature)(
void **out, const git_diff_file *file,
const char *buf, size_t buflen, void *payload);
- void (*free_signature)(void *sig, void *payload);
- int (*similarity)(int *score, void *siga, void *sigb, void *payload);
+ void GIT_CALLBACK(free_signature)(void *sig, void *payload);
+ int GIT_CALLBACK(similarity)(int *score, void *siga, void *sigb, void *payload);
void *payload;
} git_diff_similarity_metric;
* Control behavior of rename and copy detection
*
* These options mostly mimic parameters that can be passed to git-diff.
- *
- * - `rename_threshold` is the same as the -M option with a value
- * - `copy_threshold` is the same as the -C option with a value
- * - `rename_from_rewrite_threshold` matches the top of the -B option
- * - `break_rewrite_threshold` matches the bottom of the -B option
- * - `rename_limit` is the maximum number of matches to consider for
- * a particular file. This is a little different from the `-l` option
- * to regular Git because we will still process up to this many matches
- * before abandoning the search.
- *
- * The `metric` option allows you to plug in a custom similarity metric.
- * Set it to NULL for the default internal metric which is based on sampling
- * hashes of ranges of data in the file. The default metric is a pretty
- * good similarity approximation that should work fairly well for both text
- * and binary data, and is pretty fast with fixed memory overhead.
*/
typedef struct {
unsigned int version;
*/
uint32_t flags;
- /** Similarity to consider a file renamed (default 50) */
+ /**
+ * Threshold above which similar files will be considered renames.
+ * This is equivalent to the -M option. Defaults to 50.
+ */
uint16_t rename_threshold;
- /** Similarity of modified to be eligible rename source (default 50) */
+
+ /**
+ * Threshold below which similar files will be eligible to be a rename source.
+ * This is equivalent to the first part of the -B option. Defaults to 50.
+ */
uint16_t rename_from_rewrite_threshold;
- /** Similarity to consider a file a copy (default 50) */
+
+ /**
+ * Threshold above which similar files will be considered copies.
+ * This is equivalent to the -C option. Defaults to 50.
+ */
uint16_t copy_threshold;
- /** Similarity to split modify into delete/add pair (default 60) */
+
+ /**
+ * Treshold below which similar files will be split into a delete/add pair.
+ * This is equivalent to the last part of the -B option. Defaults to 60.
+ */
uint16_t break_rewrite_threshold;
- /** Maximum similarity sources to examine for a file (somewhat like
- * git-diff's `-l` option or `diff.renameLimit` config) (default 200)
+ /**
+ * Maximum number of matches to consider for a particular file.
+ *
+ * This is a little different from the `-l` option from Git because we
+ * will still process up to this many matches before abandoning the search.
+ * Defaults to 200.
*/
size_t rename_limit;
- /** Pluggable similarity metric; pass NULL to use internal metric */
+ /**
+ * The `metric` option allows you to plug in a custom similarity metric.
+ *
+ * Set it to NULL to use the default internal metric.
+ *
+ * The default metric is based on sampling hashes of ranges of data in
+ * the file, which is a pretty good similarity approximation that should
+ * work fairly well for both text and binary data while still being
+ * pretty fast with a fixed memory overhead.
+ */
git_diff_similarity_metric *metric;
} git_diff_find_options;
#define GIT_DIFF_FIND_OPTIONS_INIT {GIT_DIFF_FIND_OPTIONS_VERSION}
/**
- * Initializes a `git_diff_find_options` with default values. Equivalent to
- * creating an instance with GIT_DIFF_FIND_OPTIONS_INIT.
+ * Initialize git_diff_find_options structure
+ *
+ * Initializes a `git_diff_find_options` with default values. Equivalent to creating
+ * an instance with GIT_DIFF_FIND_OPTIONS_INIT.
*
- * @param opts The `git_diff_find_options` struct to initialize
- * @param version Version of struct; pass `GIT_DIFF_FIND_OPTIONS_VERSION`
+ * @param opts The `git_diff_find_options` struct to initialize.
+ * @param version The struct version; pass `GIT_DIFF_FIND_OPTIONS_VERSION`.
* @return Zero on success; -1 on failure.
*/
GIT_EXTERN(int) git_diff_find_init_options(
git_repository *repo,
git_tree *old_tree,
git_tree *new_tree,
- const git_diff_options *opts); /**< can be NULL for defaults */
+ const git_diff_options *opts);
/**
* Create a diff between a tree and repository index.
git_repository *repo,
git_tree *old_tree,
git_index *index,
- const git_diff_options *opts); /**< can be NULL for defaults */
+ const git_diff_options *opts);
/**
* Create a diff between the repository index and the workdir directory.
git_diff **diff,
git_repository *repo,
git_index *index,
- const git_diff_options *opts); /**< can be NULL for defaults */
+ const git_diff_options *opts);
/**
* Create a diff between a tree and the working directory.
git_diff **diff,
git_repository *repo,
git_tree *old_tree,
- const git_diff_options *opts); /**< can be NULL for defaults */
+ const git_diff_options *opts);
/**
* Create a diff between a tree and the working directory using index data
git_diff **diff,
git_repository *repo,
git_tree *old_tree,
- const git_diff_options *opts); /**< can be NULL for defaults */
+ const git_diff_options *opts);
/**
* Create a diff with the difference between two index objects.
git_repository *repo,
git_index *old_index,
git_index *new_index,
- const git_diff_options *opts); /**< can be NULL for defaults */
+ const git_diff_options *opts);
/**
* Merge one diff into another.
const git_diff_options *diff_opts);
/**
- * Initializes a `git_diff_format_email_options` with default values.
+ * Initialize git_diff_format_email_options structure
*
- * Equivalent to creating an instance with GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT.
+ * Initializes a `git_diff_format_email_options` with default values. Equivalent
+ * to creating an instance with GIT_DIFF_FORMAT_EMAIL_OPTIONS_INIT.
*
- * @param opts The `git_diff_format_email_options` struct to initialize
- * @param version Version of struct; pass `GIT_DIFF_FORMAT_EMAIL_OPTIONS_VERSION`
+ * @param opts The `git_blame_options` struct to initialize.
+ * @param version The struct version; pass `GIT_DIFF_FORMAT_EMAIL_OPTIONS_VERSION`.
* @return Zero on success; -1 on failure.
*/
GIT_EXTERN(int) git_diff_format_email_init_options(
/**
* Patch ID options structure
*
- * Initialize with `GIT_DIFF_PATCHID_OPTIONS_INIT` macro to
- * correctly set the default values and version.
+ * Initialize with `GIT_PATCHID_OPTIONS_INIT`. Alternatively, you can
+ * use `git_patchid_init_options`.
+ *
*/
typedef struct git_diff_patchid_options {
unsigned int version;
#define GIT_DIFF_PATCHID_OPTIONS_INIT { GIT_DIFF_PATCHID_OPTIONS_VERSION }
/**
- * Initialize `git_diff_patchid_options` structure.
+ * Initialize git_diff_patchid_options structure
*
- * Initializes the structure with default values. Equivalent to
+ * Initializes a `git_diff_patchid_options` with default values. Equivalent to
* creating an instance with `GIT_DIFF_PATCHID_OPTIONS_INIT`.
+ *
+ * @param opts The `git_diff_patchid_options` struct to initialize.
+ * @param version The struct version; pass `GIT_DIFF_PATCHID_OPTIONS_VERSION`.
+ * @return Zero on success; -1 on failure.
*/
GIT_EXTERN(int) git_diff_patchid_init_options(
git_diff_patchid_options *opts,
* defined in git-patch-id(1), and should in fact generate the
* same IDs as the upstream git project does.
*
- * @param out Pointer where the calculated patch ID shoul be
- * stored
+ * @param out Pointer where the calculated patch ID should be stored
* @param diff The diff to calculate the ID for
* @param opts Options for how to calculate the patch ID. This is
* intended for future changes, as currently no options are
GIT_EAMBIGUOUS = -5, /**< More than one object matches */
GIT_EBUFS = -6, /**< Output buffer too short to hold data */
- /* GIT_EUSER is a special error that is never generated by libgit2
+ /**
+ * GIT_EUSER is a special error that is never generated by libgit2
* code. You can return it from a callback (e.g to stop an iteration)
* to know that it was generated by the callback and not by libgit2.
*/
GIT_EDIRECTORY = -23, /**< The operation is not valid for a directory */
GIT_EMERGECONFLICT = -24, /**< A merge conflict exists and cannot continue */
- GIT_PASSTHROUGH = -30, /**< Internal only */
+ GIT_PASSTHROUGH = -30, /**< A user-configured callback refused to act */
GIT_ITEROVER = -31, /**< Signals end of iteration with iterator */
GIT_RETRY = -32, /**< Internal only */
GIT_EMISMATCH = -33, /**< Hashsum mismatch in object */
+ GIT_EINDEXDIRTY = -34, /**< Unsaved changes in the index would be overwritten */
+ GIT_EAPPLYFAIL = -35, /**< Patch application failed */
} git_error_code;
/**
/** Error classes */
typedef enum {
- GITERR_NONE = 0,
- GITERR_NOMEMORY,
- GITERR_OS,
- GITERR_INVALID,
- GITERR_REFERENCE,
- GITERR_ZLIB,
- GITERR_REPOSITORY,
- GITERR_CONFIG,
- GITERR_REGEX,
- GITERR_ODB,
- GITERR_INDEX,
- GITERR_OBJECT,
- GITERR_NET,
- GITERR_TAG,
- GITERR_TREE,
- GITERR_INDEXER,
- GITERR_SSL,
- GITERR_SUBMODULE,
- GITERR_THREAD,
- GITERR_STASH,
- GITERR_CHECKOUT,
- GITERR_FETCHHEAD,
- GITERR_MERGE,
- GITERR_SSH,
- GITERR_FILTER,
- GITERR_REVERT,
- GITERR_CALLBACK,
- GITERR_CHERRYPICK,
- GITERR_DESCRIBE,
- GITERR_REBASE,
- GITERR_FILESYSTEM,
- GITERR_PATCH,
- GITERR_WORKTREE,
- GITERR_SHA1
+ GIT_ERROR_NONE = 0,
+ GIT_ERROR_NOMEMORY,
+ GIT_ERROR_OS,
+ GIT_ERROR_INVALID,
+ GIT_ERROR_REFERENCE,
+ GIT_ERROR_ZLIB,
+ GIT_ERROR_REPOSITORY,
+ GIT_ERROR_CONFIG,
+ GIT_ERROR_REGEX,
+ GIT_ERROR_ODB,
+ GIT_ERROR_INDEX,
+ GIT_ERROR_OBJECT,
+ GIT_ERROR_NET,
+ GIT_ERROR_TAG,
+ GIT_ERROR_TREE,
+ GIT_ERROR_INDEXER,
+ GIT_ERROR_SSL,
+ GIT_ERROR_SUBMODULE,
+ GIT_ERROR_THREAD,
+ GIT_ERROR_STASH,
+ GIT_ERROR_CHECKOUT,
+ GIT_ERROR_FETCHHEAD,
+ GIT_ERROR_MERGE,
+ GIT_ERROR_SSH,
+ GIT_ERROR_FILTER,
+ GIT_ERROR_REVERT,
+ GIT_ERROR_CALLBACK,
+ GIT_ERROR_CHERRYPICK,
+ GIT_ERROR_DESCRIBE,
+ GIT_ERROR_REBASE,
+ GIT_ERROR_FILESYSTEM,
+ GIT_ERROR_PATCH,
+ GIT_ERROR_WORKTREE,
+ GIT_ERROR_SHA1
} git_error_t;
/**
* Return the last `git_error` object that was generated for the
- * current thread or NULL if no error has occurred.
+ * current thread.
+ *
+ * The default behaviour of this function is to return NULL if no previous error has occurred.
+ * However, libgit2's error strings are not cleared aggressively, so a prior
+ * (unrelated) error may be returned. This can be avoided by only calling
+ * this function if the prior call to a libgit2 API returned an error.
*
* @return A git_error object.
*/
-GIT_EXTERN(const git_error *) giterr_last(void);
+GIT_EXTERN(const git_error *) git_error_last(void);
/**
* Clear the last library error that occurred for this thread.
*/
-GIT_EXTERN(void) giterr_clear(void);
+GIT_EXTERN(void) git_error_clear(void);
/**
* Set the error message string for this thread.
* general subsystem that is responsible for the error.
* @param string The formatted error message to keep
*/
-GIT_EXTERN(void) giterr_set_str(int error_class, const char *string);
+GIT_EXTERN(void) git_error_set_str(int error_class, const char *string);
/**
* Set the error message to a special value for memory allocation failure.
*
- * The normal `giterr_set_str()` function attempts to `strdup()` the string
- * that is passed in. This is not a good idea when the error in question
- * is a memory allocation failure. That circumstance has a special setter
- * function that sets the error string to a known and statically allocated
- * internal value.
+ * The normal `git_error_set_str()` function attempts to `strdup()` the
+ * string that is passed in. This is not a good idea when the error in
+ * question is a memory allocation failure. That circumstance has a
+ * special setter function that sets the error string to a known and
+ * statically allocated internal value.
*/
-GIT_EXTERN(void) giterr_set_oom(void);
+GIT_EXTERN(void) git_error_set_oom(void);
/** @} */
GIT_END_DECL
* given file. This indicates if the file would be ignored regardless of
* whether the file is already in the index or committed to the repository.
*
- * One way to think of this is if you were to do "git add ." on the
- * directory containing the file, would it be added or not?
+ * One way to think of this is if you were to do "git check-ignore --no-index"
+ * on the given file, would it be shown or not?
*
* @param ignored boolean returning 0 if the file is not ignored, 1 if it is
* @param repo a repository object
* "Documentation/technical/index-format.txt").
*
* The `flags` field consists of a number of bit fields which can be
- * accessed via the first set of `GIT_IDXENTRY_...` bitmasks below. These
- * flags are all read from and persisted to disk.
+ * accessed via the first set of `GIT_INDEX_ENTRY_...` bitmasks below.
+ * These flags are all read from and persisted to disk.
*
* The `flags_extended` field also has a number of bit fields which can be
- * accessed via the later `GIT_IDXENTRY_...` bitmasks below. Some of
+ * accessed via the later `GIT_INDEX_ENTRY_...` bitmasks below. Some of
* these flags are read from and written to disk, but some are set aside
* for in-memory only reference.
*
* value both in memory and on disk. You can use them to interpret the
* data in the `flags`.
*/
-#define GIT_IDXENTRY_NAMEMASK (0x0fff)
-#define GIT_IDXENTRY_STAGEMASK (0x3000)
-#define GIT_IDXENTRY_STAGESHIFT 12
+
+#define GIT_INDEX_ENTRY_NAMEMASK (0x0fff)
+#define GIT_INDEX_ENTRY_STAGEMASK (0x3000)
+#define GIT_INDEX_ENTRY_STAGESHIFT 12
/**
* Flags for index entries
*/
typedef enum {
- GIT_IDXENTRY_EXTENDED = (0x4000),
- GIT_IDXENTRY_VALID = (0x8000),
-} git_indxentry_flag_t;
+ GIT_INDEX_ENTRY_EXTENDED = (0x4000),
+ GIT_INDEX_ENTRY_VALID = (0x8000),
+} git_index_entry_flag_t;
-#define GIT_IDXENTRY_STAGE(E) \
- (((E)->flags & GIT_IDXENTRY_STAGEMASK) >> GIT_IDXENTRY_STAGESHIFT)
+#define GIT_INDEX_ENTRY_STAGE(E) \
+ (((E)->flags & GIT_INDEX_ENTRY_STAGEMASK) >> GIT_INDEX_ENTRY_STAGESHIFT)
-#define GIT_IDXENTRY_STAGE_SET(E,S) do { \
- (E)->flags = ((E)->flags & ~GIT_IDXENTRY_STAGEMASK) | \
- (((S) & 0x03) << GIT_IDXENTRY_STAGESHIFT); } while (0)
+#define GIT_INDEX_ENTRY_STAGE_SET(E,S) do { \
+ (E)->flags = ((E)->flags & ~GIT_INDEX_ENTRY_STAGEMASK) | \
+ (((S) & 0x03) << GIT_INDEX_ENTRY_STAGESHIFT); } while (0)
/**
* Bitmasks for on-disk fields of `git_index_entry`'s `flags_extended`
* In memory, the `flags_extended` fields are divided into two parts: the
* fields that are read from and written to disk, and other fields that
* in-memory only and used by libgit2. Only the flags in
- * `GIT_IDXENTRY_EXTENDED_FLAGS` will get saved on-disk.
+ * `GIT_INDEX_ENTRY_EXTENDED_FLAGS` will get saved on-disk.
*
* Thee first three bitmasks match the three fields in the
* `git_index_entry` `flags_extended` value that belong on disk. You
*
*/
typedef enum {
+ GIT_INDEX_ENTRY_INTENT_TO_ADD = (1 << 13),
+ GIT_INDEX_ENTRY_SKIP_WORKTREE = (1 << 14),
- GIT_IDXENTRY_INTENT_TO_ADD = (1 << 13),
- GIT_IDXENTRY_SKIP_WORKTREE = (1 << 14),
- /** Reserved for future extension */
- GIT_IDXENTRY_EXTENDED2 = (1 << 15),
-
- GIT_IDXENTRY_EXTENDED_FLAGS = (GIT_IDXENTRY_INTENT_TO_ADD | GIT_IDXENTRY_SKIP_WORKTREE),
- GIT_IDXENTRY_UPDATE = (1 << 0),
- GIT_IDXENTRY_REMOVE = (1 << 1),
- GIT_IDXENTRY_UPTODATE = (1 << 2),
- GIT_IDXENTRY_ADDED = (1 << 3),
+ GIT_INDEX_ENTRY_EXTENDED_FLAGS = (GIT_INDEX_ENTRY_INTENT_TO_ADD | GIT_INDEX_ENTRY_SKIP_WORKTREE),
- GIT_IDXENTRY_HASHED = (1 << 4),
- GIT_IDXENTRY_UNHASHED = (1 << 5),
- GIT_IDXENTRY_WT_REMOVE = (1 << 6), /**< remove in work directory */
- GIT_IDXENTRY_CONFLICTED = (1 << 7),
-
- GIT_IDXENTRY_UNPACKED = (1 << 8),
- GIT_IDXENTRY_NEW_SKIP_WORKTREE = (1 << 9),
-} git_idxentry_extended_flag_t;
+ GIT_INDEX_ENTRY_UPTODATE = (1 << 2),
+} git_index_entry_extended_flag_t;
/** Capabilities of system that affect index actions. */
typedef enum {
- GIT_INDEXCAP_IGNORE_CASE = 1,
- GIT_INDEXCAP_NO_FILEMODE = 2,
- GIT_INDEXCAP_NO_SYMLINKS = 4,
- GIT_INDEXCAP_FROM_OWNER = -1,
-} git_indexcap_t;
+ GIT_INDEX_CAPABILITY_IGNORE_CASE = 1,
+ GIT_INDEX_CAPABILITY_NO_FILEMODE = 2,
+ GIT_INDEX_CAPABILITY_NO_SYMLINKS = 4,
+ GIT_INDEX_CAPABILITY_FROM_OWNER = -1,
+} git_index_capability_t;
+
/** Callback for APIs that add/remove/update files matching pathspec */
-typedef int (*git_index_matched_path_cb)(
+typedef int GIT_CALLBACK(git_index_matched_path_cb)(
const char *path, const char *matched_pathspec, void *payload);
/** Flags for APIs that add files matching pathspec */
GIT_INDEX_STAGE_THEIRS = 3,
} git_index_stage_t;
-/** @name Index File Functions
- *
- * These functions work on the index file itself.
- */
-/**@{*/
-
/**
* Create a new bare Git index object as a memory representation
* of the Git index file in 'index_path', without a repository
* Read index capabilities flags.
*
* @param index An existing index object
- * @return A combination of GIT_INDEXCAP values
+ * @return A combination of GIT_INDEX_CAPABILITY values
*/
GIT_EXTERN(int) git_index_caps(const git_index *index);
/**
* Set index capabilities flags.
*
- * If you pass `GIT_INDEXCAP_FROM_OWNER` for the caps, then the
+ * If you pass `GIT_INDEX_CAPABILITY_FROM_OWNER` for the caps, then
* capabilities will be read from the config of the owner object,
* looking at `core.ignorecase`, `core.filemode`, `core.symlinks`.
*
* @param index An existing index object
- * @param caps A combination of GIT_INDEXCAP values
+ * @param caps A combination of GIT_INDEX_CAPABILITY values
* @return 0 on success, -1 on failure
*/
GIT_EXTERN(int) git_index_set_caps(git_index *index, int caps);
*
* This entry is calculated from the entry's flag attribute like this:
*
- * (entry->flags & GIT_IDXENTRY_STAGEMASK) >> GIT_IDXENTRY_STAGESHIFT
+ * (entry->flags & GIT_INDEX_ENTRY_STAGEMASK) >> GIT_INDEX_ENTRY_STAGESHIFT
*
* @param entry The entry
* @return the stage number
/**@}*/
+/** @name Index Entry Iteration Functions
+ *
+ * These functions provide an iterator for index entries.
+ */
+/**@{*/
+
+/**
+ * Create an iterator that will return every entry contained in the
+ * index at the time of creation. Entries are returned in order,
+ * sorted by path. This iterator is backed by a snapshot that allows
+ * callers to modify the index while iterating without affecting the
+ * iterator.
+ *
+ * @param iterator_out The newly created iterator
+ * @param index The index to iterate
+ */
+GIT_EXTERN(int) git_index_iterator_new(
+ git_index_iterator **iterator_out,
+ git_index *index);
+
+/**
+ * Return the next index entry in-order from the iterator.
+ *
+ * @param out Pointer to store the index entry in
+ * @param iterator The iterator
+ * @return 0, GIT_ITEROVER on iteration completion or an error code
+ */
+GIT_EXTERN(int) git_index_iterator_next(
+ const git_index_entry **out,
+ git_index_iterator *iterator);
+
+/**
+ * Free the index iterator
+ *
+ * @param iterator The iterator to free
+ */
+GIT_EXTERN(void) git_index_iterator_free(git_index_iterator *iterator);
+
+/**@}*/
+
/** @name Workdir Index Entry Functions
*
* These functions work on index entries specifically in the working
GIT_EXTERN(void) git_index_conflict_iterator_free(
git_index_conflict_iterator *iterator);
-/**@}*/
-
/** @} */
GIT_END_DECL
#endif
typedef struct git_indexer git_indexer;
+typedef struct git_indexer_options {
+ unsigned int version;
+
+ /** progress_cb function to call with progress information */
+ git_transfer_progress_cb progress_cb;
+ /** progress_cb_payload payload for the progress callback */
+ void *progress_cb_payload;
+
+ /** Do connectivity checks for the received pack */
+ unsigned char verify;
+} git_indexer_options;
+
+#define GIT_INDEXER_OPTIONS_VERSION 1
+#define GIT_INDEXER_OPTIONS_INIT { GIT_INDEXER_OPTIONS_VERSION }
+
+/**
+ * Initializes a `git_indexer_options` with default values. Equivalent to
+ * creating an instance with GIT_INDEXER_OPTIONS_INIT.
+ *
+ * @param opts the `git_indexer_options` struct to initialize.
+ * @param version Version of struct; pass `GIT_INDEXER_OPTIONS_VERSION`
+ * @return Zero on success; -1 on failure.
+ */
+GIT_EXTERN(int) git_indexer_init_options(
+ git_indexer_options *opts,
+ unsigned int version);
+
/**
* Create a new indexer instance
*
* @param odb object database from which to read base objects when
* fixing thin packs. Pass NULL if no thin pack is expected (an error
* will be returned if there are bases missing)
- * @param progress_cb function to call with progress information
- * @param progress_cb_payload payload for the progress callback
+ * @param opts Optional structure containing additional options. See
+ * `git_indexer_options` above.
*/
GIT_EXTERN(int) git_indexer_new(
git_indexer **out,
const char *path,
unsigned int mode,
git_odb *odb,
- git_transfer_progress_cb progress_cb,
- void *progress_cb_payload);
+ git_indexer_options *opts);
/**
* Add data to the indexer
--- /dev/null
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+#ifndef INCLUDE_git_mailmap_h__
+#define INCLUDE_git_mailmap_h__
+
+#include "common.h"
+#include "types.h"
+#include "buffer.h"
+
+/**
+ * @file git2/mailmap.h
+ * @brief Mailmap parsing routines
+ * @defgroup git_mailmap Git mailmap routines
+ * @ingroup Git
+ * @{
+ */
+GIT_BEGIN_DECL
+
+/**
+ * Allocate a new mailmap object.
+ *
+ * This object is empty, so you'll have to add a mailmap file before you can do
+ * anything with it. The mailmap must be freed with 'git_mailmap_free'.
+ *
+ * @param out pointer to store the new mailmap
+ * @return 0 on success, or an error code
+ */
+GIT_EXTERN(int) git_mailmap_new(git_mailmap **out);
+
+/**
+ * Free the mailmap and its associated memory.
+ *
+ * @param mm the mailmap to free
+ */
+GIT_EXTERN(void) git_mailmap_free(git_mailmap *mm);
+
+/**
+ * Add a single entry to the given mailmap object. If the entry already exists,
+ * it will be replaced with the new entry.
+ *
+ * @param mm mailmap to add the entry to
+ * @param real_name the real name to use, or NULL
+ * @param real_email the real email to use, or NULL
+ * @param replace_name the name to replace, or NULL
+ * @param replace_email the email to replace
+ * @return 0 on success, or an error code
+ */
+GIT_EXTERN(int) git_mailmap_add_entry(
+ git_mailmap *mm, const char *real_name, const char *real_email,
+ const char *replace_name, const char *replace_email);
+
+/**
+ * Create a new mailmap instance containing a single mailmap file
+ *
+ * @param out pointer to store the new mailmap
+ * @param buf buffer to parse the mailmap from
+ * @param len the length of the input buffer
+ * @return 0 on success, or an error code
+ */
+GIT_EXTERN(int) git_mailmap_from_buffer(
+ git_mailmap **out, const char *buf, size_t len);
+
+/**
+ * Create a new mailmap instance from a repository, loading mailmap files based
+ * on the repository's configuration.
+ *
+ * Mailmaps are loaded in the following order:
+ * 1. '.mailmap' in the root of the repository's working directory, if present.
+ * 2. The blob object identified by the 'mailmap.blob' config entry, if set.
+ * [NOTE: 'mailmap.blob' defaults to 'HEAD:.mailmap' in bare repositories]
+ * 3. The path in the 'mailmap.file' config entry, if set.
+ *
+ * @param out pointer to store the new mailmap
+ * @param repo repository to load mailmap information from
+ * @return 0 on success, or an error code
+ */
+GIT_EXTERN(int) git_mailmap_from_repository(
+ git_mailmap **out, git_repository *repo);
+
+/**
+ * Resolve a name and email to the corresponding real name and email.
+ *
+ * The lifetime of the strings are tied to `mm`, `name`, and `email` parameters.
+ *
+ * @param real_name pointer to store the real name
+ * @param real_email pointer to store the real email
+ * @param mm the mailmap to perform a lookup with (may be NULL)
+ * @param name the name to look up
+ * @param email the email to look up
+ * @return 0 on success, or an error code
+ */
+GIT_EXTERN(int) git_mailmap_resolve(
+ const char **real_name, const char **real_email,
+ const git_mailmap *mm, const char *name, const char *email);
+
+/**
+ * Resolve a signature to use real names and emails with a mailmap.
+ *
+ * Call `git_signature_free()` to free the data.
+ *
+ * @param out new signature
+ * @param mm mailmap to resolve with
+ * @param sig signature to resolve
+ * @return 0 or an error code
+ */
+GIT_EXTERN(int) git_mailmap_resolve_signature(
+ git_signature **out, const git_mailmap *mm, const git_signature *sig);
+
+/** @} */
+GIT_END_DECL
+#endif
#define GIT_MERGE_FILE_OPTIONS_INIT {GIT_MERGE_FILE_OPTIONS_VERSION}
/**
+ * Initialize git_merge_file_options structure
+ *
* Initializes a `git_merge_file_options` with default values. Equivalent to
- * creating an instance with GIT_MERGE_FILE_OPTIONS_INIT.
+ * creating an instance with `GIT_MERGE_FILE_OPTIONS_INIT`.
*
- * @param opts the `git_merge_file_options` instance to initialize.
- * @param version the version of the struct; you should pass
- * `GIT_MERGE_FILE_OPTIONS_VERSION` here.
+ * @param opts The `git_merge_file_options` struct to initialize.
+ * @param version The struct version; pass `GIT_MERGE_FILE_OPTIONS_VERSION`.
* @return Zero on success; -1 on failure.
*/
GIT_EXTERN(int) git_merge_file_init_options(
GIT_MERGE_OPTIONS_VERSION, GIT_MERGE_FIND_RENAMES }
/**
+ * Initialize git_merge_options structure
+ *
* Initializes a `git_merge_options` with default values. Equivalent to
- * creating an instance with GIT_MERGE_OPTIONS_INIT.
+ * creating an instance with `GIT_MERGE_OPTIONS_INIT`.
*
- * @param opts the `git_merge_options` instance to initialize.
- * @param version the version of the struct; you should pass
- * `GIT_MERGE_OPTIONS_VERSION` here.
+ * @param opts The `git_merge_options` struct to initialize.
+ * @param version The struct version; pass `GIT_MERGE_OPTIONS_VERSION`.
* @return Zero on success; -1 on failure.
*/
GIT_EXTERN(int) git_merge_init_options(
const git_annotated_commit **their_heads,
size_t their_heads_len);
+/**
+ * Analyzes the given branch(es) and determines the opportunities for
+ * merging them into a reference.
+ *
+ * @param analysis_out analysis enumeration that the result is written into
+ * @param repo the repository to merge
+ * @param our_ref the reference to perform the analysis from
+ * @param their_heads the heads to merge into
+ * @param their_heads_len the number of heads to merge
+ * @return 0 on success or error code
+ */
+GIT_EXTERN(int) git_merge_analysis_for_ref(
+ git_merge_analysis_t *analysis_out,
+ git_merge_preference_t *preference_out,
+ git_repository *repo,
+ git_reference *our_ref,
+ const git_annotated_commit **their_heads,
+ size_t their_heads_len);
+
/**
* Find a merge base between two commits
*
/**
* Callback for listing the remote heads
*/
-typedef int (*git_headlist_cb)(git_remote_head *rhead, void *payload);
+typedef int GIT_CALLBACK(git_headlist_cb)(git_remote_head *rhead, void *payload);
/** @} */
GIT_END_DECL
* - annotated_object_id: Oid of the git object being annotated
* - payload: Payload data passed to `git_note_foreach`
*/
-typedef int (*git_note_foreach_cb)(
+typedef int GIT_CALLBACK(git_note_foreach_cb)(
const git_oid *blob_id, const git_oid *annotated_object_id, void *payload);
/**
*
* The 'type' parameter must match the type of the object
* in the odb; the method will fail otherwise.
- * The special value 'GIT_OBJ_ANY' may be passed to let
+ * The special value 'GIT_OBJECT_ANY' may be passed to let
* the method guess the object's type.
*
* @param object pointer to the looked-up object
git_object **object,
git_repository *repo,
const git_oid *id,
- git_otype type);
+ git_object_t type);
/**
* Lookup a reference to one of the objects in a repository,
*
* The 'type' parameter must match the type of the object
* in the odb; the method will fail otherwise.
- * The special value 'GIT_OBJ_ANY' may be passed to let
+ * The special value 'GIT_OBJECT_ANY' may be passed to let
* the method guess the object's type.
*
* @param object_out pointer where to store the looked-up object
git_repository *repo,
const git_oid *id,
size_t len,
- git_otype type);
+ git_object_t type);
/**
git_object **out,
const git_object *treeish,
const char *path,
- git_otype type);
+ git_object_t type);
/**
* Get the id (SHA1) of a repository object
* @param obj the repository object
* @return the object's type
*/
-GIT_EXTERN(git_otype) git_object_type(const git_object *obj);
+GIT_EXTERN(git_object_t) git_object_type(const git_object *obj);
/**
* Get the repository that owns this object
* @param type object type to convert.
* @return the corresponding string representation.
*/
-GIT_EXTERN(const char *) git_object_type2string(git_otype type);
+GIT_EXTERN(const char *) git_object_type2string(git_object_t type);
/**
- * Convert a string object type representation to it's git_otype.
+ * Convert a string object type representation to it's git_object_t.
*
* @param str the string to convert.
- * @return the corresponding git_otype.
+ * @return the corresponding git_object_t.
*/
-GIT_EXTERN(git_otype) git_object_string2type(const char *str);
+GIT_EXTERN(git_object_t) git_object_string2type(const char *str);
/**
- * Determine if the given git_otype is a valid loose object type.
+ * Determine if the given git_object_t is a valid loose object type.
*
* @param type object type to test.
* @return true if the type represents a valid loose object type,
* false otherwise.
*/
-GIT_EXTERN(int) git_object_typeisloose(git_otype type);
+GIT_EXTERN(int) git_object_typeisloose(git_object_t type);
/**
* Get the size in bytes for the structure which
* @param type object type to get its size
* @return size in bytes of the object
*/
-GIT_EXTERN(size_t) git_object__size(git_otype type);
+GIT_EXTERN(size_t) git_object__size(git_object_t type);
/**
* Recursively peel an object until an object of the specified type is met.
* GIT_EINVALIDSPEC will be returned (e.g. trying to peel a blob to a
* tree).
*
- * If you pass `GIT_OBJ_ANY` as the target type, then the object will
+ * If you pass `GIT_OBJECT_ANY` as the target type, then the object will
* be peeled until the type changes. A tag will be peeled until the
* referenced object is no longer a tag, and a commit will be peeled
* to a tree. Any other object type will return GIT_EINVALIDSPEC.
*
* @param peeled Pointer to the peeled git_object
* @param object The object to be processed
- * @param target_type The type of the requested object (a GIT_OBJ_ value)
+ * @param target_type The type of the requested object (a GIT_OBJECT_ value)
* @return 0 on success, GIT_EINVALIDSPEC, GIT_EPEEL, or an error code
*/
GIT_EXTERN(int) git_object_peel(
git_object **peeled,
const git_object *object,
- git_otype target_type);
+ git_object_t target_type);
/**
* Create an in-memory copy of a Git object. The copy must be
/**
* Function type for callbacks from git_odb_foreach.
*/
-typedef int (*git_odb_foreach_cb)(const git_oid *id, void *payload);
+typedef int GIT_CALLBACK(git_odb_foreach_cb)(const git_oid *id, void *payload);
/**
* Create a new object database with no backends.
* - 0 if the object was read;
* - GIT_ENOTFOUND if the object is not in the database.
*/
-GIT_EXTERN(int) git_odb_read_header(size_t *len_out, git_otype *type_out, git_odb *db, const git_oid *id);
+GIT_EXTERN(int) git_odb_read_header(size_t *len_out, git_object_t *type_out, git_odb *db, const git_oid *id);
/**
* Determine if the given object can be found in the object database.
/**
* The (optional) type of the object to search for; leave as `0` or set
- * to `GIT_OBJ_ANY` to query for any object matching the ID.
+ * to `GIT_OBJECT_ANY` to query for any object matching the ID.
*/
- git_otype type;
+ git_object_t type;
} git_odb_expand_id;
/**
* @param type type of the data to store
* @return 0 or an error code
*/
-GIT_EXTERN(int) git_odb_write(git_oid *out, git_odb *odb, const void *data, size_t len, git_otype type);
+GIT_EXTERN(int) git_odb_write(git_oid *out, git_odb *odb, const void *data, size_t len, git_object_t type);
/**
* Open a stream to write an object into the ODB
* @param type type of the object that will be written
* @return 0 if the stream was created; error code otherwise
*/
-GIT_EXTERN(int) git_odb_open_wstream(git_odb_stream **out, git_odb *db, git_off_t size, git_otype type);
+GIT_EXTERN(int) git_odb_open_wstream(git_odb_stream **out, git_odb *db, git_off_t size, git_object_t type);
/**
* Write to an odb stream
GIT_EXTERN(int) git_odb_open_rstream(
git_odb_stream **out,
size_t *len,
- git_otype *type,
+ git_object_t *type,
git_odb *db,
const git_oid *oid);
* @param type of the data to hash
* @return 0 or an error code
*/
-GIT_EXTERN(int) git_odb_hash(git_oid *out, const void *data, size_t len, git_otype type);
+GIT_EXTERN(int) git_odb_hash(git_oid *out, const void *data, size_t len, git_object_t type);
/**
* Read a file from disk and fill a git_oid with the object id
* @param type the type of the object that will be hashed
* @return 0 or an error code
*/
-GIT_EXTERN(int) git_odb_hashfile(git_oid *out, const char *path, git_otype type);
+GIT_EXTERN(int) git_odb_hashfile(git_oid *out, const char *path, git_object_t type);
/**
* Create a copy of an odb_object
* @param object the object
* @return the type
*/
-GIT_EXTERN(git_otype) git_odb_object_type(git_odb_object *object);
+GIT_EXTERN(git_object_t) git_odb_object_type(git_odb_object *object);
/**
* Add a custom backend to an existing Object DB
/**
* Write at most `len` bytes into `buffer` and advance the stream.
*/
- int (*read)(git_odb_stream *stream, char *buffer, size_t len);
+ int GIT_CALLBACK(read)(git_odb_stream *stream, char *buffer, size_t len);
/**
* Write `len` bytes from `buffer` into the stream.
*/
- int (*write)(git_odb_stream *stream, const char *buffer, size_t len);
+ int GIT_CALLBACK(write)(git_odb_stream *stream, const char *buffer, size_t len);
/**
* Store the contents of the stream as an object with the id
* - the final number of received bytes differs from the size declared
* with `git_odb_open_wstream()`
*/
- int (*finalize_write)(git_odb_stream *stream, const git_oid *oid);
+ int GIT_CALLBACK(finalize_write)(git_odb_stream *stream, const git_oid *oid);
/**
* Free the stream's memory.
* This method might be called without a call to `finalize_write` if
* an error occurs or if the object is already present in the ODB.
*/
- void (*free)(git_odb_stream *stream);
+ void GIT_CALLBACK(free)(git_odb_stream *stream);
};
/** A stream to write a pack file to the ODB */
struct git_odb_writepack {
git_odb_backend *backend;
- int (*append)(git_odb_writepack *writepack, const void *data, size_t size, git_transfer_progress *stats);
- int (*commit)(git_odb_writepack *writepack, git_transfer_progress *stats);
- void (*free)(git_odb_writepack *writepack);
+ int GIT_CALLBACK(append)(git_odb_writepack *writepack, const void *data, size_t size, git_transfer_progress *stats);
+ int GIT_CALLBACK(commit)(git_odb_writepack *writepack, git_transfer_progress *stats);
+ void GIT_CALLBACK(free)(git_odb_writepack *writepack);
};
GIT_END_DECL
* memory-efficient.
*
* Attempting to add more than those OIDs will result in a
- * GITERR_INVALID error
+ * GIT_ERROR_INVALID error
*
* @param os a `git_oid_shorten` instance
* @param text_id an OID in text form
*/
GIT_EXTERN(const git_oid *) git_packbuilder_hash(git_packbuilder *pb);
-typedef int (*git_packbuilder_foreach_cb)(void *buf, size_t size, void *payload);
+typedef int GIT_CALLBACK(git_packbuilder_foreach_cb)(void *buf, size_t size, void *payload);
/**
* Create the new pack and pass each object to the callback
GIT_EXTERN(size_t) git_packbuilder_written(git_packbuilder *pb);
/** Packbuilder progress notification function */
-typedef int (*git_packbuilder_progress)(
+typedef int GIT_CALLBACK(git_packbuilder_progress)(
int stage,
uint32_t current,
uint32_t total,
/**
* If cert verification fails, this will be called to let the
* user make the final decision of whether to allow the
- * connection to proceed. Returns 1 to allow the connection, 0
- * to disallow it or a negative value to indicate an error.
+ * connection to proceed. Returns 0 to allow the connection
+ * or a negative value to indicate an error.
*/
git_transport_certificate_check_cb certificate_check;
#define GIT_PROXY_OPTIONS_INIT {GIT_PROXY_OPTIONS_VERSION}
/**
- * Initialize a proxy options structure
+ * Initialize git_proxy_options structure
*
- * @param opts the options struct to initialize
- * @param version the version of the struct, use `GIT_PROXY_OPTIONS_VERSION`
+ * Initializes a `git_proxy_options` with default values. Equivalent to
+ * creating an instance with `GIT_PROXY_OPTIONS_INIT`.
+ *
+ * @param opts The `git_proxy_options` struct to initialize.
+ * @param version The struct version; pass `GIT_PROXY_OPTIONS_VERSION`.
+ * @return Zero on success; -1 on failure.
*/
GIT_EXTERN(int) git_proxy_init_options(git_proxy_options *opts, unsigned int version);
#include "types.h"
#include "oid.h"
#include "annotated_commit.h"
+#include "merge.h"
+#include "checkout.h"
/**
* @file git2/rebase.h
} git_rebase_operation;
/**
+ * Initialize git_rebase_options structure
+ *
* Initializes a `git_rebase_options` with default values. Equivalent to
- * creating an instance with GIT_REBASE_OPTIONS_INIT.
+ * creating an instance with `GIT_REBASE_OPTIONS_INIT`.
*
- * @param opts the `git_rebase_options` instance to initialize.
- * @param version the version of the struct; you should pass
- * `GIT_REBASE_OPTIONS_VERSION` here.
+ * @param opts The `git_rebase_options` struct to initialize.
+ * @param version The struct version; pass `GIT_REBASE_OPTIONS_VERSION`.
* @return Zero on success; -1 on failure.
*/
GIT_EXTERN(int) git_rebase_init_options(
/**
* Get the type of a reference.
*
- * Either direct (GIT_REF_OID) or symbolic (GIT_REF_SYMBOLIC)
+ * Either direct (GIT_REFERENCE_DIRECT) or symbolic (GIT_REFERENCE_SYMBOLIC)
*
* @param ref The reference
* @return the type
*/
-GIT_EXTERN(git_ref_t) git_reference_type(const git_reference *ref);
+GIT_EXTERN(git_reference_t) git_reference_type(const git_reference *ref);
/**
* Get the full name of a reference.
*/
GIT_EXTERN(int) git_reference_list(git_strarray *array, git_repository *repo);
-typedef int (*git_reference_foreach_cb)(git_reference *reference, void *payload);
-typedef int (*git_reference_foreach_name_cb)(const char *name, void *payload);
+typedef int GIT_CALLBACK(git_reference_foreach_cb)(git_reference *reference, void *payload);
+typedef int GIT_CALLBACK(git_reference_foreach_name_cb)(const char *name, void *payload);
/**
* Perform a callback on each reference in the repository.
/**
* No particular normalization.
*/
- GIT_REF_FORMAT_NORMAL = 0u,
+ GIT_REFERENCE_FORMAT_NORMAL = 0u,
/**
* Control whether one-level refnames are accepted
* components). Those are expected to be written only using
* uppercase letters and underscore (FETCH_HEAD, ...)
*/
- GIT_REF_FORMAT_ALLOW_ONELEVEL = (1u << 0),
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL = (1u << 0),
/**
* Interpret the provided name as a reference pattern for a
* in place of a one full pathname component
* (e.g., foo/<star>/bar but not foo/bar<star>).
*/
- GIT_REF_FORMAT_REFSPEC_PATTERN = (1u << 1),
+ GIT_REFERENCE_FORMAT_REFSPEC_PATTERN = (1u << 1),
/**
* Interpret the name as part of a refspec in shorthand form
* so the `ONELEVEL` naming rules aren't enforced and 'master'
* becomes a valid name.
*/
- GIT_REF_FORMAT_REFSPEC_SHORTHAND = (1u << 2),
-} git_reference_normalize_t;
+ GIT_REFERENCE_FORMAT_REFSPEC_SHORTHAND = (1u << 2),
+} git_reference_format_t;
/**
* Normalize reference name and check validity.
* @param buffer_size Size of buffer_out
* @param name Reference name to be checked.
* @param flags Flags to constrain name validation rules - see the
- * GIT_REF_FORMAT constants above.
+ * GIT_REFERENCE_FORMAT constants above.
* @return 0 on success, GIT_EBUFS if buffer is too small, GIT_EINVALIDSPEC
* or an error code.
*/
* The retrieved `peeled` object is owned by the repository
* and should be closed with the `git_object_free` method.
*
- * If you pass `GIT_OBJ_ANY` as the target type, then the object
+ * If you pass `GIT_OBJECT_ANY` as the target type, then the object
* will be peeled until a non-tag object is met.
*
* @param out Pointer to the peeled git_object
* @param ref The reference to be processed
- * @param type The type of the requested object (GIT_OBJ_COMMIT,
- * GIT_OBJ_TAG, GIT_OBJ_TREE, GIT_OBJ_BLOB or GIT_OBJ_ANY).
+ * @param type The type of the requested object (GIT_OBJECT_COMMIT,
+ * GIT_OBJECT_TAG, GIT_OBJECT_TREE, GIT_OBJECT_BLOB or GIT_OBJECT_ANY).
* @return 0 on success, GIT_EAMBIGUOUS, GIT_ENOTFOUND or an error code
*/
GIT_EXTERN(int) git_reference_peel(
git_object **out,
- git_reference *ref,
- git_otype type);
+ const git_reference *ref,
+ git_object_t type);
/**
* Ensure the reference name is well-formed.
*/
GIT_EXTERN(const char *) git_reference_shorthand(const git_reference *ref);
-
/** @} */
GIT_END_DECL
#endif
*/
GIT_BEGIN_DECL
+/**
+ * Parse a given refspec string
+ *
+ * @param refspec a pointer to hold the refspec handle
+ * @param input the refspec string
+ * @param is_fetch is this a refspec for a fetch
+ * @return 0 if the refspec string could be parsed, -1 otherwise
+ */
+GIT_EXTERN(int) git_refspec_parse(git_refspec **refspec, const char *input, int is_fetch);
+
+/**
+ * Free a refspec object which has been created by git_refspec_parse
+ *
+ * @param refspec the refspec object
+ */
+GIT_EXTERN(void) git_refspec_free(git_refspec *refspec);
+
/**
* Get the source specifier
*
const char *name,
const char *url);
+/**
+ * Remote creation options flags
+ */
+typedef enum {
+ /** Ignore the repository apply.insteadOf configuration */
+ GIT_REMOTE_CREATE_SKIP_INSTEADOF = (1 << 0),
+
+ /** Don't build a fetchspec from the name if none is set */
+ GIT_REMOTE_CREATE_SKIP_DEFAULT_FETCHSPEC = (1 << 1),
+} git_remote_create_flags;
+
+/**
+ * Remote creation options structure
+ *
+ * Initialize with `GIT_REMOTE_CREATE_OPTIONS_INIT`. Alternatively, you can
+ * use `git_remote_create_init_options`.
+ *
+ */
+typedef struct git_remote_create_options {
+ unsigned int version;
+
+ /**
+ * The repository that should own the remote.
+ * Setting this to NULL results in a detached remote.
+ */
+ git_repository *repository;
+
+ /**
+ * The remote's name.
+ * Setting this to NULL results in an in-memory/anonymous remote.
+ */
+ const char *name;
+
+ /** The fetchspec the remote should use. */
+ const char *fetchspec;
+
+ /** Additional flags for the remote. See git_remote_create_flags. */
+ unsigned int flags;
+} git_remote_create_options;
+
+#define GIT_REMOTE_CREATE_OPTIONS_VERSION 1
+#define GIT_REMOTE_CREATE_OPTIONS_INIT {GIT_REMOTE_CREATE_OPTIONS_VERSION}
+
+/**
+ * Initialize git_remote_create_options structure
+ *
+ * Initializes a `git_remote_create_options` with default values. Equivalent to
+ * creating an instance with `GIT_REMOTE_CREATE_OPTIONS_INIT`.
+ *
+ * @param opts The `git_remote_create_options` struct to initialize.
+ * @param version The struct version; pass `GIT_REMOTE_CREATE_OPTIONS_VERSION`.
+ * @return Zero on success; -1 on failure.
+ */
+GIT_EXTERN(int) git_remote_create_init_options(
+ git_remote_create_options *opts,
+ unsigned int version);
+
+/**
+ * Create a remote, with options.
+ *
+ * This function allows more fine-grained control over the remote creation.
+ *
+ * Passing NULL as the opts argument will result in a detached remote.
+ *
+ * @param out the resulting remote
+ * @param url the remote's url
+ * @param opts the remote creation options
+ * @return 0, GIT_EINVALIDSPEC, GIT_EEXISTS or an error code
+ */
+GIT_EXTERN(int) git_remote_create_with_opts(
+ git_remote **out,
+ const char *url,
+ const git_remote_create_options *opts);
+
/**
* Add a remote with the provided fetch refspec (or default if NULL) to the repository's
* configuration.
} git_remote_completion_type;
/** Push network progress notification function */
-typedef int (*git_push_transfer_progress)(
+typedef int GIT_CALLBACK(git_push_transfer_progress)(
unsigned int current,
unsigned int total,
size_t bytes,
* @param len number of elements in `updates`
* @param payload Payload provided by the caller
*/
-typedef int (*git_push_negotiation)(const git_push_update **updates, size_t len, void *payload);
+typedef int GIT_CALLBACK(git_push_negotiation)(const git_push_update **updates, size_t len, void *payload);
/**
* Callback used to inform of the update status from the remote.
* @param data data provided by the caller
* @return 0 on success, otherwise an error
*/
-typedef int (*git_push_update_reference_cb)(const char *refname, const char *status, void *data);
+typedef int GIT_CALLBACK(git_push_update_reference_cb)(const char *refname, const char *status, void *data);
/**
* The callback settings structure
* Completion is called when different parts of the download
* process are done (currently unused).
*/
- int (*completion)(git_remote_completion_type type, void *data);
+ int GIT_CALLBACK(completion)(git_remote_completion_type type, void *data);
/**
* This will be called if the remote host requires
/**
* If cert verification fails, this will be called to let the
* user make the final decision of whether to allow the
- * connection to proceed. Returns 1 to allow the connection, 0
- * to disallow it or a negative value to indicate an error.
+ * connection to proceed. Returns 0 to allow the connection
+ * or a negative value to indicate an error.
*/
git_transport_certificate_check_cb certificate_check;
* Each time a reference is updated locally, this function
* will be called with information about it.
*/
- int (*update_tips)(const char *refname, const git_oid *a, const git_oid *b, void *data);
+ int GIT_CALLBACK(update_tips)(const char *refname, const git_oid *a, const git_oid *b, void *data);
/**
* Function to call with progress information during pack
GIT_REMOTE_DOWNLOAD_TAGS_UNSPECIFIED, GIT_PROXY_OPTIONS_INIT }
/**
+ * Initialize git_fetch_options structure
+ *
* Initializes a `git_fetch_options` with default values. Equivalent to
- * creating an instance with GIT_FETCH_OPTIONS_INIT.
+ * creating an instance with `GIT_FETCH_OPTIONS_INIT`.
*
- * @param opts the `git_fetch_options` instance to initialize.
- * @param version the version of the struct; you should pass
- * `GIT_FETCH_OPTIONS_VERSION` here.
+ * @param opts The `git_fetch_options` struct to initialize.
+ * @param version The struct version; pass `GIT_FETCH_OPTIONS_VERSION`.
* @return Zero on success; -1 on failure.
*/
GIT_EXTERN(int) git_fetch_init_options(
} git_push_options;
#define GIT_PUSH_OPTIONS_VERSION 1
-#define GIT_PUSH_OPTIONS_INIT { GIT_PUSH_OPTIONS_VERSION, 0, GIT_REMOTE_CALLBACKS_INIT, GIT_PROXY_OPTIONS_INIT }
+#define GIT_PUSH_OPTIONS_INIT { GIT_PUSH_OPTIONS_VERSION, 1, GIT_REMOTE_CALLBACKS_INIT, GIT_PROXY_OPTIONS_INIT }
/**
+ * Initialize git_push_options structure
+ *
* Initializes a `git_push_options` with default values. Equivalent to
- * creating an instance with GIT_PUSH_OPTIONS_INIT.
+ * creating an instance with `GIT_PUSH_OPTIONS_INIT`.
*
- * @param opts the `git_push_options` instance to initialize.
- * @param version the version of the struct; you should pass
- * `GIT_PUSH_OPTIONS_VERSION` here.
+ * @param opts The `git_push_options` struct to initialize.
+ * @param version The struct version; pass `GIT_PUSH_OPTIONS_VERSION`.
* @return Zero on success; -1 on failure.
*/
GIT_EXTERN(int) git_push_init_options(
/**
* Option flags for `git_repository_open_ext`.
- *
- * * GIT_REPOSITORY_OPEN_NO_SEARCH - Only open the repository if it can be
- * immediately found in the start_path. Do not walk up from the
- * start_path looking at parent directories.
- * * GIT_REPOSITORY_OPEN_CROSS_FS - Unless this flag is set, open will not
- * continue searching across filesystem boundaries (i.e. when `st_dev`
- * changes from the `stat` system call). (E.g. Searching in a user's home
- * directory "/home/user/source/" will not return "/.git/" as the found
- * repo if "/" is a different filesystem than "/home".)
- * * GIT_REPOSITORY_OPEN_BARE - Open repository as a bare repo regardless
- * of core.bare config, and defer loading config file for faster setup.
- * Unlike `git_repository_open_bare`, this can follow gitlinks.
- * * GIT_REPOSITORY_OPEN_NO_DOTGIT - Do not check for a repository by
- * appending /.git to the start_path; only open the repository if
- * start_path itself points to the git directory.
- * * GIT_REPOSITORY_OPEN_FROM_ENV - Find and open a git repository,
- * respecting the environment variables used by the git command-line
- * tools. If set, `git_repository_open_ext` will ignore the other
- * flags and the `ceiling_dirs` argument, and will allow a NULL `path`
- * to use `GIT_DIR` or search from the current directory. The search
- * for a repository will respect $GIT_CEILING_DIRECTORIES and
- * $GIT_DISCOVERY_ACROSS_FILESYSTEM. The opened repository will
- * respect $GIT_INDEX_FILE, $GIT_NAMESPACE, $GIT_OBJECT_DIRECTORY, and
- * $GIT_ALTERNATE_OBJECT_DIRECTORIES. In the future, this flag will
- * also cause `git_repository_open_ext` to respect $GIT_WORK_TREE and
- * $GIT_COMMON_DIR; currently, `git_repository_open_ext` with this
- * flag will error out if either $GIT_WORK_TREE or $GIT_COMMON_DIR is
- * set.
*/
typedef enum {
+ /**
+ * Only open the repository if it can be immediately found in the
+ * start_path. Do not walk up from the start_path looking at parent
+ * directories.
+ */
GIT_REPOSITORY_OPEN_NO_SEARCH = (1 << 0),
+
+ /**
+ * Unless this flag is set, open will not continue searching across
+ * filesystem boundaries (i.e. when `st_dev` changes from the `stat`
+ * system call). For example, searching in a user's home directory at
+ * "/home/user/source/" will not return "/.git/" as the found repo if
+ * "/" is a different filesystem than "/home".
+ */
GIT_REPOSITORY_OPEN_CROSS_FS = (1 << 1),
+
+ /**
+ * Open repository as a bare repo regardless of core.bare config, and
+ * defer loading config file for faster setup.
+ * Unlike `git_repository_open_bare`, this can follow gitlinks.
+ */
GIT_REPOSITORY_OPEN_BARE = (1 << 2),
+
+ /**
+ * Do not check for a repository by appending /.git to the start_path;
+ * only open the repository if start_path itself points to the git
+ * directory.
+ */
GIT_REPOSITORY_OPEN_NO_DOTGIT = (1 << 3),
+
+ /**
+ * Find and open a git repository, respecting the environment variables
+ * used by the git command-line tools.
+ * If set, `git_repository_open_ext` will ignore the other flags and
+ * the `ceiling_dirs` argument, and will allow a NULL `path` to use
+ * `GIT_DIR` or search from the current directory.
+ * The search for a repository will respect $GIT_CEILING_DIRECTORIES and
+ * $GIT_DISCOVERY_ACROSS_FILESYSTEM. The opened repository will
+ * respect $GIT_INDEX_FILE, $GIT_NAMESPACE, $GIT_OBJECT_DIRECTORY, and
+ * $GIT_ALTERNATE_OBJECT_DIRECTORIES.
+ * In the future, this flag will also cause `git_repository_open_ext`
+ * to respect $GIT_WORK_TREE and $GIT_COMMON_DIR; currently,
+ * `git_repository_open_ext` with this flag will error out if either
+ * $GIT_WORK_TREE or $GIT_COMMON_DIR is set.
+ */
GIT_REPOSITORY_OPEN_FROM_ENV = (1 << 4),
} git_repository_open_flag_t;
#define GIT_REPOSITORY_INIT_OPTIONS_INIT {GIT_REPOSITORY_INIT_OPTIONS_VERSION}
/**
- * Initializes a `git_repository_init_options` with default values. Equivalent
- * to creating an instance with GIT_REPOSITORY_INIT_OPTIONS_INIT.
+ * Initialize git_repository_init_options structure
+ *
+ * Initializes a `git_repository_init_options` with default values. Equivalent to
+ * creating an instance with `GIT_REPOSITORY_INIT_OPTIONS_INIT`.
*
- * @param opts the `git_repository_init_options` struct to initialize
- * @param version Version of struct; pass `GIT_REPOSITORY_INIT_OPTIONS_VERSION`
+ * @param opts The `git_repository_init_options` struct to initialize.
+ * @param version The struct version; pass `GIT_REPOSITORY_INIT_OPTIONS_VERSION`.
* @return Zero on success; -1 on failure.
*/
GIT_EXTERN(int) git_repository_init_init_options(
*/
GIT_EXTERN(int) git_repository_head_detached(git_repository *repo);
-/*
+/**
* Check if a worktree's HEAD is detached
*
* A worktree's HEAD is detached when it points directly to a
*/
GIT_EXTERN(int) git_repository_state_cleanup(git_repository *repo);
-typedef int (*git_repository_fetchhead_foreach_cb)(const char *ref_name,
+typedef int GIT_CALLBACK(git_repository_fetchhead_foreach_cb)(const char *ref_name,
const char *remote_url,
const git_oid *oid,
unsigned int is_merge,
git_repository_fetchhead_foreach_cb callback,
void *payload);
-typedef int (*git_repository_mergehead_foreach_cb)(const git_oid *oid,
+typedef int GIT_CALLBACK(git_repository_mergehead_foreach_cb)(const git_oid *oid,
void *payload);
/**
* @param repo Repository pointer
* @param path Path to file on disk whose contents should be hashed. If the
* repository is not NULL, this can be a relative path.
- * @param type The object type to hash as (e.g. GIT_OBJ_BLOB)
+ * @param type The object type to hash as (e.g. GIT_OBJECT_BLOB)
* @param as_path The path to use to look up filtering rules. If this is
* NULL, then the `path` parameter will be used instead. If
* this is passed as the empty string, then no filters will be
git_oid *out,
git_repository *repo,
const char *path,
- git_otype type,
+ git_object_t type,
const char *as_path);
/**
#define GIT_REVERT_OPTIONS_INIT {GIT_REVERT_OPTIONS_VERSION, 0, GIT_MERGE_OPTIONS_INIT, GIT_CHECKOUT_OPTIONS_INIT}
/**
+ * Initialize git_revert_options structure
+ *
* Initializes a `git_revert_options` with default values. Equivalent to
- * creating an instance with GIT_REVERT_OPTIONS_INIT.
+ * creating an instance with `GIT_REVERT_OPTIONS_INIT`.
*
- * @param opts the `git_revert_options` struct to initialize
- * @param version Version of struct; pass `GIT_REVERT_OPTIONS_VERSION`
+ * @param opts The `git_revert_options` struct to initialize.
+ * @param version The struct version; pass `GIT_REVERT_OPTIONS_VERSION`.
* @return Zero on success; -1 on failure.
*/
GIT_EXTERN(int) git_revert_init_options(
*/
typedef enum {
/**
- * Sort the output with the same default time-order method from git.
- * This is the default sorting for new walkers.
+ * Sort the output with the same default method from `git`: reverse
+ * chronological order. This is the default sorting for new walkers.
*/
GIT_SORT_NONE = 0,
/**
- * Sort the repository contents in topological order (parents before
- * children); this sorting mode can be combined with time sorting to
- * produce git's "time-order".
+ * Sort the repository contents in topological order (no parents before
+ * all of its children are shown); this sorting mode can be combined
+ * with time sorting to produce `git`'s `--date-order``.
*/
GIT_SORT_TOPOLOGICAL = 1 << 0,
* @param commit_id oid of Commit
* @param payload User-specified pointer to data to be passed as data payload
*/
-typedef int(*git_revwalk_hide_cb)(
+typedef int GIT_CALLBACK(git_revwalk_hide_cb)(
const git_oid *commit_id,
void *payload);
/**
- * Adds a callback function to hide a commit and its parents
+ * Adds, changes or removes a callback function to hide a commit and its parents
*
* @param walk the revision walker
* @param hide_cb callback function to hide a commit and its parents
* @param out new signature, in case of error NULL
* @param name name of the person
* @param email email of the person
- * @param time time when the action happened
- * @param offset timezone offset in minutes for the time
+ * @param time time (in seconds from epoch) when the action happened
+ * @param offset timezone offset (in minutes) for the time
* @return 0 or an error code
*/
GIT_EXTERN(int) git_signature_new(git_signature **out, const char *name, const char *email, git_time_t time, int offset);
#include "common.h"
#include "types.h"
+#include "checkout.h"
/**
* @file git2/stash.h
GIT_STASH_APPLY_REINSTATE_INDEX = (1 << 0),
} git_stash_apply_flags;
+/** Stash apply progression states */
typedef enum {
GIT_STASH_APPLY_PROGRESS_NONE = 0,
* Return 0 to continue processing, or a negative value to
* abort the stash application.
*/
-typedef int (*git_stash_apply_progress_cb)(
+typedef int GIT_CALLBACK(git_stash_apply_progress_cb)(
git_stash_apply_progress_t progress,
void *payload);
-/** Stash application options structure.
+/**
+ * Stash application options structure
*
- * Initialize with the `GIT_STASH_APPLY_OPTIONS_INIT` macro to set
- * sensible defaults; for example:
+ * Initialize with `GIT_STASH_APPLY_OPTIONS_INIT`. Alternatively, you can
+ * use `git_stash_apply_init_options`.
*
- * git_stash_apply_options opts = GIT_STASH_APPLY_OPTIONS_INIT;
*/
typedef struct git_stash_apply_options {
unsigned int version;
GIT_CHECKOUT_OPTIONS_INIT }
/**
+ * Initialize git_stash_apply_options structure
+ *
* Initializes a `git_stash_apply_options` with default values. Equivalent to
- * creating an instance with GIT_STASH_APPLY_OPTIONS_INIT.
+ * creating an instance with `GIT_STASH_APPLY_OPTIONS_INIT`.
*
- * @param opts the `git_stash_apply_options` instance to initialize.
- * @param version the version of the struct; you should pass
- * `GIT_STASH_APPLY_OPTIONS_INIT` here.
+ * @param opts The `git_stash_apply_options` struct to initialize.
+ * @param version The struct version; pass `GIT_STASH_APPLY_OPTIONS_VERSION`.
* @return Zero on success; -1 on failure.
*/
GIT_EXTERN(int) git_stash_apply_init_options(
* @param payload Extra parameter to callback function.
* @return 0 to continue iterating or non-zero to stop.
*/
-typedef int (*git_stash_cb)(
+typedef int GIT_CALLBACK(git_stash_cb)(
size_t index,
const char* message,
const git_oid *stash_id,
#include "common.h"
#include "types.h"
+#include "strarray.h"
+#include "diff.h"
/**
* @file git2/status.h
*
* `payload` is the value you passed to the foreach function as payload.
*/
-typedef int (*git_status_cb)(
+typedef int GIT_CALLBACK(git_status_cb)(
const char *path, unsigned int status_flags, void *payload);
/**
#define GIT_STATUS_OPTIONS_INIT {GIT_STATUS_OPTIONS_VERSION}
/**
+ * Initialize git_status_options structure
+ *
* Initializes a `git_status_options` with default values. Equivalent to
- * creating an instance with GIT_STATUS_OPTIONS_INIT.
+ * creating an instance with `GIT_STATUS_OPTIONS_INIT`.
*
- * @param opts The `git_status_options` instance to initialize.
- * @param version Version of struct; pass `GIT_STATUS_OPTIONS_VERSION`
+ * @param opts The `git_status_options` struct to initialize.
+ * @param version The struct version; pass `GIT_STATUS_OPTIONS_VERSION`.
* @return Zero on success; -1 on failure.
*/
GIT_EXTERN(int) git_status_init_options(
* @param payload value you passed to the foreach function as payload
* @return 0 on success or error code
*/
-typedef int (*git_submodule_cb)(
+typedef int GIT_CALLBACK(git_submodule_cb)(
git_submodule *sm, const char *name, void *payload);
/**
* Submodule update options structure
*
- * Use the GIT_SUBMODULE_UPDATE_OPTIONS_INIT to get the default settings,
- * like this:
+ * Initialize with `GIT_SUBMODULE_UPDATE_OPTIONS_INIT`. Alternatively, you can
+ * use `git_submodule_update_init_options`.
*
- * git_submodule_update_options opts = GIT_SUBMODULE_UPDATE_OPTIONS_INIT;
*/
typedef struct git_submodule_update_options {
unsigned int version;
* checkout, set the `checkout_strategy` to
* `GIT_CHECKOUT_NONE`. Generally you will want the use
* GIT_CHECKOUT_SAFE to update files in the working
- * directory.
+ * directory.
*/
git_checkout_options checkout_opts;
GIT_FETCH_OPTIONS_INIT, 1 }
/**
- * Initializes a `git_submodule_update_options` with default values.
- * Equivalent to creating an instance with GIT_SUBMODULE_UPDATE_OPTIONS_INIT.
+ * Initialize git_submodule_update_options structure
*
- * @param opts The `git_submodule_update_options` instance to initialize.
- * @param version Version of struct; pass `GIT_SUBMODULE_UPDATE_OPTIONS_VERSION`
+ * Initializes a `git_submodule_update_options` with default values. Equivalent to
+ * creating an instance with `GIT_SUBMODULE_UPDATE_OPTIONS_INIT`.
+ *
+ * @param opts The `git_submodule_update_options` struct to initialize.
+ * @param version The struct version; pass `GIT_SUBMODULE_UPDATE_OPTIONS_VERSION`.
* @return Zero on success; -1 on failure.
*/
GIT_EXTERN(int) git_submodule_update_init_options(
* function works as though GIT_SUBMODULE_UPDATE_OPTIONS_INIT was passed.
* @return 0 on success, any non-zero return value from a callback
* function, or a negative value to indicate an error (use
- * `giterr_last` for a detailed error message).
+ * `git_error_last` for a detailed error message).
*/
GIT_EXTERN(int) git_submodule_update(git_submodule *submodule, int init, git_submodule_update_options *options);
--- /dev/null
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#ifndef INCLUDE_sys_git_alloc_h__
+#define INCLUDE_sys_git_alloc_h__
+
+#include "git2/common.h"
+
+GIT_BEGIN_DECL
+
+/**
+ * An instance for a custom memory allocator
+ *
+ * Setting the pointers of this structure allows the developer to implement
+ * custom memory allocators. The global memory allocator can be set by using
+ * "GIT_OPT_SET_ALLOCATOR" with the `git_libgit2_opts` function. Keep in mind
+ * that all fields need to be set to a proper function.
+ */
+typedef struct {
+ /* Allocate `n` bytes of memory */
+ void * GIT_CALLBACK(gmalloc)(size_t n, const char *file, int line);
+
+ /*
+ * Allocate memory for an array of `nelem` elements, where each element
+ * has a size of `elsize`. Returned memory shall be initialized to
+ * all-zeroes
+ */
+ void * GIT_CALLBACK(gcalloc)(size_t nelem, size_t elsize, const char *file, int line);
+
+ /* Allocate memory for the string `str` and duplicate its contents. */
+ char * GIT_CALLBACK(gstrdup)(const char *str, const char *file, int line);
+
+ /*
+ * Equivalent to the `gstrdup` function, but only duplicating at most
+ * `n + 1` bytes
+ */
+ char * GIT_CALLBACK(gstrndup)(const char *str, size_t n, const char *file, int line);
+
+ /*
+ * Equivalent to `gstrndup`, but will always duplicate exactly `n` bytes
+ * of `str`. Thus, out of bounds reads at `str` may happen.
+ */
+ char * GIT_CALLBACK(gsubstrdup)(const char *str, size_t n, const char *file, int line);
+
+ /*
+ * This function shall deallocate the old object `ptr` and return a
+ * pointer to a new object that has the size specified by `size`. In
+ * case `ptr` is `NULL`, a new array shall be allocated.
+ */
+ void * GIT_CALLBACK(grealloc)(void *ptr, size_t size, const char *file, int line);
+
+ /*
+ * This function shall be equivalent to `grealloc`, but allocating
+ * `neleme * elsize` bytes.
+ */
+ void * GIT_CALLBACK(greallocarray)(void *ptr, size_t nelem, size_t elsize, const char *file, int line);
+
+ /*
+ * This function shall allocate a new array of `nelem` elements, where
+ * each element has a size of `elsize` bytes.
+ */
+ void * GIT_CALLBACK(gmallocarray)(size_t nelem, size_t elsize, const char *file, int line);
+
+ /*
+ * This function shall free the memory pointed to by `ptr`. In case
+ * `ptr` is `NULL`, this shall be a no-op.
+ */
+ void GIT_CALLBACK(gfree)(void *ptr);
+} git_allocator;
+
+/**
+ * Initialize the allocator structure to use the `stdalloc` pointer.
+ *
+ * Set up the structure so that all of its members are using the standard
+ * "stdalloc" allocator functions. The structure can then be used with
+ * `git_allocator_setup`.
+ *
+ * @param allocator The allocator that is to be initialized.
+ * @return An error code or 0.
+ */
+int git_stdalloc_init_allocator(git_allocator *allocator);
+
+/**
+ * Initialize the allocator structure to use the `crtdbg` pointer.
+ *
+ * Set up the structure so that all of its members are using the "crtdbg"
+ * allocator functions. Note that this allocator is only available on Windows
+ * platforms and only if libgit2 is being compiled with "-DMSVC_CRTDBG".
+ *
+ * @param allocator The allocator that is to be initialized.
+ * @return An error code or 0.
+ */
+int git_win32_crtdbg_init_allocator(git_allocator *allocator);
+
+GIT_END_DECL
+
+#endif
* along with the user supplied payload. This should return a git_oid of
* the next parent or NULL if all parents have been provided.
*/
-typedef const git_oid *(*git_commit_parent_callback)(size_t idx, void *payload);
+typedef const git_oid * GIT_CALLBACK(git_commit_parent_callback)(size_t idx, void *payload);
/**
* Create a new commit in the repository with an callback to supply parents.
* Return the current entry and advance the iterator. The
* memory belongs to the library.
*/
- int (*next)(git_config_entry **entry, git_config_iterator *iter);
+ int GIT_CALLBACK(next)(git_config_entry **entry, git_config_iterator *iter);
/**
* Free the iterator
*/
- void (*free)(git_config_iterator *iter);
+ void GIT_CALLBACK(free)(git_config_iterator *iter);
};
/**
struct git_config *cfg;
/* Open means open the file/database and parse if necessary */
- int (*open)(struct git_config_backend *, git_config_level_t level, const git_repository *repo);
- int (*get)(struct git_config_backend *, const char *key, git_config_entry **entry);
- int (*set)(struct git_config_backend *, const char *key, const char *value);
- int (*set_multivar)(git_config_backend *cfg, const char *name, const char *regexp, const char *value);
- int (*del)(struct git_config_backend *, const char *key);
- int (*del_multivar)(struct git_config_backend *, const char *key, const char *regexp);
- int (*iterator)(git_config_iterator **, struct git_config_backend *);
+ int GIT_CALLBACK(open)(struct git_config_backend *, git_config_level_t level, const git_repository *repo);
+ int GIT_CALLBACK(get)(struct git_config_backend *, const char *key, git_config_entry **entry);
+ int GIT_CALLBACK(set)(struct git_config_backend *, const char *key, const char *value);
+ int GIT_CALLBACK(set_multivar)(git_config_backend *cfg, const char *name, const char *regexp, const char *value);
+ int GIT_CALLBACK(del)(struct git_config_backend *, const char *key);
+ int GIT_CALLBACK(del_multivar)(struct git_config_backend *, const char *key, const char *regexp);
+ int GIT_CALLBACK(iterator)(git_config_iterator **, struct git_config_backend *);
/** Produce a read-only version of this backend */
- int (*snapshot)(struct git_config_backend **, struct git_config_backend *);
+ int GIT_CALLBACK(snapshot)(struct git_config_backend **, struct git_config_backend *);
/**
* Lock this backend.
*
* backend. Any updates must not be visible to any other
* readers.
*/
- int (*lock)(struct git_config_backend *);
+ int GIT_CALLBACK(lock)(struct git_config_backend *);
/**
* Unlock the data store backing this backend. If success is
* true, the changes should be committed, otherwise rolled
* back.
*/
- int (*unlock)(struct git_config_backend *, int success);
- void (*free)(struct git_config_backend *);
+ int GIT_CALLBACK(unlock)(struct git_config_backend *, int success);
+ void GIT_CALLBACK(free)(struct git_config_backend *);
};
#define GIT_CONFIG_BACKEND_VERSION 1
#define GIT_CONFIG_BACKEND_INIT {GIT_CONFIG_BACKEND_VERSION}
* initialization operations (in case libgit2 is being used in a way that
* doesn't need the filter).
*/
-typedef int (*git_filter_init_fn)(git_filter *self);
+typedef int GIT_CALLBACK(git_filter_init_fn)(git_filter *self);
/**
* Shutdown callback on filter
*
* Typically this function will free the `git_filter` object itself.
*/
-typedef void (*git_filter_shutdown_fn)(git_filter *self);
+typedef void GIT_CALLBACK(git_filter_shutdown_fn)(git_filter *self);
/**
* Callback to decide if a given source needs this filter
* callback can use it. If a filter allocates and assigns a value to the
* `payload`, it will need a `cleanup` callback to free the payload.
*/
-typedef int (*git_filter_check_fn)(
+typedef int GIT_CALLBACK(git_filter_check_fn)(
git_filter *self,
void **payload, /* points to NULL ptr on entry, may be set */
const git_filter_source *src,
* The `payload` value will refer to any payload that was set by the
* `check` callback. It may be read from or written to as needed.
*/
-typedef int (*git_filter_apply_fn)(
+typedef int GIT_CALLBACK(git_filter_apply_fn)(
git_filter *self,
void **payload, /* may be read and/or set */
git_buf *to,
const git_buf *from,
const git_filter_source *src);
-typedef int (*git_filter_stream_fn)(
+typedef int GIT_CALLBACK(git_filter_stream_fn)(
git_writestream **out,
git_filter *self,
void **payload,
* allocated a `payload` to keep per-source filter state, use this
* callback to free that payload and release resources as required.
*/
-typedef void (*git_filter_cleanup_fn)(
+typedef void GIT_CALLBACK(git_filter_cleanup_fn)(
git_filter *self,
void *payload);
#ifndef INCLUDE_sys_git_index_h__
#define INCLUDE_sys_git_index_h__
+#include "git2/common.h"
+#include "git2/types.h"
+
/**
* @file git2/sys/index.h
* @brief Low-level Git index manipulation routines
GIT_BEGIN_DECL
/**
- * Instantiate a new mempack backend.
+ * Instantiate a new mempack backend.
*
- * The backend must be added to an existing ODB with the highest
- * priority.
+ * The backend must be added to an existing ODB with the highest
+ * priority.
*
- * git_mempack_new(&mempacker);
- * git_repository_odb(&odb, repository);
- * git_odb_add_backend(odb, mempacker, 999);
+ * git_mempack_new(&mempacker);
+ * git_repository_odb(&odb, repository);
+ * git_odb_add_backend(odb, mempacker, 999);
*
- * Once the backend has been loaded, all writes to the ODB will
- * instead be queued in memory, and can be finalized with
- * `git_mempack_dump`.
+ * Once the backend has been loaded, all writes to the ODB will
+ * instead be queued in memory, and can be finalized with
+ * `git_mempack_dump`.
*
- * Subsequent reads will also be served from the in-memory store
- * to ensure consistency, until the memory store is dumped.
+ * Subsequent reads will also be served from the in-memory store
+ * to ensure consistency, until the memory store is dumped.
*
- * @param out Pointer where to store the ODB backend
- * @return 0 on success; error code otherwise
+ * @param out Pointer where to store the ODB backend
+ * @return 0 on success; error code otherwise
*/
GIT_EXTERN(int) git_mempack_new(git_odb_backend **out);
/**
- * Dump all the queued in-memory writes to a packfile.
+ * Dump all the queued in-memory writes to a packfile.
*
- * The contents of the packfile will be stored in the given buffer.
- * It is the caller's responsibility to ensure that the generated
- * packfile is available to the repository (e.g. by writing it
- * to disk, or doing something crazy like distributing it across
- * several copies of the repository over a network).
+ * The contents of the packfile will be stored in the given buffer.
+ * It is the caller's responsibility to ensure that the generated
+ * packfile is available to the repository (e.g. by writing it
+ * to disk, or doing something crazy like distributing it across
+ * several copies of the repository over a network).
*
- * Once the generated packfile is available to the repository,
- * call `git_mempack_reset` to cleanup the memory store.
+ * Once the generated packfile is available to the repository,
+ * call `git_mempack_reset` to cleanup the memory store.
*
- * Calling `git_mempack_reset` before the packfile has been
- * written to disk will result in an inconsistent repository
- * (the objects in the memory store won't be accessible).
+ * Calling `git_mempack_reset` before the packfile has been
+ * written to disk will result in an inconsistent repository
+ * (the objects in the memory store won't be accessible).
*
- * @param pack Buffer where to store the raw packfile
- * @param repo The active repository where the backend is loaded
- * @param backend The mempack backend
- * @return 0 on success; error code otherwise
+ * @param pack Buffer where to store the raw packfile
+ * @param repo The active repository where the backend is loaded
+ * @param backend The mempack backend
+ * @return 0 on success; error code otherwise
*/
GIT_EXTERN(int) git_mempack_dump(git_buf *pack, git_repository *repo, git_odb_backend *backend);
/**
- * Reset the memory packer by clearing all the queued objects.
+ * Reset the memory packer by clearing all the queued objects.
*
- * This assumes that `git_mempack_dump` has been called before to
- * store all the queued objects into a single packfile.
+ * This assumes that `git_mempack_dump` has been called before to
+ * store all the queued objects into a single packfile.
*
- * Alternatively, call `reset` without a previous dump to "undo"
- * all the recently written objects, giving transaction-like
- * semantics to the Git repository.
+ * Alternatively, call `reset` without a previous dump to "undo"
+ * all the recently written objects, giving transaction-like
+ * semantics to the Git repository.
*
- * @param backend The mempack backend
+ * @param backend The mempack backend
*/
GIT_EXTERN(void) git_mempack_reset(git_odb_backend *backend);
#ifndef INCLUDE_sys_git_merge_h__
#define INCLUDE_sys_git_merge_h__
+#include "git2/common.h"
+#include "git2/types.h"
+#include "git2/index.h"
+#include "git2/merge.h"
+
/**
* @file git2/sys/merge.h
* @brief Git merge driver backend and plugin routines
- * @defgroup git_backend Git custom backend APIs
+ * @defgroup git_merge Git merge driver APIs
* @ingroup Git
* @{
*/
* initialization operations (in case libgit2 is being used in a way that
* doesn't need the merge driver).
*/
-typedef int (*git_merge_driver_init_fn)(git_merge_driver *self);
+typedef int GIT_CALLBACK(git_merge_driver_init_fn)(git_merge_driver *self);
/**
* Shutdown callback on merge driver
*
* Typically this function will free the `git_merge_driver` object itself.
*/
-typedef void (*git_merge_driver_shutdown_fn)(git_merge_driver *self);
+typedef void GIT_CALLBACK(git_merge_driver_shutdown_fn)(git_merge_driver *self);
/**
* Callback to perform the merge.
*
* The `src` contains the data about the file to be merged.
*/
-typedef int (*git_merge_driver_apply_fn)(
+typedef int GIT_CALLBACK(git_merge_driver_apply_fn)(
git_merge_driver *self,
const char **path_out,
uint32_t *mode_out,
* will be freed later. The buffer should be allocated using
* the function git_odb_backend_malloc to ensure that it can
* be safely freed later. */
- int (* read)(
- void **, size_t *, git_otype *, git_odb_backend *, const git_oid *);
+ int GIT_CALLBACK(read)(
+ void **, size_t *, git_object_t *, git_odb_backend *, const git_oid *);
/* To find a unique object given a prefix of its oid. The oid given
* must be so that the remaining (GIT_OID_HEXSZ - len)*4 bits are 0s.
*/
- int (* read_prefix)(
- git_oid *, void **, size_t *, git_otype *,
+ int GIT_CALLBACK(read_prefix)(
+ git_oid *, void **, size_t *, git_object_t *,
git_odb_backend *, const git_oid *, size_t);
- int (* read_header)(
- size_t *, git_otype *, git_odb_backend *, const git_oid *);
+ int GIT_CALLBACK(read_header)(
+ size_t *, git_object_t *, git_odb_backend *, const git_oid *);
/**
* Write an object into the backend. The id of the object has
* already been calculated and is passed in.
*/
- int (* write)(
- git_odb_backend *, const git_oid *, const void *, size_t, git_otype);
+ int GIT_CALLBACK(write)(
+ git_odb_backend *, const git_oid *, const void *, size_t, git_object_t);
- int (* writestream)(
- git_odb_stream **, git_odb_backend *, git_off_t, git_otype);
+ int GIT_CALLBACK(writestream)(
+ git_odb_stream **, git_odb_backend *, git_off_t, git_object_t);
- int (* readstream)(
- git_odb_stream **, size_t *, git_otype *,
+ int GIT_CALLBACK(readstream)(
+ git_odb_stream **, size_t *, git_object_t *,
git_odb_backend *, const git_oid *);
- int (* exists)(
+ int GIT_CALLBACK(exists)(
git_odb_backend *, const git_oid *);
- int (* exists_prefix)(
+ int GIT_CALLBACK(exists_prefix)(
git_oid *, git_odb_backend *, const git_oid *, size_t);
/**
* implementation to achieve this could be to internally invoke this
* endpoint on failed lookups (ie. `exists()`, `read()`, `read_header()`).
*/
- int (* refresh)(git_odb_backend *);
+ int GIT_CALLBACK(refresh)(git_odb_backend *);
- int (* foreach)(
+ int GIT_CALLBACK(foreach)(
git_odb_backend *, git_odb_foreach_cb cb, void *payload);
- int (* writepack)(
+ int GIT_CALLBACK(writepack)(
git_odb_writepack **, git_odb_backend *, git_odb *odb,
git_transfer_progress_cb progress_cb, void *progress_payload);
* If callers implement this, they should return `0` if the object
* exists and was freshened, and non-zero otherwise.
*/
- int (* freshen)(git_odb_backend *, const git_oid *);
+ int GIT_CALLBACK(freshen)(git_odb_backend *, const git_oid *);
/**
* Frees any resources held by the odb (including the `git_odb_backend`
* itself). An odb backend implementation must provide this function.
*/
- void (* free)(git_odb_backend *);
+ void GIT_CALLBACK(free)(git_odb_backend *);
};
#define GIT_ODB_BACKEND_VERSION 1
--- /dev/null
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#ifndef INCLUDE_sys_git_path_h__
+#define INCLUDE_sys_git_path_h__
+
+#include "git2/common.h"
+
+GIT_BEGIN_DECL
+
+/**
+ * The kinds of git-specific files we know about.
+ *
+ * The order needs to stay the same to not break the `gitfiles`
+ * array in path.c
+ */
+typedef enum {
+ /** Check for the .gitignore file */
+ GIT_PATH_GITFILE_GITIGNORE,
+ /** Check for the .gitmodules file */
+ GIT_PATH_GITFILE_GITMODULES,
+ /** Check for the .gitattributes file */
+ GIT_PATH_GITFILE_GITATTRIBUTES
+} git_path_gitfile;
+
+/**
+ * The kinds of checks to perform according to which filesystem we are trying to
+ * protect.
+ */
+typedef enum {
+ /** Do both NTFS- and HFS-specific checks */
+ GIT_PATH_FS_GENERIC,
+ /** Do NTFS-specific checks only */
+ GIT_PATH_FS_NTFS,
+ /** Do HFS-specific checks only */
+ GIT_PATH_FS_HFS
+} git_path_fs;
+
+/**
+ * Check whether a path component corresponds to a .git$SUFFIX
+ * file.
+ *
+ * As some filesystems do special things to filenames when
+ * writing files to disk, you cannot always do a plain string
+ * comparison to verify whether a file name matches an expected
+ * path or not. This function can do the comparison for you,
+ * depending on the filesystem you're on.
+ *
+ * @param path the path component to check
+ * @param pathlen the length of `path` that is to be checked
+ * @param gitfile which file to check against
+ * @param fs which filesystem-specific checks to use
+ * @return 0 in case the file does not match, a positive value if
+ * it does; -1 in case of an error
+ */
+GIT_EXTERN(int) git_path_is_gitfile(const char *path, size_t pathlen, git_path_gitfile gitfile, git_path_fs fs);
+
+GIT_END_DECL
+
+#endif /* INCLUDE_sys_git_path */
/**
* Return the current reference and advance the iterator.
*/
- int (*next)(
+ int GIT_CALLBACK(next)(
git_reference **ref,
git_reference_iterator *iter);
/**
* Return the name of the current reference and advance the iterator
*/
- int (*next_name)(
+ int GIT_CALLBACK(next_name)(
const char **ref_name,
git_reference_iterator *iter);
/**
* Free the iterator
*/
- void (*free)(
+ void GIT_CALLBACK(free)(
git_reference_iterator *iter);
};
* Queries the refdb backend to determine if the given ref_name
* exists. A refdb implementation must provide this function.
*/
- int (*exists)(
+ int GIT_CALLBACK(exists)(
int *exists,
git_refdb_backend *backend,
const char *ref_name);
* Queries the refdb backend for a given reference. A refdb
* implementation must provide this function.
*/
- int (*lookup)(
+ int GIT_CALLBACK(lookup)(
git_reference **out,
git_refdb_backend *backend,
const char *ref_name);
*
* A refdb implementation must provide this function.
*/
- int (*iterator)(
+ int GIT_CALLBACK(iterator)(
git_reference_iterator **iter,
struct git_refdb_backend *backend,
const char *glob);
* Writes the given reference to the refdb. A refdb implementation
* must provide this function.
*/
- int (*write)(git_refdb_backend *backend,
+ int GIT_CALLBACK(write)(git_refdb_backend *backend,
const git_reference *ref, int force,
const git_signature *who, const char *message,
const git_oid *old, const char *old_target);
- int (*rename)(
+ int GIT_CALLBACK(rename)(
git_reference **out, git_refdb_backend *backend,
const char *old_name, const char *new_name, int force,
const git_signature *who, const char *message);
* from the refdb. A refdb implementation must provide this
* function.
*/
- int (*del)(git_refdb_backend *backend, const char *ref_name, const git_oid *old_id, const char *old_target);
+ int GIT_CALLBACK(del)(git_refdb_backend *backend, const char *ref_name, const git_oid *old_id, const char *old_target);
/**
* Suggests that the given refdb compress or optimize its references.
* implementation may provide this function; if it is not provided,
* nothing will be done.
*/
- int (*compress)(git_refdb_backend *backend);
+ int GIT_CALLBACK(compress)(git_refdb_backend *backend);
/**
* Query whether a particular reference has a log (may be empty)
*/
- int (*has_log)(git_refdb_backend *backend, const char *refname);
+ int GIT_CALLBACK(has_log)(git_refdb_backend *backend, const char *refname);
/**
* Make sure a particular reference will have a reflog which
* will be appended to on writes.
*/
- int (*ensure_log)(git_refdb_backend *backend, const char *refname);
+ int GIT_CALLBACK(ensure_log)(git_refdb_backend *backend, const char *refname);
/**
* Frees any resources held by the refdb (including the `git_refdb_backend`
* itself). A refdb backend implementation must provide this function.
*/
- void (*free)(git_refdb_backend *backend);
+ void GIT_CALLBACK(free)(git_refdb_backend *backend);
/**
* Read the reflog for the given reference name.
*/
- int (*reflog_read)(git_reflog **out, git_refdb_backend *backend, const char *name);
+ int GIT_CALLBACK(reflog_read)(git_reflog **out, git_refdb_backend *backend, const char *name);
/**
* Write a reflog to disk.
*/
- int (*reflog_write)(git_refdb_backend *backend, git_reflog *reflog);
+ int GIT_CALLBACK(reflog_write)(git_refdb_backend *backend, git_reflog *reflog);
/**
* Rename a reflog
*/
- int (*reflog_rename)(git_refdb_backend *_backend, const char *old_name, const char *new_name);
+ int GIT_CALLBACK(reflog_rename)(git_refdb_backend *_backend, const char *old_name, const char *new_name);
/**
* Remove a reflog.
*/
- int (*reflog_delete)(git_refdb_backend *backend, const char *name);
+ int GIT_CALLBACK(reflog_delete)(git_refdb_backend *backend, const char *name);
/**
* Lock a reference. The opaque parameter will be passed to the unlock function
*/
- int (*lock)(void **payload_out, git_refdb_backend *backend, const char *refname);
+ int GIT_CALLBACK(lock)(void **payload_out, git_refdb_backend *backend, const char *refname);
/**
* Unlock a reference. Only one of target or symbolic_target
* will be set. success indicates whether to update the
* reference or discard the lock (if it's false)
*/
- int (*unlock)(git_refdb_backend *backend, void *payload, int success, int update_reflog,
+ int GIT_CALLBACK(unlock)(git_refdb_backend *backend, void *payload, int success, int update_reflog,
const git_reference *ref, const git_signature *sig, const char *message);
};
int encrypted;
int proxy_support;
- int (*connect)(struct git_stream *);
- int (*certificate)(git_cert **, struct git_stream *);
- int (*set_proxy)(struct git_stream *, const git_proxy_options *proxy_opts);
- ssize_t (*read)(struct git_stream *, void *, size_t);
- ssize_t (*write)(struct git_stream *, const char *, size_t, int);
- int (*close)(struct git_stream *);
- void (*free)(struct git_stream *);
+ int GIT_CALLBACK(connect)(struct git_stream *);
+ int GIT_CALLBACK(certificate)(git_cert **, struct git_stream *);
+ int GIT_CALLBACK(set_proxy)(struct git_stream *, const git_proxy_options *proxy_opts);
+ ssize_t GIT_CALLBACK(read)(struct git_stream *, void *, size_t);
+ ssize_t GIT_CALLBACK(write)(struct git_stream *, const char *, size_t, int);
+ int GIT_CALLBACK(close)(struct git_stream *);
+ void GIT_CALLBACK(free)(struct git_stream *);
} git_stream;
-typedef int (*git_stream_cb)(git_stream **out, const char *host, const char *port);
+typedef struct {
+ /** The `version` field should be set to `GIT_STREAM_VERSION`. */
+ int version;
+
+ /**
+ * Called to create a new connection to a given host.
+ *
+ * @param out The created stream
+ * @param host The hostname to connect to; may be a hostname or
+ * IP address
+ * @param port The port to connect to; may be a port number or
+ * service name
+ * @return 0 or an error code
+ */
+ int GIT_CALLBACK(init)(git_stream **out, const char *host, const char *port);
+
+ /**
+ * Called to create a new connection on top of the given stream. If
+ * this is a TLS stream, then this function may be used to proxy a
+ * TLS stream over an HTTP CONNECT session. If this is unset, then
+ * HTTP CONNECT proxies will not be supported.
+ *
+ * @param out The created stream
+ * @param in An existing stream to add TLS to
+ * @param host The hostname that the stream is connected to,
+ * for certificate validation
+ * @return 0 or an error code
+ */
+ int GIT_CALLBACK(wrap)(git_stream **out, git_stream *in, const char *host);
+} git_stream_registration;
+
+/**
+ * The type of stream to register.
+ */
+typedef enum {
+ /** A standard (non-TLS) socket. */
+ GIT_STREAM_STANDARD = 1,
+
+ /** A TLS-encrypted socket. */
+ GIT_STREAM_TLS = 2,
+} git_stream_t;
/**
- * Register a TLS stream constructor for the library to use
+ * Register stream constructors for the library to use
+ *
+ * If a registration structure is already set, it will be overwritten.
+ * Pass `NULL` in order to deregister the current constructor and return
+ * to the system defaults.
*
- * If a constructor is already set, it will be overwritten. Pass
- * `NULL` in order to deregister the current constructor.
+ * The type parameter may be a bitwise AND of types.
*
- * @param ctor the constructor to use
+ * @param type the type or types of stream to register
+ * @param registration the registration data
* @return 0 or an error code
*/
+GIT_EXTERN(int) git_stream_register(
+ git_stream_t type, git_stream_registration *registration);
+
+#ifndef GIT_DEPRECATE_HARD
+
+/** @name Deprecated TLS Stream Registration Functions
+ *
+ * These functions are retained for backward compatibility. The newer
+ * versions of these values should be preferred in all new code.
+ *
+ * There is no plan to remove these backward compatibility values at
+ * this time.
+ */
+/**@{*/
+
+/**
+ * @deprecated Provide a git_stream_registration to git_stream_register
+ * @see git_stream_registration
+ */
+typedef int GIT_CALLBACK(git_stream_cb)(git_stream **out, const char *host, const char *port);
+
+/**
+ * Register a TLS stream constructor for the library to use. This stream
+ * will not support HTTP CONNECT proxies. This internally calls
+ * `git_stream_register` and is preserved for backward compatibility.
+ *
+ * This function is deprecated, but there is no plan to remove this
+ * function at this time.
+ *
+ * @deprecated Provide a git_stream_registration to git_stream_register
+ * @see git_stream_register
+ */
GIT_EXTERN(int) git_stream_register_tls(git_stream_cb ctor);
+/**@}*/
+
+#endif
+
GIT_END_DECL
#endif
} git_transport_flags_t;
struct git_transport {
- unsigned int version;
- /* Set progress and error callbacks */
- int (*set_callbacks)(
+ unsigned int version; /**< The struct version */
+
+ /** Set progress and error callbacks */
+ int GIT_CALLBACK(set_callbacks)(
git_transport *transport,
git_transport_message_cb progress_cb,
git_transport_message_cb error_cb,
git_transport_certificate_check_cb certificate_check_cb,
void *payload);
- /* Set custom headers for HTTP requests */
- int (*set_custom_headers)(
+ /** Set custom headers for HTTP requests */
+ int GIT_CALLBACK(set_custom_headers)(
git_transport *transport,
const git_strarray *custom_headers);
- /* Connect the transport to the remote repository, using the given
- * direction. */
- int (*connect)(
+ /**
+ * Connect the transport to the remote repository, using the given
+ * direction.
+ */
+ int GIT_CALLBACK(connect)(
git_transport *transport,
const char *url,
git_cred_acquire_cb cred_acquire_cb,
int direction,
int flags);
- /* This function may be called after a successful call to
- * connect(). The array returned is owned by the transport and
- * is guaranteed until the next call of a transport function. */
- int (*ls)(
+ /**
+ * Get the list of available references in the remote repository.
+ *
+ * This function may be called after a successful call to
+ * `connect()`. The array returned is owned by the transport and
+ * must be kept valid until the next call to one of its functions.
+ */
+ int GIT_CALLBACK(ls)(
const git_remote_head ***out,
size_t *size,
git_transport *transport);
- /* Executes the push whose context is in the git_push object. */
- int(*push)(git_transport *transport, git_push *push, const git_remote_callbacks *callbacks);
+ /** Executes the push whose context is in the git_push object. */
+ int GIT_CALLBACK(push)(git_transport *transport, git_push *push, const git_remote_callbacks *callbacks);
- /* This function may be called after a successful call to connect(), when
- * the direction is FETCH. The function performs a negotiation to calculate
- * the wants list for the fetch. */
- int (*negotiate_fetch)(
+ /**
+ * Negotiate a fetch with the remote repository.
+ *
+ * This function may be called after a successful call to `connect()`,
+ * when the direction is GIT_DIRECTION_FETCH. The function performs a
+ * negotiation to calculate the `wants` list for the fetch.
+ */
+ int GIT_CALLBACK(negotiate_fetch)(
git_transport *transport,
git_repository *repo,
const git_remote_head * const *refs,
size_t count);
- /* This function may be called after a successful call to negotiate_fetch(),
- * when the direction is FETCH. This function retrieves the pack file for
- * the fetch from the remote end. */
- int (*download_pack)(
+ /**
+ * Start downloading the packfile from the remote repository.
+ *
+ * This function may be called after a successful call to
+ * negotiate_fetch(), when the direction is GIT_DIRECTION_FETCH.
+ */
+ int GIT_CALLBACK(download_pack)(
git_transport *transport,
git_repository *repo,
git_transfer_progress *stats,
git_transfer_progress_cb progress_cb,
void *progress_payload);
- /* Checks to see if the transport is connected */
- int (*is_connected)(git_transport *transport);
+ /** Checks to see if the transport is connected */
+ int GIT_CALLBACK(is_connected)(git_transport *transport);
- /* Reads the flags value previously passed into connect() */
- int (*read_flags)(git_transport *transport, int *flags);
+ /** Reads the flags value previously passed into connect() */
+ int GIT_CALLBACK(read_flags)(git_transport *transport, int *flags);
- /* Cancels any outstanding transport operation */
- void (*cancel)(git_transport *transport);
+ /** Cancels any outstanding transport operation */
+ void GIT_CALLBACK(cancel)(git_transport *transport);
- /* This function is the reverse of connect() -- it terminates the
- * connection to the remote end. */
- int (*close)(git_transport *transport);
+ /**
+ * Close the connection to the remote repository.
+ *
+ * This function is the reverse of connect() -- it terminates the
+ * connection to the remote end.
+ */
+ int GIT_CALLBACK(close)(git_transport *transport);
- /* Frees/destructs the git_transport object. */
- void (*free)(git_transport *transport);
+ /** Frees/destructs the git_transport object. */
+ void GIT_CALLBACK(free)(git_transport *transport);
};
#define GIT_TRANSPORT_VERSION 1
void *param);
/**
- *
* Unregister a custom transport definition which was previously registered
* with git_transport_register.
*
+ * The caller is responsible for synchronizing calls to git_transport_register
+ * and git_transport_unregister with other calls to the library that
+ * instantiate transports.
+ *
* @param prefix From the previous call to git_transport_register
* @return 0 or an error code
*/
* @param cert the certificate to pass to the caller
* @param valid whether we believe the certificate is valid
* @param hostname the hostname we connected to
- * @return the return value of the callback
+ * @return the return value of the callback: 0 for no error, GIT_PASSTHROUGH
+ * to indicate that there is no callback registered (or the callback
+ * refused to validate the certificate and callers should behave as
+ * if no callback was set), or < 0 for an error
*/
GIT_EXTERN(int) git_transport_smart_certificate_check(git_transport *transport, git_cert *cert, int valid, const char *hostname);
* @param transport a smart transport
* @param user the user we saw on the url (if any)
* @param methods available methods for authentication
- * @return the return value of the callback
+ * @return the return value of the callback: 0 for no error, GIT_PASSTHROUGH
+ * to indicate that there is no callback registered (or the callback
+ * refused to provide credentials and callers should behave as if no
+ * callback was set), or < 0 for an error
*/
GIT_EXTERN(int) git_transport_smart_credentials(git_cred **out, git_transport *transport, const char *user, int methods);
*** Begin interface for subtransports for the smart transport ***
*/
-/* The smart transport knows how to speak the git protocol, but it has no
- * knowledge of how to establish a connection between it and another endpoint,
- * or how to move data back and forth. For this, a subtransport interface is
- * declared, and the smart transport delegates this work to the subtransports.
- * Three subtransports are implemented: git, http, and winhttp. (The http and
- * winhttp transports each implement both http and https.) */
-
-/* Subtransports can either be RPC = 0 (persistent connection) or RPC = 1
- * (request/response). The smart transport handles the differences in its own
- * logic. The git subtransport is RPC = 0, while http and winhttp are both
- * RPC = 1. */
-
-/* Actions that the smart transport can ask
- * a subtransport to perform */
+/** Actions that the smart transport can ask a subtransport to perform */
typedef enum {
GIT_SERVICE_UPLOADPACK_LS = 1,
GIT_SERVICE_UPLOADPACK = 2,
typedef struct git_smart_subtransport git_smart_subtransport;
typedef struct git_smart_subtransport_stream git_smart_subtransport_stream;
-/* A stream used by the smart transport to read and write data
- * from a subtransport */
+/**
+ * A stream used by the smart transport to read and write data
+ * from a subtransport.
+ *
+ * This provides a customization point in case you need to
+ * support some other communication method.
+ */
struct git_smart_subtransport_stream {
- /* The owning subtransport */
- git_smart_subtransport *subtransport;
+ git_smart_subtransport *subtransport; /**< The owning subtransport */
- int (*read)(
+ /**
+ * Read available data from the stream.
+ *
+ * The implementation may read less than requested.
+ */
+ int GIT_CALLBACK(read)(
git_smart_subtransport_stream *stream,
char *buffer,
size_t buf_size,
size_t *bytes_read);
- int (*write)(
+ /**
+ * Write data to the stream
+ *
+ * The implementation must write all data or return an error.
+ */
+ int GIT_CALLBACK(write)(
git_smart_subtransport_stream *stream,
const char *buffer,
size_t len);
- void (*free)(
+ /** Free the stream */
+ void GIT_CALLBACK(free)(
git_smart_subtransport_stream *stream);
};
-/* An implementation of a subtransport which carries data for the
- * smart transport */
+/**
+ * An implementation of a subtransport which carries data for the
+ * smart transport
+ */
struct git_smart_subtransport {
- int (* action)(
+ /**
+ * Setup a subtransport stream for the requested action.
+ */
+ int GIT_CALLBACK(action)(
git_smart_subtransport_stream **out,
git_smart_subtransport *transport,
const char *url,
git_smart_service_t action);
- /* Subtransports are guaranteed a call to close() between
+ /**
+ * Close the subtransport.
+ *
+ * Subtransports are guaranteed a call to close() between
* calls to action(), except for the following two "natural" progressions
- * of actions against a constant URL.
+ * of actions against a constant URL:
*
- * 1. UPLOADPACK_LS -> UPLOADPACK
- * 2. RECEIVEPACK_LS -> RECEIVEPACK */
- int (*close)(git_smart_subtransport *transport);
+ * - UPLOADPACK_LS -> UPLOADPACK
+ * - RECEIVEPACK_LS -> RECEIVEPACK
+ */
+ int GIT_CALLBACK(close)(git_smart_subtransport *transport);
- void (*free)(git_smart_subtransport *transport);
+ /** Free the subtransport */
+ void GIT_CALLBACK(free)(git_smart_subtransport *transport);
};
-/* A function which creates a new subtransport for the smart transport */
-typedef int (*git_smart_subtransport_cb)(
+/** A function which creates a new subtransport for the smart transport */
+typedef int GIT_CALLBACK(git_smart_subtransport_cb)(
git_smart_subtransport **out,
- git_transport* owner,
- void* param);
+ git_transport *owner,
+ void *param);
/**
* Definition for a "subtransport"
*
- * This is used to let the smart protocol code know about the protocol
- * which you are implementing.
+ * The smart transport knows how to speak the git protocol, but it has no
+ * knowledge of how to establish a connection between it and another endpoint,
+ * or how to move data back and forth. For this, a subtransport interface is
+ * declared, and the smart transport delegates this work to the subtransports.
+ *
+ * Three subtransports are provided by libgit2: ssh, git, http(s).
+ *
+ * Subtransports can either be RPC = 0 (persistent connection) or RPC = 1
+ * (request/response). The smart transport handles the differences in its own
+ * logic. The git subtransport is RPC = 0, while http is RPC = 1.
*/
typedef struct git_smart_subtransport_definition {
/** The function to use to create the git_smart_subtransport */
*/
unsigned rpc;
- /** Param of the callback
- */
- void* param;
+ /** User-specified parameter passed to the callback */
+ void *param;
} git_smart_subtransport_definition;
/* Smart transport subtransports that come with libgit2 */
/**
- * Create an instance of the http subtransport. This subtransport
- * also supports https. On Win32, this subtransport may be implemented
- * using the WinHTTP library.
+ * Create an instance of the http subtransport.
+ *
+ * This subtransport also supports https.
*
* @param out The newly created subtransport
* @param owner The smart transport to own this subtransport
*/
GIT_EXTERN(int) git_smart_subtransport_http(
git_smart_subtransport **out,
- git_transport* owner,
+ git_transport *owner,
void *param);
/**
*/
GIT_EXTERN(int) git_smart_subtransport_git(
git_smart_subtransport **out,
- git_transport* owner,
+ git_transport *owner,
void *param);
/**
*/
GIT_EXTERN(int) git_smart_subtransport_ssh(
git_smart_subtransport **out,
- git_transport* owner,
+ git_transport *owner,
void *param);
/** @} */
* @param tag a previously loaded tag.
* @return type of the tagged object
*/
-GIT_EXTERN(git_otype) git_tag_target_type(const git_tag *tag);
+GIT_EXTERN(git_object_t) git_tag_target_type(const git_tag *tag);
/**
* Get the name of a tag
git_repository *repo);
-typedef int (*git_tag_foreach_cb)(const char *name, git_oid *oid, void *payload);
+typedef int GIT_CALLBACK(git_tag_foreach_cb)(const char *name, git_oid *oid, void *payload);
/**
* Call callback `cb' for each tag in the repository
/**
* An instance for a tracing function
*/
-typedef void (*git_trace_callback)(git_trace_level_t level, const char *msg);
+typedef void GIT_CALLBACK(git_trace_callback)(git_trace_level_t level, const char *msg);
/**
* Sets the system tracing configuration to the specified level with the
#define INCLUDE_git_transaction_h__
#include "common.h"
+#include "types.h"
/**
* @file git2/transaction.h
GIT_BEGIN_DECL
/** Signature of a function which creates a transport */
-typedef int (*git_transport_cb)(git_transport **out, git_remote *owner, void *param);
+typedef int GIT_CALLBACK(git_transport_cb)(git_transport **out, git_remote *owner, void *param);
/**
* Type of SSH host fingerprint
*** Begin interface for credentials acquisition ***
*/
-/** Authentication type requested */
+/**
+ * Supported credential types
+ *
+ * This represents the various types of authentication methods supported by
+ * the library.
+ */
typedef enum {
- /* git_cred_userpass_plaintext */
+ /**
+ * A vanilla user/password request
+ * @see git_cred_userpass_plaintext_new
+ */
GIT_CREDTYPE_USERPASS_PLAINTEXT = (1u << 0),
- /* git_cred_ssh_key */
+ /**
+ * An SSH key-based authentication request
+ * @see git_cred_ssh_key_new
+ */
GIT_CREDTYPE_SSH_KEY = (1u << 1),
- /* git_cred_ssh_custom */
+ /**
+ * An SSH key-based authentication request, with a custom signature
+ * @see git_cred_ssh_custom_new
+ */
GIT_CREDTYPE_SSH_CUSTOM = (1u << 2),
- /* git_cred_default */
+ /**
+ * An NTLM/Negotiate-based authentication request.
+ * @see git_cred_default
+ */
GIT_CREDTYPE_DEFAULT = (1u << 3),
- /* git_cred_ssh_interactive */
+ /**
+ * An SSH interactive authentication request
+ * @see git_cred_ssh_interactive_new
+ */
GIT_CREDTYPE_SSH_INTERACTIVE = (1u << 4),
/**
- * Username-only information
+ * Username-only authentication request
*
- * If the SSH transport does not know which username to use,
- * it will ask via this credential type.
+ * Used as a pre-authentication step if the underlying transport
+ * (eg. SSH, with no username in its URL) does not know which username
+ * to use.
+ *
+ * @see git_cred_username_new
*/
GIT_CREDTYPE_USERNAME = (1u << 5),
/**
- * Credentials read from memory.
+ * An SSH key-based authentication request
+ *
+ * Allows credentials to be read from memory instead of files.
+ * Note that because of differences in crypto backend support, it might
+ * not be functional.
*
- * Only available for libssh2+OpenSSL for now.
+ * @see git_cred_ssh_key_memory_new
*/
GIT_CREDTYPE_SSH_MEMORY = (1u << 6),
} git_credtype_t;
-/* The base structure for all credential types */
typedef struct git_cred git_cred;
+/**
+ * The base structure for all credential types
+ */
struct git_cred {
- git_credtype_t credtype;
- void (*free)(git_cred *cred);
+ git_credtype_t credtype; /**< A type of credential */
+ void GIT_CALLBACK(free)(git_cred *cred);
};
/** A plaintext username and password */
typedef struct _LIBSSH2_USERAUTH_KBDINT_RESPONSE LIBSSH2_USERAUTH_KBDINT_RESPONSE;
#endif
-typedef int (*git_cred_sign_callback)(LIBSSH2_SESSION *session, unsigned char **sig, size_t *sig_len, const unsigned char *data, size_t data_len, void **abstract);
-typedef void (*git_cred_ssh_interactive_callback)(const char* name, int name_len, const char* instruction, int instruction_len, int num_prompts, const LIBSSH2_USERAUTH_KBDINT_PROMPT* prompts, LIBSSH2_USERAUTH_KBDINT_RESPONSE* responses, void **abstract);
+typedef int GIT_CALLBACK(git_cred_sign_callback)(LIBSSH2_SESSION *session, unsigned char **sig, size_t *sig_len, const unsigned char *data, size_t data_len, void **abstract);
+typedef void GIT_CALLBACK(git_cred_ssh_interactive_callback)(const char* name, int name_len, const char* instruction, int instruction_len, int num_prompts, const LIBSSH2_USERAUTH_KBDINT_PROMPT* prompts, LIBSSH2_USERAUTH_KBDINT_RESPONSE* responses, void **abstract);
/**
* A ssh key from disk
* @return 0 for success, < 0 to indicate an error, > 0 to indicate
* no credential was acquired
*/
-typedef int (*git_cred_acquire_cb)(
+typedef int GIT_CALLBACK(git_cred_acquire_cb)(
git_cred **cred,
const char *url,
const char *username_from_url,
* @param entry a tree entry
* @return the type of the pointed object
*/
-GIT_EXTERN(git_otype) git_tree_entry_type(const git_tree_entry *entry);
+GIT_EXTERN(git_object_t) git_tree_entry_type(const git_tree_entry *entry);
/**
* Get the UNIX file attributes of a tree entry
* entry should be left alone and any non-zero value meaning that the
* entry should be removed from the treebuilder list (i.e. filtered out).
*/
-typedef int (*git_treebuilder_filter_cb)(
+typedef int GIT_CALLBACK(git_treebuilder_filter_cb)(
const git_tree_entry *entry, void *payload);
/**
git_oid *oid, git_treebuilder *bld, git_buf *tree);
/** Callback for the tree traversal method */
-typedef int (*git_treewalk_cb)(
+typedef int GIT_CALLBACK(git_treewalk_cb)(
const char *root, const git_tree_entry *entry, void *payload);
/** Tree traversal modes */
* app, even though /we/ define _FILE_OFFSET_BITS=64.
*/
typedef int64_t git_off_t;
-typedef int64_t git_time_t;
+typedef int64_t git_time_t; /**< time in seconds from epoch */
#endif
+#include "buffer.h"
+#include "oid.h"
+
/** Basic type (loose or packed) of any Git object. */
typedef enum {
- GIT_OBJ_ANY = -2, /**< Object can be any of the following */
- GIT_OBJ_BAD = -1, /**< Object is invalid. */
- GIT_OBJ__EXT1 = 0, /**< Reserved for future use. */
- GIT_OBJ_COMMIT = 1, /**< A commit object. */
- GIT_OBJ_TREE = 2, /**< A tree (directory listing) object. */
- GIT_OBJ_BLOB = 3, /**< A file revision object. */
- GIT_OBJ_TAG = 4, /**< An annotated tag object. */
- GIT_OBJ__EXT2 = 5, /**< Reserved for future use. */
- GIT_OBJ_OFS_DELTA = 6, /**< A delta, base is given by an offset. */
- GIT_OBJ_REF_DELTA = 7, /**< A delta, base is given by object id. */
-} git_otype;
+ GIT_OBJECT_ANY = -2, /**< Object can be any of the following */
+ GIT_OBJECT_INVALID = -1, /**< Object is invalid. */
+ GIT_OBJECT_COMMIT = 1, /**< A commit object. */
+ GIT_OBJECT_TREE = 2, /**< A tree (directory listing) object. */
+ GIT_OBJECT_BLOB = 3, /**< A file revision object. */
+ GIT_OBJECT_TAG = 4, /**< An annotated tag object. */
+ GIT_OBJECT_OFS_DELTA = 6, /**< A delta, base is given by an offset. */
+ GIT_OBJECT_REF_DELTA = 7, /**< A delta, base is given by object id. */
+} git_object_t;
/** An open object database handle. */
typedef struct git_odb git_odb;
/** Memory representation of an index file. */
typedef struct git_index git_index;
+/** An iterator for entries in the index. */
+typedef struct git_index_iterator git_index_iterator;
+
/** An iterator for conflicts in the index. */
typedef struct git_index_conflict_iterator git_index_conflict_iterator;
/** Annotated commits, the input to merge and rebase. */
typedef struct git_annotated_commit git_annotated_commit;
-/** Merge result */
-typedef struct git_merge_result git_merge_result;
-
/** Representation of a status collection */
typedef struct git_status_list git_status_list;
/** Basic type of any Git reference. */
typedef enum {
- GIT_REF_INVALID = 0, /**< Invalid reference */
- GIT_REF_OID = 1, /**< A reference which points at an object id */
- GIT_REF_SYMBOLIC = 2, /**< A reference which points at another reference */
- GIT_REF_LISTALL = GIT_REF_OID|GIT_REF_SYMBOLIC,
-} git_ref_t;
+ GIT_REFERENCE_INVALID = 0, /**< Invalid reference */
+ GIT_REFERENCE_DIRECT = 1, /**< A reference that points at an object id */
+ GIT_REFERENCE_SYMBOLIC = 2, /**< A reference that points at another reference */
+ GIT_REFERENCE_ALL = GIT_REFERENCE_DIRECT | GIT_REFERENCE_SYMBOLIC,
+} git_reference_t;
/** Basic type of any Git branch. */
typedef enum {
GIT_FILEMODE_COMMIT = 0160000,
} git_filemode_t;
-/*
+/**
* A refspec specifies the mapping between remote and local reference
* names when fetch or pushing.
*/
* @param stats Structure containing information about the state of the transfer
* @param payload Payload provided by caller
*/
-typedef int (*git_transfer_progress_cb)(const git_transfer_progress *stats, void *payload);
+typedef int GIT_CALLBACK(git_transfer_progress_cb)(const git_transfer_progress *stats, void *payload);
/**
* Type for messages delivered by the transport. Return a negative value
* @param len The length of the message
* @param payload Payload provided by the caller
*/
-typedef int (*git_transport_message_cb)(const char *str, int len, void *payload);
+typedef int GIT_CALLBACK(git_transport_message_cb)(const char *str, int len, void *payload);
/**
* this certificate is valid
* @param host Hostname of the host libgit2 connected to
* @param payload Payload provided by the caller
+ * @return 0 to proceed with the connection, < 0 to fail the connection
+ * or > 0 to indicate that the callback refused to act and that
+ * the existing validity determination should be honored
*/
-typedef int (*git_transport_certificate_check_cb)(git_cert *cert, int valid, const char *host, void *payload);
+typedef int GIT_CALLBACK(git_transport_certificate_check_cb)(git_cert *cert, int valid, const char *host, void *payload);
/**
* Opaque structure representing a submodule.
GIT_SUBMODULE_RECURSE_ONDEMAND = 2,
} git_submodule_recurse_t;
-/** A type to write in a streaming fashion, for example, for filters. */
typedef struct git_writestream git_writestream;
+/** A type to write in a streaming fashion, for example, for filters. */
struct git_writestream {
- int (*write)(git_writestream *stream, const char *buffer, size_t len);
- int (*close)(git_writestream *stream);
- void (*free)(git_writestream *stream);
+ int GIT_CALLBACK(write)(git_writestream *stream, const char *buffer, size_t len);
+ int GIT_CALLBACK(close)(git_writestream *stream);
+ void GIT_CALLBACK(free)(git_writestream *stream);
};
+/** Representation of .mailmap file state. */
+typedef struct git_mailmap git_mailmap;
+
/** @} */
GIT_END_DECL
#ifndef INCLUDE_git_version_h__
#define INCLUDE_git_version_h__
-#define LIBGIT2_VERSION "0.27.7"
+#define LIBGIT2_VERSION "0.28.1"
#define LIBGIT2_VER_MAJOR 0
-#define LIBGIT2_VER_MINOR 27
-#define LIBGIT2_VER_REVISION 7
+#define LIBGIT2_VER_MINOR 28
+#define LIBGIT2_VER_REVISION 1
#define LIBGIT2_VER_PATCH 0
-#define LIBGIT2_SOVERSION 27
+#define LIBGIT2_SOVERSION 28
#endif
*/
GIT_EXTERN(int) git_worktree_validate(const git_worktree *wt);
+/**
+ * Worktree add options structure
+ *
+ * Initialize with `GIT_WORKTREE_ADD_OPTIONS_INIT`. Alternatively, you can
+ * use `git_worktree_add_init_options`.
+ *
+ */
typedef struct git_worktree_add_options {
unsigned int version;
int lock; /**< lock newly created worktree */
+ git_reference *ref; /**< reference to use for the new worktree HEAD */
} git_worktree_add_options;
#define GIT_WORKTREE_ADD_OPTIONS_VERSION 1
-#define GIT_WORKTREE_ADD_OPTIONS_INIT {GIT_WORKTREE_ADD_OPTIONS_VERSION,0}
+#define GIT_WORKTREE_ADD_OPTIONS_INIT {GIT_WORKTREE_ADD_OPTIONS_VERSION,0,NULL}
/**
- * Initializes a `git_worktree_add_options` with default vaules.
- * Equivalent to creating an instance with
- * GIT_WORKTREE_ADD_OPTIONS_INIT.
+ * Initialize git_worktree_add_options structure
+ *
+ * Initializes a `git_worktree_add_options` with default values. Equivalent to
+ * creating an instance with `GIT_WORKTREE_ADD_OPTIONS_INIT`.
*
- * @param opts the struct to initialize
- * @param version Verison of struct; pass `GIT_WORKTREE_ADD_OPTIONS_VERSION`
+ * @param opts The `git_worktree_add_options` struct to initialize.
+ * @param version The struct version; pass `GIT_WORKTREE_ADD_OPTIONS_VERSION`.
* @return Zero on success; -1 on failure.
*/
-int git_worktree_add_init_options(git_worktree_add_options *opts,
+GIT_EXTERN(int) git_worktree_add_init_options(git_worktree_add_options *opts,
unsigned int version);
/**
*/
GIT_EXTERN(int) git_worktree_is_locked(git_buf *reason, const git_worktree *wt);
+/**
+ * Retrieve the name of the worktree
+ *
+ * @param wt Worktree to get the name for
+ * @return The worktree's name. The pointer returned is valid for the
+ * lifetime of the git_worktree
+ */
+GIT_EXTERN(const char *) git_worktree_name(const git_worktree *wt);
+
+/**
+ * Retrieve the filesystem path for the worktree
+ *
+ * @param wt Worktree to get the path for
+ * @return The worktree's filesystem path. The pointer returned
+ * is valid for the lifetime of the git_worktree.
+ */
+GIT_EXTERN(const char *) git_worktree_path(const git_worktree *wt);
+
/**
* Flags which can be passed to git_worktree_prune to alter its
* behavior.
GIT_WORKTREE_PRUNE_WORKING_TREE = 1u << 2,
} git_worktree_prune_t;
+/**
+ * Worktree prune options structure
+ *
+ * Initialize with `GIT_WORKTREE_PRUNE_OPTIONS_INIT`. Alternatively, you can
+ * use `git_worktree_prune_init_options`.
+ *
+ */
typedef struct git_worktree_prune_options {
unsigned int version;
#define GIT_WORKTREE_PRUNE_OPTIONS_INIT {GIT_WORKTREE_PRUNE_OPTIONS_VERSION,0}
/**
- * Initializes a `git_worktree_prune_options` with default vaules.
- * Equivalent to creating an instance with
- * GIT_WORKTREE_PRUNE_OPTIONS_INIT.
+ * Initialize git_worktree_prune_options structure
+ *
+ * Initializes a `git_worktree_prune_options` with default values. Equivalent to
+ * creating an instance with `GIT_WORKTREE_PRUNE_OPTIONS_INIT`.
*
- * @param opts the struct to initialize
- * @param version Verison of struct; pass `GIT_WORKTREE_PRUNE_OPTIONS_VERSION`
+ * @param opts The `git_worktree_prune_options` struct to initialize.
+ * @param version The struct version; pass `GIT_WORKTREE_PRUNE_OPTIONS_VERSION`.
* @return Zero on success; -1 on failure.
*/
GIT_EXTERN(int) git_worktree_prune_init_options(
}
{
- ignore-giterr-set-leak
+ ignore-giterror-set-leak
Memcheck:Leak
...
- fun:giterr_set
+ fun:giterror_set
}
{
}
{
- ignore-libssh2-gcrypt-leak
+ ignore-libssh2-gcrypt-control-leak
Memcheck:Leak
...
fun:gcry_control
obj:*libssh2.so*
}
+{
+ ignore-libssh2-gcrypt-mpinew-leak
+ Memcheck:Leak
+ ...
+ fun:gcry_mpi_new
+ obj:*libssh2.so*
+}
+
+{
+ ignore-libssh2-gcrypt-mpiscan-leak
+ Memcheck:Leak
+ ...
+ fun:gcry_mpi_scan
+ obj:*libssh2.so*
+}
+
+{
+ ignore-libssh2-gcrypt-randomize-leak
+ Memcheck:Leak
+ ...
+ fun:gcry_randomize
+ obj:*libssh2.so*
+}
+
+{
+ ignore-libssh2-gcrypt-sexpfindtoken-leak
+ Memcheck:Leak
+ ...
+ fun:gcry_sexp_find_token
+ obj:*libssh2.so*
+}
+
+{
+ ignore-libssh2-gcrypt-pksign-leak
+ Memcheck:Leak
+ ...
+ fun:gcry_pk_sign
+ obj:*libssh2.so*
+}
+
{
ignore-noai6ai_cached-double-free
Memcheck:Free
--- /dev/null
+{
+ "name": "libgit2",
+ "version": "0.27.0",
+ "repo": "https://github.com/libgit2/libgit2",
+ "description": " A cross-platform, linkable library implementation of Git that you can use in your application.",
+ "install": "mkdir build && cd build && cmake .. && cmake --build ."
+}
--- /dev/null
+#!/bin/sh
+
+if test $# -eq 0
+then
+ echo "USAGE: $0 <#PR> [<#PR>...]"
+ exit
+fi
+
+commits=
+
+for pr in $*
+do
+ mergecommit=$(git rev-parse ":/Merge pull request #$pr" || exit 1)
+ mergebase=$(git merge-base "$mergecommit"^1 "$mergecommit"^2 || exit 1)
+
+ commits="$commits $(git rev-list --reverse "$mergecommit"^2 ^"$mergebase")"
+done
+
+echo "Cherry-picking the following commits:"
+git rev-list --no-walk --oneline $commits
+echo
+
+git cherry-pick $commits
buf->size = len + 1;
return 0;
}
+
+void clar__fail(
+ const char *file,
+ int line,
+ const char *error,
+ const char *description,
+ int should_abort)
+{
+ if (should_abort)
+ __coverity_panic__();
+}
+
+void clar__assert(
+ int condition,
+ const char *file,
+ int line,
+ const char *error,
+ const char *description,
+ int should_abort)
+{
+ if (!condition && should_abort)
+ __coverity_panic__();
+}
* a Linking Exception. For full terms see the included COPYING file.
*/
-#nodef GITERR_CHECK_ALLOC(ptr) if (ptr == NULL) { __coverity_panic__(); }
-#nodef GITERR_CHECK_ALLOC_BUF(buf) if (buf == NULL || git_buf_oom(buf)) { __coverity_panic__(); }
+#nodef GIT_ERROR_CHECK_ALLOC(ptr) if (ptr == NULL) { __coverity_panic__(); }
+#nodef GIT_ERROR_CHECK_ALLOC_BUF(buf) if (buf == NULL || git_buf_oom(buf)) { __coverity_panic__(); }
#nodef GITERR_CHECK_ALLOC_ADD(out, one, two) \
if (GIT_ADD_SIZET_OVERFLOW(out, one, two)) { __coverity_panic__(); }
#nodef GITERR_CHECK_ALLOC_MULTIPLY(out, nelem, elsize) \
if (GIT_MULTIPLY_SIZET_OVERFLOW(out, nelem, elsize)) { __coverity_panic__(); }
-#nodef GITERR_CHECK_VERSION(S,V,N) if (giterr__check_version(S,V,N) < 0) { __coverity_panic__(); }
+#nodef GIT_ERROR_CHECK_VERSION(S,V,N) if (git_error__check_version(S,V,N) < 0) { __coverity_panic__(); }
#nodef LOOKS_LIKE_DRIVE_PREFIX(S) (strlen(S) >= 2 && git__isalpha((S)[0]) && (S)[1] == ':')
"${CMAKE_CURRENT_BINARY_DIR}"
"${libgit2_SOURCE_DIR}/src"
"${libgit2_SOURCE_DIR}/include")
+SET(LIBGIT2_SYSTEM_INCLUDES "")
SET(LIBGIT2_LIBS "")
# Installation paths
IF (WIN32 AND EMBED_SSH_PATH)
FILE(GLOB SRC_SSH "${EMBED_SSH_PATH}/src/*.c")
- LIST(APPEND LIBGIT2_INCLUDES "${EMBED_SSH_PATH}/include")
+ LIST(APPEND LIBGIT2_SYSTEM_INCLUDES "${EMBED_SSH_PATH}/include")
FILE(WRITE "${EMBED_SSH_PATH}/src/libssh2_config.h" "#define HAVE_WINCNG\n#define LIBSSH2_WINCNG\n#include \"../win32/libssh2_config.h\"")
SET(GIT_SSH 1)
ENDIF()
IF (MINGW)
ADD_SUBDIRECTORY("${libgit2_SOURCE_DIR}/deps/winhttp" "${libgit2_BINARY_DIR}/deps/winhttp")
LIST(APPEND LIBGIT2_LIBS winhttp)
- LIST(APPEND LIBGIT2_INCLUDES "${libgit2_SOURCE_DIR}/deps/winhttp")
+ LIST(APPEND LIBGIT2_SYSTEM_INCLUDES "${libgit2_SOURCE_DIR}/deps/winhttp")
ELSE()
LIST(APPEND LIBGIT2_LIBS "winhttp")
LIST(APPEND LIBGIT2_PC_LIBS "-lwinhttp")
LIST(APPEND LIBGIT2_LIBS "rpcrt4" "crypt32" "ole32")
LIST(APPEND LIBGIT2_PC_LIBS "-lrpcrt4" "-lcrypt32" "-lole32")
-ELSE ()
- IF (CURL)
- FIND_PKGLIBRARIES(CURL libcurl)
- ENDIF ()
- IF (CURL_FOUND)
- SET(GIT_CURL 1)
- LIST(APPEND LIBGIT2_INCLUDES ${CURL_INCLUDE_DIRS})
- LIST(APPEND LIBGIT2_LIBS ${CURL_LIBRARIES})
- LIST(APPEND LIBGIT2_PC_LIBS ${CURL_LDFLAGS})
- ENDIF()
- ADD_FEATURE_INFO(cURL GIT_CURL "cURL for HTTP proxy support")
ENDIF()
IF (USE_HTTPS)
+ # We try to find any packages our backends might use
+ FIND_PACKAGE(OpenSSL)
+ FIND_PACKAGE(mbedTLS)
IF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
FIND_PACKAGE(Security)
FIND_PACKAGE(CoreFoundation)
ENDIF()
ELSEIF (WINHTTP)
SET(HTTPS_BACKEND "WinHTTP")
- ELSE()
+ ELSEIF(OPENSSL_FOUND)
SET(HTTPS_BACKEND "OpenSSL")
+ ELSEIF(MBEDTLS_FOUND)
+ SET(HTTPS_BACKEND "mbedTLS")
+ ELSE()
+ MESSAGE(FATAL_ERROR "Unable to autodetect a usable HTTPS backend."
+ "Please pass the backend name explicitly (-DUSE_HTTPS=backend)")
ENDIF()
ELSE()
# Backend was explicitly set
ENDIF()
SET(GIT_SECURE_TRANSPORT 1)
- LIST(APPEND LIBGIT2_INCLUDES ${SECURITY_INCLUDE_DIR})
+ LIST(APPEND LIBGIT2_SYSTEM_INCLUDES ${SECURITY_INCLUDE_DIR})
LIST(APPEND LIBGIT2_LIBS ${COREFOUNDATION_LIBRARIES} ${SECURITY_LIBRARIES})
LIST(APPEND LIBGIT2_PC_LIBS ${COREFOUNDATION_LDFLAGS} ${SECURITY_LDFLAGS})
ELSEIF (HTTPS_BACKEND STREQUAL "OpenSSL")
- FIND_PACKAGE(OpenSSL)
-
IF (NOT OPENSSL_FOUND)
MESSAGE(FATAL_ERROR "Asked for OpenSSL TLS backend, but it wasn't found")
ENDIF()
SET(GIT_OPENSSL 1)
- LIST(APPEND LIBGIT2_INCLUDES ${OPENSSL_INCLUDE_DIR})
+ LIST(APPEND LIBGIT2_SYSTEM_INCLUDES ${OPENSSL_INCLUDE_DIR})
LIST(APPEND LIBGIT2_LIBS ${OPENSSL_LIBRARIES})
LIST(APPEND LIBGIT2_PC_LIBS ${OPENSSL_LDFLAGS})
LIST(APPEND LIBGIT2_PC_REQUIRES "openssl")
+ ELSEIF(HTTPS_BACKEND STREQUAL "mbedTLS")
+ IF (NOT MBEDTLS_FOUND)
+ MESSAGE(FATAL_ERROR "Asked for mbedTLS backend, but it wasn't found")
+ ENDIF()
+
+ IF(NOT CERT_LOCATION)
+ MESSAGE("Auto-detecting default certificates location")
+ IF(CMAKE_SYSTEM_NAME MATCHES Darwin)
+ # Check for an Homebrew installation
+ SET(OPENSSL_CMD "/usr/local/opt/openssl/bin/openssl")
+ ELSE()
+ SET(OPENSSL_CMD "openssl")
+ ENDIF()
+ EXECUTE_PROCESS(COMMAND ${OPENSSL_CMD} version -d OUTPUT_VARIABLE OPENSSL_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+ IF(OPENSSL_DIR)
+ STRING(REGEX REPLACE "^OPENSSLDIR: \"(.*)\"$" "\\1/" OPENSSL_DIR ${OPENSSL_DIR})
+
+ SET(OPENSSL_CA_LOCATIONS
+ "ca-bundle.pem" # OpenSUSE Leap 42.1
+ "cert.pem" # Ubuntu 14.04, FreeBSD
+ "certs/ca-certificates.crt" # Ubuntu 16.04
+ "certs/ca.pem" # Debian 7
+ )
+ FOREACH(SUFFIX IN LISTS OPENSSL_CA_LOCATIONS)
+ SET(LOC "${OPENSSL_DIR}${SUFFIX}")
+ IF(NOT CERT_LOCATION AND EXISTS "${OPENSSL_DIR}${SUFFIX}")
+ SET(CERT_LOCATION ${LOC})
+ ENDIF()
+ ENDFOREACH()
+ ELSE()
+ MESSAGE("Unable to find OpenSSL executable. Please provide default certificate location via CERT_LOCATION")
+ ENDIF()
+ ENDIF()
+
+ IF(CERT_LOCATION)
+ IF(NOT EXISTS ${CERT_LOCATION})
+ MESSAGE(FATAL_ERROR "Cannot use CERT_LOCATION=${CERT_LOCATION} as it doesn't exist")
+ ENDIF()
+ ADD_FEATURE_INFO(CERT_LOCATION ON "using certificates from ${CERT_LOCATION}")
+ ADD_DEFINITIONS(-DGIT_DEFAULT_CERT_LOCATION="${CERT_LOCATION}")
+ ENDIF()
+
+ SET(GIT_MBEDTLS 1)
+ LIST(APPEND LIBGIT2_SYSTEM_INCLUDES ${MBEDTLS_INCLUDE_DIR})
+ LIST(APPEND LIBGIT2_LIBS ${MBEDTLS_LIBRARIES})
+ # mbedTLS has no pkgconfig file, hence we can't require it
+ # https://github.com/ARMmbed/mbedtls/issues/228
+ # For now, pass its link flags as our own
+ LIST(APPEND LIBGIT2_PC_LIBS ${MBEDTLS_LIBRARIES})
ELSEIF (HTTPS_BACKEND STREQUAL "WinHTTP")
# WinHTTP setup was handled in the WinHTTP-specific block above
ELSE()
ELSEIF(SHA1_BACKEND STREQUAL "CommonCrypto")
ADD_FEATURE_INFO(SHA ON "using CommonCrypto")
SET(GIT_SHA1_COMMON_CRYPTO 1)
+ELSEIF (SHA1_BACKEND STREQUAL "mbedTLS")
+ ADD_FEATURE_INFO(SHA ON "using mbedTLS")
+ SET(GIT_SHA1_MBEDTLS 1)
+ FILE(GLOB SRC_SHA1 hash/hash_mbedtls.c)
+ LIST(APPEND LIBGIT2_SYSTEM_INCLUDES ${MBEDTLS_INCLUDE_DIR})
+ LIST(APPEND LIBGIT2_LIBS ${MBEDTLS_LIBRARIES})
+ # mbedTLS has no pkgconfig file, hence we can't require it
+ # https://github.com/ARMmbed/mbedtls/issues/228
+ # For now, pass its link flags as our own
+ LIST(APPEND LIBGIT2_PC_LIBS ${MBEDTLS_LIBRARIES})
ELSE()
MESSAGE(FATAL_ERROR "Asked for unknown SHA1 backend ${SHA1_BACKEND}")
ENDIF()
# Include POSIX regex when it is required
IF(WIN32 OR AMIGA OR CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)")
ADD_SUBDIRECTORY("${libgit2_SOURCE_DIR}/deps/regex" "${libgit2_BINARY_DIR}/deps/regex")
- LIST(APPEND LIBGIT2_INCLUDES "${libgit2_SOURCE_DIR}/deps/regex")
+ LIST(APPEND LIBGIT2_SYSTEM_INCLUDES "${libgit2_SOURCE_DIR}/deps/regex")
LIST(APPEND LIBGIT2_OBJECTS $<TARGET_OBJECTS:regex>)
ENDIF()
# Optional external dependency: http-parser
FIND_PACKAGE(HTTP_Parser)
IF (USE_EXT_HTTP_PARSER AND HTTP_PARSER_FOUND AND HTTP_PARSER_VERSION_MAJOR EQUAL 2)
- LIST(APPEND LIBGIT2_INCLUDES ${HTTP_PARSER_INCLUDE_DIRS})
+ LIST(APPEND LIBGIT2_SYSTEM_INCLUDES ${HTTP_PARSER_INCLUDE_DIRS})
LIST(APPEND LIBGIT2_LIBS ${HTTP_PARSER_LIBRARIES})
LIST(APPEND LIBGIT2_PC_LIBS "-lhttp_parser")
ADD_FEATURE_INFO(http-parser ON "http-parser support")
ELSE()
MESSAGE(STATUS "http-parser version 2 was not found or disabled; using bundled 3rd-party sources.")
ADD_SUBDIRECTORY("${libgit2_SOURCE_DIR}/deps/http-parser" "${libgit2_BINARY_DIR}/deps/http-parser")
- LIST(APPEND LIBGIT2_INCLUDES "${libgit2_SOURCE_DIR}/deps/http-parser")
+ LIST(APPEND LIBGIT2_SYSTEM_INCLUDES "${libgit2_SOURCE_DIR}/deps/http-parser")
LIST(APPEND LIBGIT2_OBJECTS "$<TARGET_OBJECTS:http-parser>")
ADD_FEATURE_INFO(http-parser ON "http-parser support (bundled)")
ENDIF()
IF(NOT USE_BUNDLED_ZLIB)
FIND_PACKAGE(ZLIB)
IF(ZLIB_FOUND)
- LIST(APPEND LIBGIT2_INCLUDES ${ZLIB_INCLUDE_DIRS})
+ LIST(APPEND LIBGIT2_SYSTEM_INCLUDES ${ZLIB_INCLUDE_DIRS})
LIST(APPEND LIBGIT2_LIBS ${ZLIB_LIBRARIES})
IF(APPLE OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
LIST(APPEND LIBGIT2_LIBS "z")
ENDIF()
IF(USE_BUNDLED_ZLIB OR NOT ZLIB_FOUND)
ADD_SUBDIRECTORY("${libgit2_SOURCE_DIR}/deps/zlib" "${libgit2_BINARY_DIR}/deps/zlib")
- LIST(APPEND LIBGIT2_INCLUDES "${libgit2_SOURCE_DIR}/deps/zlib")
+ LIST(APPEND LIBGIT2_SYSTEM_INCLUDES "${libgit2_SOURCE_DIR}/deps/zlib")
LIST(APPEND LIBGIT2_OBJECTS $<TARGET_OBJECTS:zlib>)
ADD_FEATURE_INFO(zlib ON "using bundled zlib")
ENDIF()
ENDIF()
IF (LIBSSH2_FOUND)
SET(GIT_SSH 1)
- LIST(APPEND LIBGIT2_INCLUDES ${LIBSSH2_INCLUDE_DIRS})
+ LIST(APPEND LIBGIT2_SYSTEM_INCLUDES ${LIBSSH2_INCLUDE_DIRS})
LIST(APPEND LIBGIT2_LIBS ${LIBSSH2_LIBRARIES})
LIST(APPEND LIBGIT2_PC_LIBS ${LIBSSH2_LDFLAGS})
ENDIF()
IF (ICONV_FOUND)
SET(GIT_USE_ICONV 1)
- LIST(APPEND LIBGIT2_INCLUDES ${ICONV_INCLUDE_DIR})
+ LIST(APPEND LIBGIT2_SYSTEM_INCLUDES ${ICONV_INCLUDE_DIR})
LIST(APPEND LIBGIT2_LIBS ${ICONV_LIBRARIES})
LIST(APPEND LIBGIT2_PC_LIBS ${ICONV_LIBRARIES})
ENDIF()
# On Windows use specific platform sources
IF (WIN32 AND NOT CYGWIN)
- ADD_DEFINITIONS(-DWIN32 -D_WIN32_WINNT=0x0501)
+ ADD_DEFINITIONS(-DWIN32 -D_WIN32_WINNT=0x0600)
IF(MSVC)
SET(WIN_RC "win32/git2.rc")
SET(LIBGIT2_SOURCES ${SRC_H} ${SRC_GIT2} ${SRC_OS} ${SRC_SSH} ${SRC_SHA1})
ADD_LIBRARY(git2internal OBJECT ${LIBGIT2_SOURCES})
+SET_TARGET_PROPERTIES(git2internal PROPERTIES C_STANDARD 90)
IDE_SPLIT_SOURCES(git2internal)
LIST(APPEND LIBGIT2_OBJECTS $<TARGET_OBJECTS:git2internal>)
IF (${CMAKE_VERSION} VERSION_LESS 2.8.12)
INCLUDE_DIRECTORIES(${LIBGIT2_INCLUDES})
+ INCLUDE_DIRECTORIES(SYSTEM ${LIBGIT2_SYSTEM_INCLUDES})
ELSE()
TARGET_INCLUDE_DIRECTORIES(git2internal
PRIVATE ${LIBGIT2_INCLUDES}
PUBLIC ${libgit2_SOURCE_DIR}/include)
+ TARGET_INCLUDE_DIRECTORIES(git2internal
+ SYSTEM PRIVATE ${LIBGIT2_SYSTEM_INCLUDES})
ENDIF()
SET(LIBGIT2_OBJECTS ${LIBGIT2_OBJECTS} PARENT_SCOPE)
SET(LIBGIT2_INCLUDES ${LIBGIT2_INCLUDES} PARENT_SCOPE)
+SET(LIBGIT2_SYSTEM_INCLUDES ${LIBGIT2_SYSTEM_INCLUDES} PARENT_SCOPE)
SET(LIBGIT2_LIBS ${LIBGIT2_LIBS} PARENT_SCOPE)
IF(XCODE_VERSION)
ADD_LIBRARY(git2 ${WIN_RC} ${LIBGIT2_OBJECTS})
TARGET_LINK_LIBRARIES(git2 ${LIBGIT2_LIBS})
+SET_TARGET_PROPERTIES(git2 PROPERTIES C_STANDARD 90)
SET_TARGET_PROPERTIES(git2 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${libgit2_BINARY_DIR})
SET_TARGET_PROPERTIES(git2 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${libgit2_BINARY_DIR})
SET_TARGET_PROPERTIES(git2 PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${libgit2_BINARY_DIR})
--- /dev/null
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#include "alloc.h"
+
+#if defined(GIT_MSVC_CRTDBG)
+# include "win32/w32_crtdbg_stacktrace.h"
+#else
+# include "stdalloc.h"
+#endif
+
+git_allocator git__allocator;
+
+static int setup_default_allocator(void)
+{
+#if defined(GIT_MSVC_CRTDBG)
+ return git_win32_crtdbg_init_allocator(&git__allocator);
+#else
+ return git_stdalloc_init_allocator(&git__allocator);
+#endif
+}
+
+int git_allocator_global_init(void)
+{
+ /*
+ * We don't want to overwrite any allocator which has been set before
+ * the init function is called.
+ */
+ if (git__allocator.gmalloc != NULL)
+ return 0;
+
+ return setup_default_allocator();
+}
+
+int git_allocator_setup(git_allocator *allocator)
+{
+ if (!allocator)
+ return setup_default_allocator();
+
+ memcpy(&git__allocator, allocator, sizeof(*allocator));
+ return 0;
+}
+
+#if !defined(GIT_MSVC_CRTDBG)
+int git_win32_crtdbg_init_allocator(git_allocator *allocator)
+{
+ GIT_UNUSED(allocator);
+ git_error_set(GIT_EINVALID, "crtdbg memory allocator not available");
+ return -1;
+}
+#endif
--- /dev/null
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#ifndef INCLUDE_alloc_h__
+#define INCLUDE_alloc_h__
+
+#include "git2/sys/alloc.h"
+
+extern git_allocator git__allocator;
+
+#define git__malloc(len) git__allocator.gmalloc(len, __FILE__, __LINE__)
+#define git__calloc(nelem, elsize) git__allocator.gcalloc(nelem, elsize, __FILE__, __LINE__)
+#define git__strdup(str) git__allocator.gstrdup(str, __FILE__, __LINE__)
+#define git__strndup(str, n) git__allocator.gstrndup(str, n, __FILE__, __LINE__)
+#define git__substrdup(str, n) git__allocator.gsubstrdup(str, n, __FILE__, __LINE__)
+#define git__realloc(ptr, size) git__allocator.grealloc(ptr, size, __FILE__, __LINE__)
+#define git__reallocarray(ptr, nelem, elsize) git__allocator.greallocarray(ptr, nelem, elsize, __FILE__, __LINE__)
+#define git__mallocarray(nelem, elsize) git__allocator.gmallocarray(nelem, elsize, __FILE__, __LINE__)
+#define git__free git__allocator.gfree
+
+/**
+ * This function is being called by our global setup routines to
+ * initialize the standard allocator.
+ */
+int git_allocator_global_init(void);
+
+/**
+ * Switch out libgit2's global memory allocator
+ *
+ * @param allocator The new allocator that should be used. All function pointers
+ * of it need to be set correctly.
+ * @return An error code or 0.
+ */
+int git_allocator_setup(git_allocator *allocator);
+
+#endif
*out = NULL;
annotated_commit = git__calloc(1, sizeof(git_annotated_commit));
- GITERR_CHECK_ALLOC(annotated_commit);
+ GIT_ERROR_CHECK_ALLOC(annotated_commit);
annotated_commit->type = GIT_ANNOTATED_COMMIT_REAL;
description = annotated_commit->id_str;
annotated_commit->description = git__strdup(description);
- GITERR_CHECK_ALLOC(annotated_commit->description);
+ GIT_ERROR_CHECK_ALLOC(annotated_commit->description);
done:
if (!error)
if ((error = git_revparse_single(&obj, repo, revspec)) < 0)
return error;
- if ((error = git_object_peel(&commit, obj, GIT_OBJ_COMMIT))) {
+ if ((error = git_object_peel(&commit, obj, GIT_OBJECT_COMMIT))) {
git_object_free(obj);
return error;
}
git_repository *repo,
const git_reference *ref)
{
- git_reference *resolved;
+ git_object *peeled;
int error = 0;
assert(out && repo && ref);
*out = NULL;
- if ((error = git_reference_resolve(&resolved, ref)) < 0)
+ if ((error = git_reference_peel(&peeled, ref, GIT_OBJECT_COMMIT)) < 0)
return error;
-
+
error = annotated_commit_init_from_id(out,
repo,
- git_reference_target(resolved),
+ git_object_id(peeled),
git_reference_name(ref));
if (!error) {
(*out)->ref_name = git__strdup(git_reference_name(ref));
- GITERR_CHECK_ALLOC((*out)->ref_name);
+ GIT_ERROR_CHECK_ALLOC((*out)->ref_name);
}
- git_reference_free(resolved);
+ git_object_free(peeled);
return error;
}
return -1;
(*out)->ref_name = git__strdup(branch_name);
- GITERR_CHECK_ALLOC((*out)->ref_name);
+ GIT_ERROR_CHECK_ALLOC((*out)->ref_name);
(*out)->remote_url = git__strdup(remote_url);
- GITERR_CHECK_ALLOC((*out)->remote_url);
+ GIT_ERROR_CHECK_ALLOC((*out)->remote_url);
return 0;
}
return git_commit_id(annotated_commit->commit);
}
+const char *git_annotated_commit_ref(
+ const git_annotated_commit *annotated_commit)
+{
+ assert(annotated_commit);
+ return annotated_commit->ref_name;
+}
+
void git_annotated_commit_free(git_annotated_commit *annotated_commit)
{
if (annotated_commit == NULL)
#include <assert.h>
+#include "git2/apply.h"
#include "git2/patch.h"
#include "git2/filter.h"
+#include "git2/blob.h"
+#include "git2/index.h"
+#include "git2/checkout.h"
+#include "git2/repository.h"
#include "array.h"
#include "patch.h"
#include "fileops.h"
#include "delta.h"
#include "zstream.h"
+#include "reader.h"
+#include "index.h"
#define apply_err(...) \
- ( giterr_set(GITERR_PATCH, __VA_ARGS__), -1 )
+ ( git_error_set(GIT_ERROR_PATCH, __VA_ARGS__), GIT_EAPPLYFAIL )
typedef struct {
/* The lines that we allocate ourself are allocated out of the pool.
end++;
line = git_pool_mallocz(&out->pool, 1);
- GITERR_CHECK_ALLOC(line);
+ GIT_ERROR_CHECK_ALLOC(line);
if (git_vector_insert(&out->lines, line) < 0)
return -1;
static int update_hunk(
patch_image *image,
- unsigned int linenum,
+ size_t linenum,
patch_image *preimage,
patch_image *postimage)
{
&image->lines, linenum, (prelen - postlen));
if (error) {
- giterr_set_oom();
+ git_error_set_oom();
return -1;
}
return 0;
}
+typedef struct {
+ git_apply_options opts;
+ size_t skipped_new_lines;
+ size_t skipped_old_lines;
+} apply_hunks_ctx;
+
static int apply_hunk(
patch_image *image,
git_patch *patch,
- git_patch_hunk *hunk)
+ git_patch_hunk *hunk,
+ apply_hunks_ctx *ctx)
{
patch_image preimage = PATCH_IMAGE_INIT, postimage = PATCH_IMAGE_INIT;
size_t line_num, i;
int error = 0;
+ if (ctx->opts.hunk_cb) {
+ error = ctx->opts.hunk_cb(&hunk->hunk, ctx->opts.payload);
+
+ if (error) {
+ if (error > 0) {
+ ctx->skipped_new_lines += hunk->hunk.new_lines;
+ ctx->skipped_old_lines += hunk->hunk.old_lines;
+ error = 0;
+ }
+
+ goto done;
+ }
+ }
+
for (i = 0; i < hunk->line_count; i++) {
size_t linenum = hunk->line_start + i;
git_diff_line *line = git_array_get(patch->lines, linenum);
}
}
- line_num = hunk->hunk.new_start ? hunk->hunk.new_start - 1 : 0;
+ if (hunk->hunk.new_start) {
+ line_num = hunk->hunk.new_start -
+ ctx->skipped_new_lines +
+ ctx->skipped_old_lines -
+ 1;
+ } else {
+ line_num = 0;
+ }
if (!find_hunk_linenum(&line_num, image, &preimage, line_num)) {
error = apply_err("hunk at line %d did not apply",
git_buf *out,
const char *source,
size_t source_len,
- git_patch *patch)
+ git_patch *patch,
+ apply_hunks_ctx *ctx)
{
git_patch_hunk *hunk;
git_diff_line *line;
goto done;
git_array_foreach(patch->hunks, i, hunk) {
- if ((error = apply_hunk(&image, patch, hunk)) < 0)
+ if ((error = apply_hunk(&image, patch, hunk, ctx)) < 0)
goto done;
}
if (!error && inflated.size != binary_file->inflatedlen) {
error = apply_err("inflated delta does not match expected length");
- git_buf_free(out);
+ git_buf_dispose(out);
}
if (error < 0)
}
done:
- git_buf_free(&inflated);
+ git_buf_dispose(&inflated);
return error;
}
&patch->binary.old_file)) < 0)
goto done;
+ /* Verify that the resulting file with the reverse patch applied matches the source file */
if (source_len != reverse.size ||
- memcmp(source, reverse.ptr, source_len) != 0) {
+ (source_len && memcmp(source, reverse.ptr, source_len) != 0)) {
error = apply_err("binary patch did not apply cleanly");
goto done;
}
done:
if (error < 0)
- git_buf_free(out);
+ git_buf_dispose(out);
- git_buf_free(&reverse);
+ git_buf_dispose(&reverse);
return error;
}
unsigned int *mode_out,
const char *source,
size_t source_len,
- git_patch *patch)
+ git_patch *patch,
+ const git_apply_options *given_opts)
{
+ apply_hunks_ctx ctx = { GIT_APPLY_OPTIONS_INIT };
char *filename = NULL;
unsigned int mode = 0;
int error = 0;
assert(contents_out && filename_out && mode_out && (source || !source_len) && patch);
+ if (given_opts)
+ memcpy(&ctx.opts, given_opts, sizeof(git_apply_options));
+
*filename_out = NULL;
*mode_out = 0;
if (patch->delta->flags & GIT_DIFF_FLAG_BINARY)
error = apply_binary(contents_out, source, source_len, patch);
else if (patch->hunks.size)
- error = apply_hunks(contents_out, source, source_len, patch);
+ error = apply_hunks(contents_out, source, source_len, patch, &ctx);
else
error = git_buf_put(contents_out, source, source_len);
return error;
}
+
+static int apply_one(
+ git_repository *repo,
+ git_reader *preimage_reader,
+ git_index *preimage,
+ git_reader *postimage_reader,
+ git_index *postimage,
+ git_diff *diff,
+ git_strmap *removed_paths,
+ size_t i,
+ const git_apply_options *opts)
+{
+ git_patch *patch = NULL;
+ git_buf pre_contents = GIT_BUF_INIT, post_contents = GIT_BUF_INIT;
+ const git_diff_delta *delta;
+ char *filename = NULL;
+ unsigned int mode;
+ git_oid pre_id, post_id;
+ git_filemode_t pre_filemode;
+ git_index_entry pre_entry, post_entry;
+ bool skip_preimage = false;
+ size_t pos;
+ int error;
+
+ if ((error = git_patch_from_diff(&patch, diff, i)) < 0)
+ goto done;
+
+ delta = git_patch_get_delta(patch);
+
+ if (opts->delta_cb) {
+ error = opts->delta_cb(delta, opts->payload);
+
+ if (error) {
+ if (error > 0)
+ error = 0;
+
+ goto done;
+ }
+ }
+
+ /*
+ * Ensure that the file has not been deleted or renamed if we're
+ * applying a modification delta.
+ */
+ if (delta->status != GIT_DELTA_RENAMED &&
+ delta->status != GIT_DELTA_ADDED) {
+ pos = git_strmap_lookup_index(removed_paths, delta->old_file.path);
+ if (git_strmap_valid_index(removed_paths, pos)) {
+ error = apply_err("path '%s' has been renamed or deleted", delta->old_file.path);
+ goto done;
+ }
+ }
+
+ /*
+ * We may be applying a second delta to an already seen file. If so,
+ * use the already modified data in the postimage instead of the
+ * content from the index or working directory. (Don't do this in
+ * the case of a rename, which must be specified before additional
+ * deltas since we apply deltas to the target filename.)
+ */
+ if (delta->status != GIT_DELTA_RENAMED) {
+ if ((error = git_reader_read(&pre_contents, &pre_id, &pre_filemode,
+ postimage_reader, delta->old_file.path)) == 0) {
+ skip_preimage = true;
+ } else if (error == GIT_ENOTFOUND) {
+ git_error_clear();
+ error = 0;
+ } else {
+ goto done;
+ }
+ }
+
+ if (!skip_preimage && delta->status != GIT_DELTA_ADDED) {
+ error = git_reader_read(&pre_contents, &pre_id, &pre_filemode,
+ preimage_reader, delta->old_file.path);
+
+ /* ENOTFOUND means the preimage was not found; apply failed. */
+ if (error == GIT_ENOTFOUND)
+ error = GIT_EAPPLYFAIL;
+
+ /* When applying to BOTH, the index did not match the workdir. */
+ if (error == GIT_READER_MISMATCH)
+ error = apply_err("%s: does not match index", delta->old_file.path);
+
+ if (error < 0)
+ goto done;
+
+ /*
+ * We need to populate the preimage data structure with the
+ * contents that we are using as the preimage for this file.
+ * This allows us to apply patches to files that have been
+ * modified in the working directory. During checkout,
+ * we will use this expected preimage as the baseline, and
+ * limit checkout to only the paths affected by patch
+ * application. (Without this, we would fail to write the
+ * postimage contents to any file that had been modified
+ * from HEAD on-disk, even if the patch application succeeded.)
+ * Use the contents from the delta where available - some
+ * fields may not be available, like the old file mode (eg in
+ * an exact rename situation) so trust the patch parsing to
+ * validate and use the preimage data in that case.
+ */
+ if (preimage) {
+ memset(&pre_entry, 0, sizeof(git_index_entry));
+ pre_entry.path = delta->old_file.path;
+ pre_entry.mode = delta->old_file.mode ? delta->old_file.mode : pre_filemode;
+ git_oid_cpy(&pre_entry.id, &pre_id);
+
+ if ((error = git_index_add(preimage, &pre_entry)) < 0)
+ goto done;
+ }
+ }
+
+ if (delta->status != GIT_DELTA_DELETED) {
+ if ((error = git_apply__patch(&post_contents, &filename, &mode,
+ pre_contents.ptr, pre_contents.size, patch, opts)) < 0 ||
+ (error = git_blob_create_frombuffer(&post_id, repo,
+ post_contents.ptr, post_contents.size)) < 0)
+ goto done;
+
+ memset(&post_entry, 0, sizeof(git_index_entry));
+ post_entry.path = filename;
+ post_entry.mode = mode;
+ git_oid_cpy(&post_entry.id, &post_id);
+
+ if ((error = git_index_add(postimage, &post_entry)) < 0)
+ goto done;
+ }
+
+ if (delta->status == GIT_DELTA_RENAMED ||
+ delta->status == GIT_DELTA_DELETED)
+ git_strmap_insert(removed_paths, delta->old_file.path, (char *)delta->old_file.path, &error);
+
+ if (delta->status == GIT_DELTA_RENAMED ||
+ delta->status == GIT_DELTA_ADDED)
+ git_strmap_delete(removed_paths, delta->new_file.path);
+
+done:
+ git_buf_dispose(&pre_contents);
+ git_buf_dispose(&post_contents);
+ git__free(filename);
+ git_patch_free(patch);
+
+ return error;
+}
+
+static int apply_deltas(
+ git_repository *repo,
+ git_reader *pre_reader,
+ git_index *preimage,
+ git_reader *post_reader,
+ git_index *postimage,
+ git_diff *diff,
+ const git_apply_options *opts)
+{
+ git_strmap *removed_paths;
+ size_t i;
+ int error = 0;
+
+ if (git_strmap_alloc(&removed_paths) < 0)
+ return -1;
+
+ for (i = 0; i < git_diff_num_deltas(diff); i++) {
+ if ((error = apply_one(repo, pre_reader, preimage, post_reader, postimage, diff, removed_paths, i, opts)) < 0)
+ goto done;
+ }
+
+done:
+ git_strmap_free(removed_paths);
+ return error;
+}
+
+int git_apply_to_tree(
+ git_index **out,
+ git_repository *repo,
+ git_tree *preimage,
+ git_diff *diff,
+ const git_apply_options *given_opts)
+{
+ git_index *postimage = NULL;
+ git_reader *pre_reader = NULL, *post_reader = NULL;
+ git_apply_options opts = GIT_APPLY_OPTIONS_INIT;
+ const git_diff_delta *delta;
+ size_t i;
+ int error = 0;
+
+ assert(out && repo && preimage && diff);
+
+ *out = NULL;
+
+ if (given_opts)
+ memcpy(&opts, given_opts, sizeof(git_apply_options));
+
+ if ((error = git_reader_for_tree(&pre_reader, preimage)) < 0)
+ goto done;
+
+ /*
+ * put the current tree into the postimage as-is - the diff will
+ * replace any entries contained therein
+ */
+ if ((error = git_index_new(&postimage)) < 0 ||
+ (error = git_index_read_tree(postimage, preimage)) < 0 ||
+ (error = git_reader_for_index(&post_reader, repo, postimage)) < 0)
+ goto done;
+
+ /*
+ * Remove the old paths from the index before applying diffs -
+ * we need to do a full pass to remove them before adding deltas,
+ * in order to handle rename situations.
+ */
+ for (i = 0; i < git_diff_num_deltas(diff); i++) {
+ delta = git_diff_get_delta(diff, i);
+
+ if ((error = git_index_remove(postimage,
+ delta->old_file.path, 0)) < 0)
+ goto done;
+ }
+
+ if ((error = apply_deltas(repo, pre_reader, NULL, post_reader, postimage, diff, &opts)) < 0)
+ goto done;
+
+ *out = postimage;
+
+done:
+ if (error < 0)
+ git_index_free(postimage);
+
+ git_reader_free(pre_reader);
+ git_reader_free(post_reader);
+
+ return error;
+}
+
+static int git_apply__to_workdir(
+ git_repository *repo,
+ git_diff *diff,
+ git_index *preimage,
+ git_index *postimage,
+ git_apply_location_t location,
+ git_apply_options *opts)
+{
+ git_vector paths = GIT_VECTOR_INIT;
+ git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT;
+ const git_diff_delta *delta;
+ size_t i;
+ int error;
+
+ GIT_UNUSED(opts);
+
+ /*
+ * Limit checkout to the paths affected by the diff; this ensures
+ * that other modifications in the working directory are unaffected.
+ */
+ if ((error = git_vector_init(&paths, git_diff_num_deltas(diff), NULL)) < 0)
+ goto done;
+
+ for (i = 0; i < git_diff_num_deltas(diff); i++) {
+ delta = git_diff_get_delta(diff, i);
+
+ if ((error = git_vector_insert(&paths, (void *)delta->old_file.path)) < 0)
+ goto done;
+
+ if (strcmp(delta->old_file.path, delta->new_file.path) &&
+ (error = git_vector_insert(&paths, (void *)delta->new_file.path)) < 0)
+ goto done;
+ }
+
+ checkout_opts.checkout_strategy |= GIT_CHECKOUT_SAFE;
+ checkout_opts.checkout_strategy |= GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH;
+ checkout_opts.checkout_strategy |= GIT_CHECKOUT_DONT_WRITE_INDEX;
+
+ if (location == GIT_APPLY_LOCATION_WORKDIR)
+ checkout_opts.checkout_strategy |= GIT_CHECKOUT_DONT_UPDATE_INDEX;
+
+ checkout_opts.paths.strings = (char **)paths.contents;
+ checkout_opts.paths.count = paths.length;
+
+ checkout_opts.baseline_index = preimage;
+
+ error = git_checkout_index(repo, postimage, &checkout_opts);
+
+done:
+ git_vector_free(&paths);
+ return error;
+}
+
+static int git_apply__to_index(
+ git_repository *repo,
+ git_diff *diff,
+ git_index *preimage,
+ git_index *postimage,
+ git_apply_options *opts)
+{
+ git_index *index = NULL;
+ const git_diff_delta *delta;
+ const git_index_entry *entry;
+ size_t i;
+ int error;
+
+ GIT_UNUSED(preimage);
+ GIT_UNUSED(opts);
+
+ if ((error = git_repository_index(&index, repo)) < 0)
+ goto done;
+
+ /* Remove deleted (or renamed) paths from the index. */
+ for (i = 0; i < git_diff_num_deltas(diff); i++) {
+ delta = git_diff_get_delta(diff, i);
+
+ if (delta->status == GIT_DELTA_DELETED ||
+ delta->status == GIT_DELTA_RENAMED) {
+ if ((error = git_index_remove(index, delta->old_file.path, 0)) < 0)
+ goto done;
+ }
+ }
+
+ /* Then add the changes back to the index. */
+ for (i = 0; i < git_index_entrycount(postimage); i++) {
+ entry = git_index_get_byindex(postimage, i);
+
+ if ((error = git_index_add(index, entry)) < 0)
+ goto done;
+ }
+
+done:
+ git_index_free(index);
+ return error;
+}
+
+/*
+ * Handle the three application options ("locations"):
+ *
+ * GIT_APPLY_LOCATION_WORKDIR: the default, emulates `git apply`.
+ * Applies the diff only to the workdir items and ignores the index
+ * entirely.
+ *
+ * GIT_APPLY_LOCATION_INDEX: emulates `git apply --cached`.
+ * Applies the diff only to the index items and ignores the workdir
+ * completely.
+ *
+ * GIT_APPLY_LOCATION_BOTH: emulates `git apply --index`.
+ * Applies the diff to both the index items and the working directory
+ * items.
+ */
+
+int git_apply(
+ git_repository *repo,
+ git_diff *diff,
+ git_apply_location_t location,
+ const git_apply_options *given_opts)
+{
+ git_indexwriter indexwriter = GIT_INDEXWRITER_INIT;
+ git_index *index = NULL, *preimage = NULL, *postimage = NULL;
+ git_reader *pre_reader = NULL, *post_reader = NULL;
+ git_apply_options opts = GIT_APPLY_OPTIONS_INIT;
+ int error = GIT_EINVALID;
+
+ assert(repo && diff);
+
+ GIT_ERROR_CHECK_VERSION(
+ given_opts, GIT_APPLY_OPTIONS_VERSION, "git_apply_options");
+
+ if (given_opts)
+ memcpy(&opts, given_opts, sizeof(git_apply_options));
+
+ /*
+ * by default, we apply a patch directly to the working directory;
+ * in `--cached` or `--index` mode, we apply to the contents already
+ * in the index.
+ */
+ switch (location) {
+ case GIT_APPLY_LOCATION_BOTH:
+ error = git_reader_for_workdir(&pre_reader, repo, true);
+ break;
+ case GIT_APPLY_LOCATION_INDEX:
+ error = git_reader_for_index(&pre_reader, repo, NULL);
+ break;
+ case GIT_APPLY_LOCATION_WORKDIR:
+ error = git_reader_for_workdir(&pre_reader, repo, false);
+ break;
+ default:
+ assert(false);
+ }
+
+ if (error < 0)
+ goto done;
+
+ /*
+ * Build the preimage and postimage (differences). Note that
+ * this is not the complete preimage or postimage, it only
+ * contains the files affected by the patch. We want to avoid
+ * having the full repo index, so we will limit our checkout
+ * to only write these files that were affected by the diff.
+ */
+ if ((error = git_index_new(&preimage)) < 0 ||
+ (error = git_index_new(&postimage)) < 0 ||
+ (error = git_reader_for_index(&post_reader, repo, postimage)) < 0)
+ goto done;
+
+ if ((error = git_repository_index(&index, repo)) < 0 ||
+ (error = git_indexwriter_init(&indexwriter, index)) < 0)
+ goto done;
+
+ if ((error = apply_deltas(repo, pre_reader, preimage, post_reader, postimage, diff, &opts)) < 0)
+ goto done;
+
+ switch (location) {
+ case GIT_APPLY_LOCATION_BOTH:
+ error = git_apply__to_workdir(repo, diff, preimage, postimage, location, &opts);
+ break;
+ case GIT_APPLY_LOCATION_INDEX:
+ error = git_apply__to_index(repo, diff, preimage, postimage, &opts);
+ break;
+ case GIT_APPLY_LOCATION_WORKDIR:
+ error = git_apply__to_workdir(repo, diff, preimage, postimage, location, &opts);
+ break;
+ default:
+ assert(false);
+ }
+
+ if (error < 0)
+ goto done;
+
+ error = git_indexwriter_commit(&indexwriter);
+
+done:
+ git_indexwriter_cleanup(&indexwriter);
+ git_index_free(postimage);
+ git_index_free(preimage);
+ git_index_free(index);
+ git_reader_free(pre_reader);
+ git_reader_free(post_reader);
+
+ return error;
+}
#include "common.h"
#include "git2/patch.h"
+#include "git2/apply.h"
#include "buffer.h"
extern int git_apply__patch(
unsigned int *mode,
const char *source,
size_t source_len,
- git_patch *patch);
+ git_patch *patch,
+ const git_apply_options *opts);
#endif
* git_array_t(int) my_ints = GIT_ARRAY_INIT;
* ...
* int *i = git_array_alloc(my_ints);
- * GITERR_CHECK_ALLOC(i);
+ * GIT_ERROR_CHECK_ALLOC(i);
* ...
* git_array_clear(my_ints);
*
#define git_array_clear(a) \
do { git__free((a).ptr); git_array_init(a); } while (0)
-#define GITERR_CHECK_ARRAY(a) GITERR_CHECK_ALLOC((a).ptr)
+#define GIT_ERROR_CHECK_ARRAY(a) GIT_ERROR_CHECK_ALLOC((a).ptr)
typedef git_array_t(char) git_array_generic_t;
goto cleanup;
info = git__calloc(num_attr, sizeof(attr_get_many_info));
- GITERR_CHECK_ALLOC(info);
+ GIT_ERROR_CHECK_ALLOC(info);
git_vector_foreach(&files, i, file) {
error = callback(assign->name, assign->value, payload);
if (error) {
- giterr_set_after_callback(error);
+ git_error_set_after_callback(error);
goto cleanup;
}
}
error = git_sysdir_find_system_file(out, GIT_ATTR_FILE_SYSTEM);
if (error == GIT_ENOTFOUND)
- giterr_clear();
+ git_error_clear();
return error;
}
error = git_sysdir_find_system_file(&attr_session->sysdir, GIT_ATTR_FILE_SYSTEM);
if (error == GIT_ENOTFOUND)
- giterr_clear();
+ git_error_clear();
else if (error)
return error;
/* We can safely provide a git_buf with no allocation (asize == 0) to
* a consumer. This allows them to treat this as a regular `git_buf`,
- * but their call to `git_buf_free` will not attempt to free it.
+ * but their call to `git_buf_dispose` will not attempt to free it.
*/
git_buf_attach_notowned(
out, attr_session->sysdir.ptr, attr_session->sysdir.size);
attr_session->init_setup = 1;
out:
- git_buf_free(&path);
+ git_buf_dispose(&path);
return error;
}
return error;
macro = git__calloc(1, sizeof(git_attr_rule));
- GITERR_CHECK_ALLOC(macro);
+ GIT_ERROR_CHECK_ALLOC(macro);
pool = &git_repository_attr_cache(repo)->pool;
macro->match.pattern = git_pool_strdup(pool, name);
- GITERR_CHECK_ALLOC(macro->match.pattern);
+ GIT_ERROR_CHECK_ALLOC(macro->match.pattern);
macro->match.length = strlen(macro->match.pattern);
macro->match.flags = GIT_ATTR_FNMATCH_MACRO;
info.flags = flags;
info.workdir = workdir;
if (git_repository_index__weakptr(&info.index, repo) < 0)
- giterr_clear(); /* no error even if there is no index */
+ git_error_clear(); /* no error even if there is no index */
info.files = files;
if (!strcmp(dir.ptr, "."))
cleanup:
if (error < 0)
release_attr_files(files);
- git_buf_free(&attrfile);
- git_buf_free(&dir);
+ git_buf_dispose(&attrfile);
+ git_buf_dispose(&dir);
return error;
}
#include "attrcache.h"
#include "git2/blob.h"
#include "git2/tree.h"
+#include "blob.h"
#include "index.h"
#include <ctype.h>
git_attr_file_source source)
{
git_attr_file *attrs = git__calloc(1, sizeof(git_attr_file));
- GITERR_CHECK_ALLOC(attrs);
+ GIT_ERROR_CHECK_ALLOC(attrs);
if (git_mutex_init(&attrs->lock) < 0) {
- giterr_set(GITERR_OS, "failed to initialize lock");
+ git_error_set(GIT_ERROR_OS, "failed to initialize lock");
git__free(attrs);
return -1;
}
git_attr_rule *rule;
if (need_lock && git_mutex_lock(&file->lock) < 0) {
- giterr_set(GITERR_OS, "failed to lock attribute file");
+ git_error_set(GIT_ERROR_OS, "failed to lock attribute file");
return -1;
}
break;
case GIT_ATTR_FILE__FROM_INDEX: {
git_oid id;
+ git_off_t blobsize;
if ((error = attr_file_oid_from_index(&id, repo, entry->path)) < 0 ||
(error = git_blob_lookup(&blob, repo, &id)) < 0)
/* Do not assume that data straight from the ODB is NULL-terminated;
* copy the contents of a file to a buffer to work on */
- git_buf_put(&content, git_blob_rawcontent(blob), git_blob_rawsize(blob));
+ blobsize = git_blob_rawsize(blob);
+
+ GIT_ERROR_CHECK_BLOBSIZE(blobsize);
+ git_buf_put(&content, git_blob_rawcontent(blob), (size_t)blobsize);
break;
}
case GIT_ATTR_FILE__FROM_FILE: {
break;
}
default:
- giterr_set(GITERR_INVALID, "unknown file source %d", source);
+ git_error_set(GIT_ERROR_INVALID, "unknown file source %d", source);
return -1;
}
cleanup:
git_blob_free(blob);
- git_buf_free(&content);
+ git_buf_dispose(&content);
return error;
}
}
default:
- giterr_set(GITERR_INVALID, "invalid file type %d", file->source);
+ git_error_set(GIT_ERROR_INVALID, "invalid file type %d", file->source);
return -1;
}
}
context = attrs->entry->path;
if (git_mutex_lock(&attrs->lock) < 0) {
- giterr_set(GITERR_OS, "failed to lock attribute file");
+ git_error_set(GIT_ERROR_OS, "failed to lock attribute file");
return -1;
}
if (!(error = git_futils_readbuffer(&content, path))) {
error = git_attr_file__parse_buffer(NULL, file, content.ptr);
- git_buf_free(&content);
+ git_buf_dispose(&content);
}
if (error < 0)
void git_attr_path__free(git_attr_path *info)
{
- git_buf_free(&info->full);
+ git_buf_dispose(&info->full);
info->path = NULL;
info->basename = NULL;
}
}
if (*pattern == '!' && (spec->flags & GIT_ATTR_FNMATCH_ALLOWNEG) != 0) {
- spec->flags = spec->flags |
- GIT_ATTR_FNMATCH_NEGATIVE | GIT_ATTR_FNMATCH_LEADINGDIR;
+ spec->flags = spec->flags | GIT_ATTR_FNMATCH_NEGATIVE;
+ if ((spec->flags & GIT_ATTR_FNMATCH_NOLEADINGDIR) == 0)
+ spec->flags |= GIT_ATTR_FNMATCH_LEADINGDIR;
pattern++;
}
/* allocate assign if needed */
if (!assign) {
assign = git__calloc(1, sizeof(git_attr_assignment));
- GITERR_CHECK_ALLOC(assign);
+ GIT_ERROR_CHECK_ALLOC(assign);
GIT_REFCOUNT_INC(assign);
}
/* allocate permanent storage for name */
assign->name = git_pool_strndup(pool, name_start, scan - name_start);
- GITERR_CHECK_ALLOC(assign->name);
+ GIT_ERROR_CHECK_ALLOC(assign->name);
/* if there is an equals sign, find the value */
if (*scan == '=') {
/* if we found a value, allocate permanent storage for it */
if (scan > value_start) {
assign->value = git_pool_strndup(pool, value_start, scan - value_start);
- GITERR_CHECK_ALLOC(assign->value);
+ GIT_ERROR_CHECK_ALLOC(assign->value);
}
}
if (!session)
return;
- git_buf_free(&session->sysdir);
- git_buf_free(&session->tmp);
+ git_buf_dispose(&session->sysdir);
+ git_buf_dispose(&session->tmp);
memset(session, 0, sizeof(git_attr_session));
}
GIT_UNUSED(cache); /* avoid warning if threading is off */
if (git_mutex_lock(&cache->lock) < 0) {
- giterr_set(GITERR_OS, "unable to get attr cache lock");
+ git_error_set(GIT_ERROR_OS, "unable to get attr cache lock");
return -1;
}
return 0;
GIT_INLINE(git_attr_file_entry *) attr_cache_lookup_entry(
git_attr_cache *cache, const char *path)
{
- khiter_t pos = git_strmap_lookup_index(cache->files, path);
+ size_t pos = git_strmap_lookup_index(cache->files, path);
if (git_strmap_valid_index(cache->files, pos))
return git_strmap_value_at(cache->files, pos);
}
ce = git_pool_mallocz(pool, (uint32_t)cachesize);
- GITERR_CHECK_ALLOC(ce);
+ GIT_ERROR_CHECK_ALLOC(ce);
if (baselen) {
memcpy(ce->fullpath, base, baselen);
*out_file = file;
*out_entry = entry;
- git_buf_free(&path);
+ git_buf_dispose(&path);
return error;
}
}
/* no error if file simply doesn't exist */
if (error == GIT_ENOTFOUND) {
- giterr_clear();
+ git_error_clear();
error = 0;
}
}
{
git_attr_cache *cache = git_repository_attr_cache(repo);
git_strmap *files;
- khiter_t pos;
+ size_t pos;
git_attr_file_entry *entry;
if (!cache || !(files = cache->files))
}
git_config_entry_free(entry);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return error;
}
return 0;
cache = git__calloc(1, sizeof(git_attr_cache));
- GITERR_CHECK_ALLOC(cache);
+ GIT_ERROR_CHECK_ALLOC(cache);
/* set up lock */
if (git_mutex_init(&cache->lock) < 0) {
- giterr_set(GITERR_OS, "unable to initialize lock for attr cache");
+ git_error_set(GIT_ERROR_OS, "unable to initialize lock for attr cache");
git__free(cache);
return -1;
}
return 0;
if (attr_cache_lock(cache) < 0) {
- giterr_set(GITERR_OS, "unable to get attr cache lock");
+ git_error_set(GIT_ERROR_OS, "unable to get attr cache lock");
error = -1;
} else {
git_strmap_insert(macros, macro->match.pattern, macro, &error);
git_repository *repo, const char *name)
{
git_strmap *macros = git_repository_attr_cache(repo)->macros;
- khiter_t pos;
+ size_t pos;
pos = git_strmap_lookup_index(macros, name);
#include "git2/diff.h"
#include "git2/blob.h"
#include "git2/signature.h"
+#include "git2/mailmap.h"
#include "util.h"
#include "repository.h"
#include "blame_git.h"
git_blame_hunk *a = (git_blame_hunk*)_a,
*b = (git_blame_hunk*)_b;
- return a->final_start_line_number - b->final_start_line_number;
+ if (a->final_start_line_number > b->final_start_line_number)
+ return 1;
+ else if (a->final_start_line_number < b->final_start_line_number)
+ return -1;
+ else
+ return 0;
}
static bool hunk_ends_at_or_before_line(git_blame_hunk *hunk, size_t line)
return NULL;
}
+ if (opts.flags & GIT_BLAME_USE_MAILMAP &&
+ git_mailmap_from_repository(&gbr->mailmap, repo) < 0) {
+ git_blame_free(gbr);
+ return NULL;
+ }
+
return gbr;
}
git_array_clear(blame->line_index);
+ git_mailmap_free(blame->mailmap);
+
git__free(blame->path);
git_blob_free(blame->final_blob);
git__free(blame);
while (len--) {
if (bol) {
i = git_array_alloc(blame->line_index);
- GITERR_CHECK_ALLOC(i);
+ GIT_ERROR_CHECK_ALLOC(i);
*i = buf - blame->final_buf;
bol = 0;
}
}
}
i = git_array_alloc(blame->line_index);
- GITERR_CHECK_ALLOC(i);
+ GIT_ERROR_CHECK_ALLOC(i);
*i = buf - blame->final_buf;
blame->num_lines = num + incomplete;
return blame->num_lines;
}
-static git_blame_hunk* hunk_from_entry(git_blame__entry *e)
+static git_blame_hunk* hunk_from_entry(git_blame__entry *e, git_blame *blame)
{
git_blame_hunk *h = new_hunk(
e->lno+1, e->num_lines, e->s_lno+1, e->suspect->path);
git_oid_cpy(&h->final_commit_id, git_commit_id(e->suspect->commit));
git_oid_cpy(&h->orig_commit_id, git_commit_id(e->suspect->commit));
- git_signature_dup(&h->final_signature, git_commit_author(e->suspect->commit));
- git_signature_dup(&h->orig_signature, git_commit_author(e->suspect->commit));
+ git_commit_author_with_mailmap(
+ &h->final_signature, e->suspect->commit, blame->mailmap);
+ git_signature_dup(&h->orig_signature, h->final_signature);
h->boundary = e->is_boundary ? 1 : 0;
return h;
}
if (error < 0)
goto cleanup;
error = git_object_lookup_bypath((git_object**)&blame->final_blob,
- (git_object*)blame->final, blame->path, GIT_OBJ_BLOB);
+ (git_object*)blame->final, blame->path, GIT_OBJECT_BLOB);
cleanup:
return error;
blame->final_buf_size = git_blob_rawsize(blame->final_blob);
ent = git__calloc(1, sizeof(git_blame__entry));
- GITERR_CHECK_ALLOC(ent);
+ GIT_ERROR_CHECK_ALLOC(ent);
ent->num_lines = index_blob_lines(blame);
ent->lno = blame->options.min_line - 1;
cleanup:
for (ent = blame->ent; ent; ) {
git_blame__entry *e = ent->next;
- git_blame_hunk *h = hunk_from_entry(ent);
+ git_blame_hunk *h = hunk_from_entry(ent, blame);
git_vector_insert(&blame->hunks, h);
goto on_error;
blame = git_blame__alloc(repo, normOptions, path);
- GITERR_CHECK_ALLOC(blame);
+ GIT_ERROR_CHECK_ALLOC(blame);
if ((error = load_blob(blame)) < 0)
goto on_error;
if (!blame->current_hunk) {
/* Line added at the end of the file */
blame->current_hunk = new_hunk(wedge_line, 0, wedge_line, blame->path);
- GITERR_CHECK_ALLOC(blame->current_hunk);
+ GIT_ERROR_CHECK_ALLOC(blame->current_hunk);
git_vector_insert(&blame->hunks, blame->current_hunk);
} else if (!hunk_starts_at_or_after_line(blame->current_hunk, wedge_line)){
/* If this hunk doesn't start between existing hunks, split a hunk up so it does */
blame->current_hunk = split_hunk_in_vector(&blame->hunks, blame->current_hunk,
wedge_line - blame->current_hunk->orig_start_line_number, true);
- GITERR_CHECK_ALLOC(blame->current_hunk);
+ GIT_ERROR_CHECK_ALLOC(blame->current_hunk);
}
return 0;
/* Create a new buffer-blame hunk with this line */
shift_hunks_by(&blame->hunks, blame->current_diff_line, 1);
blame->current_hunk = new_hunk(blame->current_diff_line, 1, 0, blame->path);
- GITERR_CHECK_ALLOC(blame->current_hunk);
+ GIT_ERROR_CHECK_ALLOC(blame->current_hunk);
git_vector_insert_sorted(&blame->hunks, blame->current_hunk, NULL);
}
assert(out && reference && buffer && buffer_len);
blame = git_blame__alloc(reference->repository, reference->options, reference->path);
- GITERR_CHECK_ALLOC(blame);
+ GIT_ERROR_CHECK_ALLOC(blame);
/* Duplicate all of the hunk structures in the reference blame */
git_vector_foreach(&reference->hunks, i, hunk) {
git_blame_hunk *h = dup_hunk(hunk);
- GITERR_CHECK_ALLOC(h);
+ GIT_ERROR_CHECK_ALLOC(h);
git_vector_insert(&blame->hunks, h);
}
struct git_blame {
char *path;
git_repository *repository;
+ git_mailmap *mailmap;
git_blame_options options;
git_vector hunks;
int error = 0;
if ((error = git_object_lookup_bypath(&blob, (git_object*)commit,
- path, GIT_OBJ_BLOB)) < 0)
+ path, GIT_OBJECT_BLOB)) < 0)
return error;
- GITERR_CHECK_ALLOC_ADD(&alloc_len, sizeof(*o), path_len);
- GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, sizeof(*o), path_len);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 1);
o = git__calloc(1, alloc_len);
- GITERR_CHECK_ALLOC(o);
+ GIT_ERROR_CHECK_ALLOC(o);
o->commit = commit;
o->blob = (git_blob *) blob;
}
}
-/*
+/*
* After splitting the blame, the origins used by the on-stack blame_entry
* should lose one refcnt each.
*/
if (file_a.size > GIT_XDIFF_MAX_SIZE ||
file_b.size > GIT_XDIFF_MAX_SIZE) {
- giterr_set(GITERR_INVALID, "file too large to blame");
+ git_error_set(GIT_ERROR_INVALID, "file too large to blame");
return -1;
}
if (!porigin->blob &&
git_object_lookup((git_object**)&porigin->blob, blame->repository,
- git_blob_id(origin->blob), GIT_OBJ_BLOB) < 0)
+ git_blob_id(origin->blob), GIT_OBJECT_BLOB) < 0)
return -1;
for (e=blame->ent; e; e=e->next) {
if (!same_suspect(e->suspect, origin))
memset(sg_buf, 0, sizeof(sg_buf));
else {
sg_origin = git__calloc(num_parents, sizeof(*sg_origin));
- GITERR_CHECK_ALLOC(sg_origin);
+ GIT_ERROR_CHECK_ALLOC(sg_origin);
}
for (i=0; i<num_parents; i++) {
int git_blame__like_git(git_blame *blame, uint32_t opt)
{
+ int error = 0;
+
while (true) {
git_blame__entry *ent;
git_blame__origin *suspect = NULL;
if (!ent->guilty)
suspect = ent->suspect;
if (!suspect)
- return 0; /* all done */
+ break;
/* We'll use this suspect later in the loop, so hold on to it for now. */
origin_incref(suspect);
- if (pass_blame(blame, suspect, opt) < 0)
- return -1;
+ if ((error = pass_blame(blame, suspect, opt)) < 0)
+ break;
/* Take responsibility for the remaining entries */
for (ent = blame->ent; ent; ent = ent->next) {
origin_decref(suspect);
}
- coalesce(blame);
+ if (!error)
+ coalesce(blame);
- return 0;
+ return error;
}
void git_blame__free_entry(git_blame__entry *ent)
const void *git_blob_rawcontent(const git_blob *blob)
{
assert(blob);
- return git_odb_object_data(blob->odb_object);
+ if (blob->raw)
+ return blob->data.raw.data;
+ else
+ return git_odb_object_data(blob->data.odb);
}
git_off_t git_blob_rawsize(const git_blob *blob)
{
assert(blob);
- return (git_off_t)git_odb_object_size(blob->odb_object);
+ if (blob->raw)
+ return blob->data.raw.size;
+ else
+ return (git_off_t)git_odb_object_size(blob->data.odb);
}
int git_blob__getbuf(git_buf *buffer, git_blob *blob)
{
- return git_buf_set(
- buffer,
- git_odb_object_data(blob->odb_object),
- git_odb_object_size(blob->odb_object));
+ git_off_t size = git_blob_rawsize(blob);
+
+ GIT_ERROR_CHECK_BLOBSIZE(size);
+ return git_buf_set(buffer, git_blob_rawcontent(blob), (size_t)size);
}
-void git_blob__free(void *blob)
+void git_blob__free(void *_blob)
{
- git_odb_object_free(((git_blob *)blob)->odb_object);
+ git_blob *blob = (git_blob *) _blob;
+ if (!blob->raw)
+ git_odb_object_free(blob->data.odb);
git__free(blob);
}
-int git_blob__parse(void *blob, git_odb_object *odb_obj)
+int git_blob__parse_raw(void *_blob, const char *data, size_t size)
+{
+ git_blob *blob = (git_blob *) _blob;
+ assert(blob);
+ blob->raw = 1;
+ blob->data.raw.data = data;
+ blob->data.raw.size = size;
+ return 0;
+}
+
+int git_blob__parse(void *_blob, git_odb_object *odb_obj)
{
+ git_blob *blob = (git_blob *) _blob;
assert(blob);
git_cached_obj_incref((git_cached_obj *)odb_obj);
- ((git_blob *)blob)->odb_object = odb_obj;
+ blob->raw = 0;
+ blob->data.odb = odb_obj;
return 0;
}
assert(id && repo);
if ((error = git_repository_odb__weakptr(&odb, repo)) < 0 ||
- (error = git_odb_open_wstream(&stream, odb, len, GIT_OBJ_BLOB)) < 0)
+ (error = git_odb_open_wstream(&stream, odb, len, GIT_OBJECT_BLOB)) < 0)
return error;
if ((error = git_odb_stream_write(stream, buffer, len)) == 0)
git_off_t written = 0;
if ((error = git_odb_open_wstream(
- &stream, odb, file_size, GIT_OBJ_BLOB)) < 0)
+ &stream, odb, file_size, GIT_OBJECT_BLOB)) < 0)
return error;
if ((fd = git_futils_open_ro(path)) < 0) {
p_close(fd);
if (written != file_size || read_len < 0) {
- giterr_set(GITERR_OS, "failed to read file into stream");
+ git_error_set(GIT_ERROR_OS, "failed to read file into stream");
error = -1;
}
if (!error) {
*size = tgt.size;
- error = git_odb_write(id, odb, tgt.ptr, tgt.size, GIT_OBJ_BLOB);
+ error = git_odb_write(id, odb, tgt.ptr, tgt.size, GIT_OBJECT_BLOB);
}
- git_buf_free(&tgt);
+ git_buf_dispose(&tgt);
return error;
}
int error;
link_data = git__malloc(link_size);
- GITERR_CHECK_ALLOC(link_data);
+ GIT_ERROR_CHECK_ALLOC(link_data);
read_len = p_readlink(path, link_data, link_size);
if (read_len != (ssize_t)link_size) {
- giterr_set(GITERR_OS, "failed to create blob: cannot read symlink '%s'", path);
+ git_error_set(GIT_ERROR_OS, "failed to create blob: cannot read symlink '%s'", path);
git__free(link_data);
return -1;
}
- error = git_odb_write(id, odb, (void *)link_data, link_size, GIT_OBJ_BLOB);
+ error = git_odb_write(id, odb, (void *)link_data, link_size, GIT_OBJECT_BLOB);
git__free(link_data);
return error;
}
goto done;
if (S_ISDIR(st.st_mode)) {
- giterr_set(GITERR_ODB, "cannot create blob from '%s': it is a directory", content_path);
+ git_error_set(GIT_ERROR_ODB, "cannot create blob from '%s': it is a directory", content_path);
error = GIT_EDIRECTORY;
goto done;
}
done:
git_odb_free(odb);
- git_buf_free(&path);
+ git_buf_dispose(&path);
return error;
}
const char *workdir, *hintpath;
if ((error = git_path_prettify(&full_path, path, NULL)) < 0) {
- git_buf_free(&full_path);
+ git_buf_dispose(&full_path);
return error;
}
error = git_blob__create_from_paths(
id, NULL, repo, git_buf_cstr(&full_path), hintpath, 0, true);
- git_buf_free(&full_path);
+ git_buf_dispose(&full_path);
return error;
}
assert(out && repo);
stream = git__calloc(1, sizeof(blob_writestream));
- GITERR_CHECK_ALLOC(stream);
+ GIT_ERROR_CHECK_ALLOC(stream);
if (hintpath) {
stream->hintpath = git__strdup(hintpath);
- GITERR_CHECK_ALLOC(stream->hintpath);
+ GIT_ERROR_CHECK_ALLOC(stream->hintpath);
}
stream->repo = repo;
if (error < 0)
blob_writestream_free((git_writestream *) stream);
- git_buf_free(&path);
+ git_buf_dispose(&path);
return error;
}
int git_blob_is_binary(const git_blob *blob)
{
git_buf content = GIT_BUF_INIT;
+ git_off_t size;
assert(blob);
- git_buf_attach_notowned(&content, blob->odb_object->buffer,
- min(blob->odb_object->cached.size,
- GIT_FILTER_BYTES_TO_CHECK_NUL));
+ size = git_blob_rawsize(blob);
+
+ git_buf_attach_notowned(&content, git_blob_rawcontent(blob),
+ (size_t)min(size, GIT_FILTER_BYTES_TO_CHECK_NUL));
return git_buf_text_is_binary(&content);
}
struct git_blob {
git_object object;
- git_odb_object *odb_object;
+
+ union {
+ git_odb_object *odb;
+ struct {
+ const char *data;
+ git_off_t size;
+ } raw;
+ } data;
+ unsigned int raw:1;
};
+#define GIT_ERROR_CHECK_BLOBSIZE(n) \
+ do { \
+ if (!git__is_sizet(n)) { \
+ git_error_set(GIT_ERROR_NOMEMORY, "blob contents too large to fit in memory"); \
+ return -1; \
+ } \
+ } while(0)
+
void git_blob__free(void *blob);
int git_blob__parse(void *blob, git_odb_object *obj);
+int git_blob__parse_raw(void *blob, const char *data, size_t size);
int git_blob__getbuf(git_buf *buffer, git_blob *blob);
extern int git_blob__create_from_paths(
if ((error = git_buf_joinpath(&ref_name, prefix, branch_name)) < 0)
/* OOM */;
else if ((error = git_reference_lookup(&branch, repo, ref_name.ptr)) < 0)
- giterr_set(
- GITERR_REFERENCE, "cannot locate %s branch '%s'",
+ git_error_set(
+ GIT_ERROR_REFERENCE, "cannot locate %s branch '%s'",
is_remote ? "remote-tracking" : "local", branch_name);
*branch_reference_out = branch; /* will be NULL on error */
- git_buf_free(&ref_name);
+ git_buf_dispose(&ref_name);
return error;
}
static int not_a_local_branch(const char *reference_name)
{
- giterr_set(
- GITERR_INVALID,
+ git_error_set(
+ GIT_ERROR_INVALID,
"reference '%s' is not a local branch.", reference_name);
return -1;
}
assert(git_object_owner((const git_object *)commit) == repository);
if (!git__strcmp(branch_name, "HEAD")) {
- giterr_set(GITERR_REFERENCE, "'HEAD' is not a valid branch name");
+ git_error_set(GIT_ERROR_REFERENCE, "'HEAD' is not a valid branch name");
error = -1;
goto cleanup;
}
}
if (is_unmovable_head && force) {
- giterr_set(GITERR_REFERENCE, "cannot force update branch '%s' as it is "
+ git_error_set(GIT_ERROR_REFERENCE, "cannot force update branch '%s' as it is "
"the current HEAD of the repository.", branch_name);
error = -1;
goto cleanup;
*ref_out = branch;
cleanup:
- git_buf_free(&canonical_branch_name);
- git_buf_free(&log_message);
+ git_buf_dispose(&canonical_branch_name);
+ git_buf_dispose(&log_message);
return error;
}
int equal = 0;
if (git_reference__read_head(&head, repo, path) < 0 ||
- git_reference_type(head) != GIT_REF_SYMBOLIC)
+ git_reference_type(head) != GIT_REFERENCE_SYMBOLIC)
goto done;
equal = !git__strcmp(head->target.symbolic, branch->name);
assert(branch);
if (!git_reference_is_branch(branch) && !git_reference_is_remote(branch)) {
- giterr_set(GITERR_INVALID, "reference '%s' is not a valid branch.",
+ git_error_set(GIT_ERROR_INVALID, "reference '%s' is not a valid branch.",
git_reference_name(branch));
return GIT_ENOTFOUND;
}
return is_head;
if (is_head) {
- giterr_set(GITERR_REFERENCE, "cannot delete branch '%s' as it is "
+ git_error_set(GIT_ERROR_REFERENCE, "cannot delete branch '%s' as it is "
"the current HEAD of the repository.", git_reference_name(branch));
return -1;
}
if (git_reference_is_branch(branch) && git_branch_is_checked_out(branch)) {
- giterr_set(GITERR_REFERENCE, "Cannot delete branch '%s' as it is "
+ git_error_set(GIT_ERROR_REFERENCE, "Cannot delete branch '%s' as it is "
"the current HEAD of a linked repository.", git_reference_name(branch));
return -1;
}
error = git_reference_delete(branch);
on_error:
- git_buf_free(&config_section);
+ git_buf_dispose(&config_section);
return error;
}
branch_iter *iter;
iter = git__calloc(1, sizeof(branch_iter));
- GITERR_CHECK_ALLOC(iter);
+ GIT_ERROR_CHECK_ALLOC(iter);
iter->flags = list_flags;
git_buf_cstr(&new_config_section));
done:
- git_buf_free(&new_reference_name);
- git_buf_free(&old_config_section);
- git_buf_free(&new_config_section);
- git_buf_free(&log_message);
+ git_buf_dispose(&new_reference_name);
+ git_buf_dispose(&old_config_section);
+ git_buf_dispose(&new_config_section);
+ git_buf_dispose(&log_message);
return error;
}
} else if (git_reference_is_remote(ref)) {
branch_name += strlen(GIT_REFS_REMOTES_DIR);
} else {
- giterr_set(GITERR_INVALID,
+ git_error_set(GIT_ERROR_INVALID,
"reference '%s' is neither a local nor a remote branch.", ref->name);
return -1;
}
return -1;
error = git_config_get_string_buf(out, config, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return error;
}
goto cleanup;
if (git_buf_len(&remote_name) == 0 || git_buf_len(&merge_name) == 0) {
- giterr_set(GITERR_REFERENCE,
+ git_error_set(GIT_ERROR_REFERENCE,
"branch '%s' does not have an upstream", refname);
error = GIT_ENOTFOUND;
goto cleanup;
cleanup:
git_config_free(config);
git_remote_free(remote);
- git_buf_free(&remote_name);
- git_buf_free(&merge_name);
- git_buf_free(&buf);
+ git_buf_dispose(&remote_name);
+ git_buf_dispose(&merge_name);
+ git_buf_dispose(&buf);
return error;
}
return error;
if (git_buf_len(buf) == 0) {
- giterr_set(GITERR_REFERENCE, "branch '%s' does not have an upstream remote", refname);
+ git_error_set(GIT_ERROR_REFERENCE, "branch '%s' does not have an upstream remote", refname);
error = GIT_ENOTFOUND;
git_buf_clear(buf);
}
/* Verify that this is a remote branch */
if (!git_reference__is_remote(refname)) {
- giterr_set(GITERR_INVALID, "reference '%s' is not a remote branch.",
+ git_error_set(GIT_ERROR_INVALID, "reference '%s' is not a remote branch.",
refname);
error = GIT_ERROR;
goto cleanup;
} else {
git_remote_free(remote);
- giterr_set(GITERR_REFERENCE,
+ git_error_set(GIT_ERROR_REFERENCE,
"reference '%s' is ambiguous", refname);
error = GIT_EAMBIGUOUS;
goto cleanup;
git_buf_clear(buf);
error = git_buf_puts(buf, remote_name);
} else {
- giterr_set(GITERR_REFERENCE,
+ git_error_set(GIT_ERROR_REFERENCE,
"could not determine remote for '%s'", refname);
error = GIT_ENOTFOUND;
}
cleanup:
if (error < 0)
- git_buf_free(buf);
+ git_buf_dispose(buf);
git_strarray_free(&remote_list);
return error;
git_reference_owner(branch),
git_buf_cstr(&tracking_name));
- git_buf_free(&tracking_name);
+ git_buf_dispose(&tracking_name);
return error;
}
if (git_config_delete_entry(config, git_buf_cstr(&buf)) < 0)
goto on_error;
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return 0;
on_error:
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return -1;
}
else if (git_branch_lookup(&upstream, repo, upstream_name, GIT_BRANCH_REMOTE) == 0)
local = 0;
else {
- giterr_set(GITERR_REFERENCE,
+ git_error_set(GIT_ERROR_REFERENCE,
"cannot set upstream for branch '%s'", shortname);
return GIT_ENOTFOUND;
}
goto on_error;
git_reference_free(upstream);
- git_buf_free(&key);
- git_buf_free(&value);
+ git_buf_dispose(&key);
+ git_buf_dispose(&value);
return 0;
on_error:
git_reference_free(upstream);
- git_buf_free(&key);
- git_buf_free(&value);
+ git_buf_dispose(&key);
+ git_buf_dispose(&value);
git_remote_free(remote);
return -1;
scan += count;
}
- GITERR_CHECK_ALLOC_ADD(&alloclen, total, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, total, 1);
if (git_buf_grow_by(buf, alloclen) < 0)
return -1;
return git_buf_set(tgt, src->ptr, src->size);
/* reduce reallocs while in the loop */
- GITERR_CHECK_ALLOC_ADD(&new_size, src->size, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&new_size, src->size, 1);
if (git_buf_grow(tgt, new_size) < 0)
return -1;
return git_buf_set(tgt, src->ptr, src->size);
/* attempt to reduce reallocs while in the loop */
- GITERR_CHECK_ALLOC_ADD(&alloclen, src->size, src->size >> 4);
- GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, src->size, src->size >> 4);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1);
if (git_buf_grow(tgt, alloclen) < 0)
return -1;
tgt->size = 0;
if (copylen && next[-1] == '\r')
copylen--;
- GITERR_CHECK_ALLOC_ADD(&alloclen, copylen, 3);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, copylen, 3);
if (git_buf_grow_by(tgt, alloclen) < 0)
return -1;
}
}
- return (stats->nul > 0 ||
+ /* Treat files with a bare CR as binary */
+ return (stats->cr != stats->crlf || stats->nul > 0 ||
((stats->printable >> 7) < stats->nonprintable));
}
return -1;
if (buf->asize == 0 && buf->size != 0) {
- giterr_set(GITERR_INVALID, "cannot grow a borrowed buffer");
+ git_error_set(GIT_ERROR_INVALID, "cannot grow a borrowed buffer");
return GIT_EINVALID;
}
if (mark_oom)
buf->ptr = git_buf__oom;
- giterr_set_oom();
+ git_error_set_oom();
return -1;
}
return git_buf_try_grow(buffer, newsize, true);
}
-void git_buf_free(git_buf *buf)
+void git_buf_dispose(git_buf *buf)
{
if (!buf) return;
git_buf_init(buf, 0);
}
+void git_buf_free(git_buf *buf)
+{
+ git_buf_dispose(buf);
+}
+
void git_buf_sanitize(git_buf *buf)
{
if (buf->ptr == NULL) {
git_buf_clear(buf);
} else {
if (data != buf->ptr) {
- GITERR_CHECK_ALLOC_ADD(&alloclen, len, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, len, 1);
ENSURE_SIZE(buf, alloclen);
memmove(buf->ptr, data, len);
}
int git_buf_putc(git_buf *buf, char c)
{
size_t new_size;
- GITERR_CHECK_ALLOC_ADD(&new_size, buf->size, 2);
+ GIT_ERROR_CHECK_ALLOC_ADD(&new_size, buf->size, 2);
ENSURE_SIZE(buf, new_size);
buf->ptr[buf->size++] = c;
buf->ptr[buf->size] = '\0';
int git_buf_putcn(git_buf *buf, char c, size_t len)
{
size_t new_size;
- GITERR_CHECK_ALLOC_ADD(&new_size, buf->size, len);
- GITERR_CHECK_ALLOC_ADD(&new_size, new_size, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&new_size, buf->size, len);
+ GIT_ERROR_CHECK_ALLOC_ADD(&new_size, new_size, 1);
ENSURE_SIZE(buf, new_size);
memset(buf->ptr + buf->size, c, len);
buf->size += len;
assert(data);
- GITERR_CHECK_ALLOC_ADD(&new_size, buf->size, len);
- GITERR_CHECK_ALLOC_ADD(&new_size, new_size, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&new_size, buf->size, len);
+ GIT_ERROR_CHECK_ALLOC_ADD(&new_size, new_size, 1);
ENSURE_SIZE(buf, new_size);
memmove(buf->ptr + buf->size, data, len);
buf->size += len;
const uint8_t *read = (const uint8_t *)data;
size_t blocks = (len / 3) + !!extra, alloclen;
- GITERR_CHECK_ALLOC_ADD(&blocks, blocks, 1);
- GITERR_CHECK_ALLOC_MULTIPLY(&alloclen, blocks, 4);
- GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, buf->size);
+ GIT_ERROR_CHECK_ALLOC_ADD(&blocks, blocks, 1);
+ GIT_ERROR_CHECK_ALLOC_MULTIPLY(&alloclen, blocks, 4);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, alloclen, buf->size);
ENSURE_SIZE(buf, alloclen);
write = (uint8_t *)&buf->ptr[buf->size];
size_t orig_size = buf->size, new_size;
if (len % 4) {
- giterr_set(GITERR_INVALID, "invalid base64 input");
+ git_error_set(GIT_ERROR_INVALID, "invalid base64 input");
return -1;
}
assert(len % 4 == 0);
- GITERR_CHECK_ALLOC_ADD(&new_size, (len / 4 * 3), buf->size);
- GITERR_CHECK_ALLOC_ADD(&new_size, new_size, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&new_size, (len / 4 * 3), buf->size);
+ GIT_ERROR_CHECK_ALLOC_ADD(&new_size, new_size, 1);
ENSURE_SIZE(buf, new_size);
for (i = 0; i < len; i += 4) {
buf->size = orig_size;
buf->ptr[buf->size] = '\0';
- giterr_set(GITERR_INVALID, "invalid base64 input");
+ git_error_set(GIT_ERROR_INVALID, "invalid base64 input");
return -1;
}
{
size_t blocks = (len / 4) + !!(len % 4), alloclen;
- GITERR_CHECK_ALLOC_MULTIPLY(&alloclen, blocks, 5);
- GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, buf->size);
- GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1);
+ GIT_ERROR_CHECK_ALLOC_MULTIPLY(&alloclen, blocks, 5);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, alloclen, buf->size);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1);
ENSURE_SIZE(buf, alloclen);
if (base85_len % 5 ||
output_len > base85_len * 4 / 5) {
- giterr_set(GITERR_INVALID, "invalid base85 input");
+ git_error_set(GIT_ERROR_INVALID, "invalid base85 input");
return -1;
}
- GITERR_CHECK_ALLOC_ADD(&new_size, output_len, buf->size);
- GITERR_CHECK_ALLOC_ADD(&new_size, new_size, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&new_size, output_len, buf->size);
+ GIT_ERROR_CHECK_ALLOC_ADD(&new_size, new_size, 1);
ENSURE_SIZE(buf, new_size);
while (output_len) {
acc += de;
- cnt = (output_len < 4) ? output_len : 4;
+ cnt = (output_len < 4) ? (int)output_len : 4;
output_len -= cnt;
do {
acc = (acc << 8) | (acc >> 24);
buf->size = orig_size;
buf->ptr[buf->size] = '\0';
- giterr_set(GITERR_INVALID, "invalid base85 input");
+ git_error_set(GIT_ERROR_INVALID, "invalid base85 input");
return -1;
}
{
size_t str_pos, new_size;
- GITERR_CHECK_ALLOC_ADD(&new_size, buf->size, str_len);
- GITERR_CHECK_ALLOC_ADD(&new_size, new_size, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&new_size, buf->size, str_len);
+ GIT_ERROR_CHECK_ALLOC_ADD(&new_size, new_size, 1);
ENSURE_SIZE(buf, new_size);
for (str_pos = 0; str_pos < str_len; buf->size++, str_pos++) {
size_t expected_size, new_size;
int len;
- GITERR_CHECK_ALLOC_MULTIPLY(&expected_size, strlen(format), 2);
- GITERR_CHECK_ALLOC_ADD(&expected_size, expected_size, buf->size);
+ GIT_ERROR_CHECK_ALLOC_MULTIPLY(&expected_size, strlen(format), 2);
+ GIT_ERROR_CHECK_ALLOC_ADD(&expected_size, expected_size, buf->size);
ENSURE_SIZE(buf, expected_size);
while (1) {
break;
}
- GITERR_CHECK_ALLOC_ADD(&new_size, buf->size, len);
- GITERR_CHECK_ALLOC_ADD(&new_size, new_size, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&new_size, buf->size, len);
+ GIT_ERROR_CHECK_ALLOC_ADD(&new_size, new_size, 1);
ENSURE_SIZE(buf, new_size);
}
int git_buf_attach(git_buf *buf, char *ptr, size_t asize)
{
- git_buf_free(buf);
+ git_buf_dispose(buf);
if (ptr) {
buf->ptr = ptr;
void git_buf_attach_notowned(git_buf *buf, const char *ptr, size_t size)
{
if (git_buf_is_allocated(buf))
- git_buf_free(buf);
+ git_buf_dispose(buf);
if (!size) {
git_buf_init(buf, 0);
segment_len = strlen(segment);
- GITERR_CHECK_ALLOC_ADD(&total_size, total_size, segment_len);
+ GIT_ERROR_CHECK_ALLOC_ADD(&total_size, total_size, segment_len);
if (segment_len == 0 || segment[segment_len - 1] != separator)
- GITERR_CHECK_ALLOC_ADD(&total_size, total_size, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&total_size, total_size, 1);
}
va_end(ap);
if (total_size == 0)
return 0;
- GITERR_CHECK_ALLOC_ADD(&total_size, total_size, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&total_size, total_size, 1);
if (git_buf_grow_by(buf, total_size) < 0)
return -1;
if (str_a >= buf->ptr && str_a < buf->ptr + buf->size)
offset_a = str_a - buf->ptr;
- GITERR_CHECK_ALLOC_ADD(&alloc_len, strlen_a, strlen_b);
- GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, need_sep);
- GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, strlen_a, strlen_b);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, need_sep);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 1);
ENSURE_SIZE(buf, alloc_len);
/* fix up internal pointers */
sep_b = (str_b[len_b - 1] != separator);
}
- GITERR_CHECK_ALLOC_ADD(&len_total, len_a, sep_a);
- GITERR_CHECK_ALLOC_ADD(&len_total, len_total, len_b);
- GITERR_CHECK_ALLOC_ADD(&len_total, len_total, sep_b);
- GITERR_CHECK_ALLOC_ADD(&len_total, len_total, len_c);
- GITERR_CHECK_ALLOC_ADD(&len_total, len_total, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&len_total, len_a, sep_a);
+ GIT_ERROR_CHECK_ALLOC_ADD(&len_total, len_total, len_b);
+ GIT_ERROR_CHECK_ALLOC_ADD(&len_total, len_total, sep_b);
+ GIT_ERROR_CHECK_ALLOC_ADD(&len_total, len_total, len_c);
+ GIT_ERROR_CHECK_ALLOC_ADD(&len_total, len_total, 1);
ENSURE_SIZE(buf, len_total);
tgt = buf->ptr;
/* Ported from git.git
* https://github.com/git/git/blob/16eed7c/strbuf.c#L159-176
*/
- GITERR_CHECK_ALLOC_ADD(&new_size, (buf->size - nb_to_remove), nb_to_insert);
- GITERR_CHECK_ALLOC_ADD(&alloc_size, new_size, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&new_size, (buf->size - nb_to_remove), nb_to_insert);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_size, new_size, 1);
ENSURE_SIZE(buf, alloc_size);
memmove(splice_loc + nb_to_insert,
git_buf_swap("ed, buf);
done:
- git_buf_free("ed);
+ git_buf_dispose("ed);
return error;
}
/* \xyz digits convert to the char*/
case '0': case '1': case '2': case '3':
if (j == buf->size-3) {
- giterr_set(GITERR_INVALID,
+ git_error_set(GIT_ERROR_INVALID,
"truncated quoted character \\%c", ch);
return -1;
}
if (buf->ptr[j+1] < '0' || buf->ptr[j+1] > '7' ||
buf->ptr[j+2] < '0' || buf->ptr[j+2] > '7') {
- giterr_set(GITERR_INVALID,
+ git_error_set(GIT_ERROR_INVALID,
"truncated quoted character \\%c%c%c",
buf->ptr[j], buf->ptr[j+1], buf->ptr[j+2]);
return -1;
break;
default:
- giterr_set(GITERR_INVALID, "invalid quoted character \\%c", ch);
+ git_error_set(GIT_ERROR_INVALID, "invalid quoted character \\%c", ch);
return -1;
}
}
return 0;
invalid:
- giterr_set(GITERR_INVALID, "invalid quoted line");
+ git_error_set(GIT_ERROR_INVALID, "invalid quoted line");
return -1;
}
extern int git_buf_attach(git_buf *buf, char *ptr, size_t asize);
/* Populates a `git_buf` where the contents are not "owned" by the
- * buffer, and calls to `git_buf_free` will not free the given buf.
+ * buffer, and calls to `git_buf_dispose` will not free the given buf.
*/
extern void git_buf_attach_notowned(
git_buf *buf, const char *ptr, size_t size);
git_atomic_ssize git_cache__current_storage = {0};
static size_t git_cache__max_object_size[8] = {
- 0, /* GIT_OBJ__EXT1 */
- 4096, /* GIT_OBJ_COMMIT */
- 4096, /* GIT_OBJ_TREE */
- 0, /* GIT_OBJ_BLOB */
- 4096, /* GIT_OBJ_TAG */
- 0, /* GIT_OBJ__EXT2 */
- 0, /* GIT_OBJ_OFS_DELTA */
- 0 /* GIT_OBJ_REF_DELTA */
+ 0, /* GIT_OBJECT__EXT1 */
+ 4096, /* GIT_OBJECT_COMMIT */
+ 4096, /* GIT_OBJECT_TREE */
+ 0, /* GIT_OBJECT_BLOB */
+ 4096, /* GIT_OBJECT_TAG */
+ 0, /* GIT_OBJECT__EXT2 */
+ 0, /* GIT_OBJECT_OFS_DELTA */
+ 0 /* GIT_OBJECT_REF_DELTA */
};
-int git_cache_set_max_object_size(git_otype type, size_t size)
+int git_cache_set_max_object_size(git_object_t type, size_t size)
{
if (type < 0 || (size_t)type >= ARRAY_SIZE(git_cache__max_object_size)) {
- giterr_set(GITERR_INVALID, "type out of range");
+ git_error_set(GIT_ERROR_INVALID, "type out of range");
return -1;
}
{
memset(cache, 0, sizeof(*cache));
cache->map = git_oidmap_alloc();
- GITERR_CHECK_ALLOC(cache->map);
+ GIT_ERROR_CHECK_ALLOC(cache->map);
if (git_rwlock_init(&cache->lock)) {
- giterr_set(GITERR_OS, "failed to initialize cache rwlock");
+ git_error_set(GIT_ERROR_OS, "failed to initialize cache rwlock");
return -1;
}
return 0;
}
while (evict_count > 0) {
- khiter_t pos = seed++ % git_oidmap_end(cache->map);
+ size_t pos = seed++ % git_oidmap_end(cache->map);
if (git_oidmap_has_data(cache->map, pos)) {
git_cached_obj *evict = git_oidmap_value_at(cache->map, pos);
git_atomic_ssize_add(&git_cache__current_storage, -evicted_memory);
}
-static bool cache_should_store(git_otype object_type, size_t object_size)
+static bool cache_should_store(git_object_t object_type, size_t object_size)
{
size_t max_size = git_cache__max_object_size[object_type];
return git_cache__enabled && object_size < max_size;
static void *cache_get(git_cache *cache, const git_oid *oid, unsigned int flags)
{
- khiter_t pos;
+ size_t pos;
git_cached_obj *entry = NULL;
if (!git_cache__enabled || git_rwlock_rdlock(&cache->lock) < 0)
static void *cache_store(git_cache *cache, git_cached_obj *entry)
{
- khiter_t pos;
+ size_t pos;
git_cached_obj_incref(entry);
typedef struct {
git_oid oid;
- int16_t type; /* git_otype value */
+ int16_t type; /* git_object_t value */
uint16_t flags; /* GIT_CACHE_STORE value */
size_t size;
git_atomic refcount;
extern ssize_t git_cache__max_storage;
extern git_atomic_ssize git_cache__current_storage;
-int git_cache_set_max_object_size(git_otype type, size_t size);
+int git_cache_set_max_object_size(git_object_t type, size_t size);
int git_cache_init(git_cache *cache);
void git_cache_free(git_cache *cache);
/* Define the printf format specifer to use for size_t output */
#if defined(_MSC_VER) || defined(__MINGW32__)
-# define PRIuZ "Iu"
-# define PRIxZ "Ix"
-# define PRIdZ "Id"
+
+/* The first block is needed to avoid warnings on MingW amd64 */
+# if (SIZE_MAX == ULLONG_MAX)
+# define PRIuZ "I64u"
+# define PRIxZ "I64x"
+# define PRIXZ "I64X"
+# define PRIdZ "I64d"
+# else
+# define PRIuZ "Iu"
+# define PRIxZ "Ix"
+# define PRIXZ "IX"
+# define PRIdZ "Id"
+# endif
+
#else
# define PRIuZ "zu"
# define PRIxZ "zx"
+# define PRIXZ "zX"
# define PRIdZ "zd"
#endif
int error = data->opts.notify_cb(
why, path, baseline, target, workdir, data->opts.notify_payload);
- return giterr_set_after_callback_function(
+ return git_error_set_after_callback_function(
error, "git_checkout notification");
}
}
bool rval = false;
if (git_submodule_lookup(&sm, data->repo, wditem->path) < 0) {
- giterr_clear();
+ git_error_clear();
return true;
}
static int checkout_queue_remove(checkout_data *data, const char *path)
{
char *copy = git_pool_strdup(&data->pool, path);
- GITERR_CHECK_ALLOC(copy);
+ GIT_ERROR_CHECK_ALLOC(copy);
return git_vector_insert(&data->removes, copy);
}
switch (delta->status) {
case GIT_DELTA_UNMODIFIED: /* case 14/15 or 33 */
if (checkout_is_workdir_modified(data, &delta->old_file, &delta->new_file, wd)) {
- GITERR_CHECK_ERROR(
+ GIT_ERROR_CHECK_ERROR(
checkout_notify(data, GIT_CHECKOUT_NOTIFY_DIRTY, delta, wd) );
*action = CHECKOUT_ACTION_IF(FORCE, UPDATE_BLOB, NONE);
}
switch (delta->status) {
case GIT_DELTA_UNMODIFIED:
/* should show delta as dirty / deleted */
- GITERR_CHECK_ERROR(
+ GIT_ERROR_CHECK_ERROR(
checkout_notify(data, GIT_CHECKOUT_NOTIFY_DIRTY, delta, wd) );
*action = CHECKOUT_ACTION_IF(FORCE, REMOVE_AND_UPDATE, NONE);
break;
switch (delta->status) {
case GIT_DELTA_UNMODIFIED: /* case 19 or 24 (or 34 but not really) */
- GITERR_CHECK_ERROR(
+ GIT_ERROR_CHECK_ERROR(
checkout_notify(data, GIT_CHECKOUT_NOTIFY_DIRTY, delta, NULL));
- GITERR_CHECK_ERROR(
+ GIT_ERROR_CHECK_ERROR(
checkout_notify(data, GIT_CHECKOUT_NOTIFY_UNTRACKED, NULL, wd));
*action = CHECKOUT_ACTION_IF(FORCE, REMOVE_AND_UPDATE, NONE);
break;
break;
case GIT_DELTA_DELETED: /* case 11 (and 27 for dir) */
if (delta->old_file.mode != GIT_FILEMODE_TREE)
- GITERR_CHECK_ERROR(
+ GIT_ERROR_CHECK_ERROR(
checkout_notify(data, GIT_CHECKOUT_NOTIFY_UNTRACKED, NULL, wd));
break;
case GIT_DELTA_TYPECHANGE: /* case 24 or 31 */
int error;
conflict = git__calloc(1, sizeof(checkout_conflictdata));
- GITERR_CHECK_ALLOC(conflict);
+ GIT_ERROR_CHECK_ALLOC(conflict);
conflict->ancestor = ancestor;
conflict->ours = ours;
*theirs_out = NULL;
if (!name_entry->ancestor) {
- giterr_set(GITERR_INDEX, "a NAME entry exists without an ancestor");
+ git_error_set(GIT_ERROR_INDEX, "a NAME entry exists without an ancestor");
error = -1;
goto done;
}
if (!name_entry->ours && !name_entry->theirs) {
- giterr_set(GITERR_INDEX, "a NAME entry exists without an ours or theirs");
+ git_error_set(GIT_ERROR_INDEX, "a NAME entry exists without an ours or theirs");
error = -1;
goto done;
}
if ((ancestor = checkout_conflicts_search_ancestor(data,
name_entry->ancestor)) == NULL) {
- giterr_set(GITERR_INDEX,
+ git_error_set(GIT_ERROR_INDEX,
"a NAME entry referenced ancestor entry '%s' which does not exist in the main index",
name_entry->ancestor);
error = -1;
ours = ancestor;
else if ((ours = checkout_conflicts_search_branch(data, name_entry->ours)) == NULL ||
ours->ours == NULL) {
- giterr_set(GITERR_INDEX,
+ git_error_set(GIT_ERROR_INDEX,
"a NAME entry referenced our entry '%s' which does not exist in the main index",
name_entry->ours);
error = -1;
theirs = ours;
else if ((theirs = checkout_conflicts_search_branch(data, name_entry->theirs)) == NULL ||
theirs->theirs == NULL) {
- giterr_set(GITERR_INDEX,
+ git_error_set(GIT_ERROR_INDEX,
"a NAME entry referenced their entry '%s' which does not exist in the main index",
name_entry->theirs);
error = -1;
if ((error = git_index_find(&j, index, path)) < 0) {
if (error == GIT_ENOTFOUND)
- giterr_set(GITERR_INDEX,
+ git_error_set(GIT_ERROR_INDEX,
"index inconsistency, could not find entry for expected conflict '%s'", path);
goto done;
for (; j < len; j++) {
if ((entry = git_index_get_byindex(index, j)) == NULL) {
- giterr_set(GITERR_INDEX,
+ git_error_set(GIT_ERROR_INDEX,
"index inconsistency, truncated index while loading expected conflict '%s'", path);
error = -1;
goto done;
else
abort();
- GITERR_CHECK_ALLOC(name);
+ GIT_ERROR_CHECK_ALLOC(name);
return git_vector_insert(&data->remove_conflicts, (char *)name);
}
if (action & CHECKOUT_ACTION__REMOVE) {
if (!git_path_isvalid(repo, delta->old_file.path, delta->old_file.mode, flags)) {
- giterr_set(GITERR_CHECKOUT, "cannot remove invalid path '%s'", delta->old_file.path);
+ git_error_set(GIT_ERROR_CHECKOUT, "cannot remove invalid path '%s'", delta->old_file.path);
return -1;
}
}
if (action & ~CHECKOUT_ACTION__REMOVE) {
if (!git_path_isvalid(repo, delta->new_file.path, delta->new_file.mode, flags)) {
- giterr_set(GITERR_CHECKOUT, "cannot checkout to invalid path '%s'", delta->new_file.path);
+ git_error_set(GIT_ERROR_CHECKOUT, "cannot checkout to invalid path '%s'", delta->new_file.path);
return -1;
}
}
if (counts[CHECKOUT_ACTION__CONFLICT] > 0 &&
(data->strategy & GIT_CHECKOUT_ALLOW_CONFLICTS) == 0)
{
- giterr_set(GITERR_CHECKOUT, "%"PRIuZ" %s checkout",
+ git_error_set(GIT_ERROR_CHECKOUT, "%"PRIuZ" %s checkout",
counts[CHECKOUT_ACTION__CONFLICT],
counts[CHECKOUT_ACTION__CONFLICT] == 1 ?
"conflict prevents" : "conflicts prevent");
*/
error = git_futils_rmdir_r(path, NULL, GIT_RMDIR_REMOVE_FILES);
} else if (errno != ENOENT) {
- giterr_set(GITERR_OS, "failed to stat '%s'", path);
+ git_error_set(GIT_ERROR_OS, "failed to stat '%s'", path);
return GIT_EEXISTS;
} else {
- giterr_clear();
+ git_error_clear();
}
}
int ret;
if ((ret = p_write(stream->fd, buffer, len)) < 0)
- giterr_set(GITERR_OS, "could not write to '%s'", stream->path);
+ git_error_set(GIT_ERROR_OS, "could not write to '%s'", stream->path);
return ret;
}
mode = GIT_FILEMODE_BLOB;
if ((fd = p_open(path, flags, mode)) < 0) {
- giterr_set(GITERR_OS, "could not open '%s' for writing", path);
+ git_error_set(GIT_ERROR_OS, "could not open '%s' for writing", path);
return fd;
}
data->perfdata.stat_calls++;
if ((error = p_stat(path, st)) < 0) {
- giterr_set(GITERR_OS, "failed to stat '%s'", path);
+ git_error_set(GIT_ERROR_OS, "failed to stat '%s'", path);
return error;
}
if (data->can_symlink) {
if ((error = p_symlink(git_buf_cstr(&linktarget), path)) < 0)
- giterr_set(GITERR_OS, "could not create symlink %s", path);
+ git_error_set(GIT_ERROR_OS, "could not create symlink %s", path);
} else {
error = git_futils_fake_symlink(git_buf_cstr(&linktarget), path);
}
data->perfdata.stat_calls++;
if ((error = p_lstat(path, st)) < 0)
- giterr_set(GITERR_CHECKOUT, "could not stat symlink %s", path);
+ git_error_set(GIT_ERROR_CHECKOUT, "could not stat symlink %s", path);
st->st_mode = GIT_FILEMODE_LINK;
}
- git_buf_free(&linktarget);
+ git_buf_dispose(&linktarget);
return error;
}
data->perfdata.stat_calls++;
if (p_stat(fullpath->ptr, &st) < 0) {
- giterr_set(
- GITERR_CHECKOUT, "could not stat submodule %s\n", file->path);
+ git_error_set(
+ GIT_ERROR_CHECKOUT, "could not stat submodule %s\n", file->path);
return GIT_ENOTFOUND;
}
* have a .gitmodules - core Git just makes an empty directory
*/
if (error == GIT_ENOTFOUND) {
- giterr_clear();
+ git_error_clear();
return checkout_submodule_update_index(data, file);
}
return 0;
/* otherwise, stat error and no update */
- giterr_set(GITERR_OS, "failed to stat '%s'", path);
+ git_error_set(GIT_ERROR_OS, "failed to stat '%s'", path);
return -1;
}
if ((data->strategy & GIT_CHECKOUT_ALLOW_CONFLICTS) != 0 &&
(error == GIT_ENOTFOUND || error == GIT_EEXISTS))
{
- giterr_clear();
+ git_error_clear();
error = 0;
}
if (error == GIT_ENOTFOUND) {
error = 0;
- giterr_clear();
+ git_error_clear();
}
return error;
git_object *head;
if (!(error = git_repository_head(&ref, repo)) &&
- !(error = git_reference_peel(&head, ref, GIT_OBJ_TREE)))
+ !(error = git_reference_peel(&head, ref, GIT_OBJECT_TREE)))
*out = (git_tree *)head;
git_reference_free(ref);
if (i == INT_MAX) {
git_buf_truncate(path, path_len);
- giterr_set(GITERR_CHECKOUT, "could not write '%s': working directory file exists", path->ptr);
+ git_error_set(GIT_ERROR_CHECKOUT, "could not write '%s': working directory file exists", path->ptr);
return GIT_EEXISTS;
}
goto done;
if (result.path == NULL || result.mode == 0) {
- giterr_set(GITERR_CHECKOUT, "could not merge contents of file");
+ git_error_set(GIT_ERROR_CHECKOUT, "could not merge contents of file");
error = GIT_ECONFLICT;
goto done;
}
done:
git_filter_list_free(fl);
- git_buf_free(&out_data);
- git_buf_free(&our_label);
- git_buf_free(&their_label);
+ git_buf_dispose(&out_data);
+ git_buf_dispose(&our_label);
+ git_buf_dispose(&their_label);
git_merge_file_result_free(&result);
- git_buf_free(&path_workdir);
- git_buf_free(&path_suffixed);
+ git_buf_dispose(&path_workdir);
+ git_buf_dispose(&path_suffixed);
return error;
}
int error = git_index_remove(data->index, conflict->path, 0);
if (error == GIT_ENOTFOUND)
- giterr_clear();
+ git_error_clear();
else if (error < 0)
return error;
git__free(data->pfx);
data->pfx = NULL;
- git_buf_free(&data->target_path);
- git_buf_free(&data->tmp);
+ git_buf_dispose(&data->target_path);
+ git_buf_dispose(&data->tmp);
git_index_free(data->index);
data->index = NULL;
memset(data, 0, sizeof(*data));
if (!repo) {
- giterr_set(GITERR_CHECKOUT, "cannot checkout nothing");
+ git_error_set(GIT_ERROR_CHECKOUT, "cannot checkout nothing");
return -1;
}
data->repo = repo;
data->target = target;
- GITERR_CHECK_VERSION(
+ GIT_ERROR_CHECK_VERSION(
proposed, GIT_CHECKOUT_OPTIONS_VERSION, "git_checkout_options");
if (!proposed)
GIT_DIR_MODE, GIT_MKDIR_VERIFY_DIR)) < 0)
goto cleanup;
+ if ((error = git_repository_index(&data->index, data->repo)) < 0)
+ goto cleanup;
+
/* refresh config and index content unless NO_REFRESH is given */
if ((data->opts.checkout_strategy & GIT_CHECKOUT_NO_REFRESH) == 0) {
git_config *cfg;
if ((error = git_repository_config__weakptr(&cfg, repo)) < 0)
goto cleanup;
- /* Get the repository index and reload it (unless we're checking
- * out the index; then it has the changes we're trying to check
- * out and those should not be overwritten.)
+ /* Reload the repository index (unless we're checking out the
+ * index; then it has the changes we're trying to check out
+ * and those should not be overwritten.)
*/
- if ((error = git_repository_index(&data->index, data->repo)) < 0)
- goto cleanup;
-
if (data->index != git_iterator_index(target)) {
- if ((error = git_index_read(data->index, true)) < 0)
- goto cleanup;
-
- /* cannot checkout if unresolved conflicts exist */
- if ((data->opts.checkout_strategy & GIT_CHECKOUT_FORCE) == 0 &&
- git_index_has_conflicts(data->index)) {
- error = GIT_ECONFLICT;
- giterr_set(GITERR_CHECKOUT,
- "unresolved conflicts exist in the index");
- goto cleanup;
+ if (data->opts.checkout_strategy & GIT_CHECKOUT_FORCE) {
+ /* When forcing, we can blindly re-read the index */
+ if ((error = git_index_read(data->index, false)) < 0)
+ goto cleanup;
+ } else {
+ /*
+ * When not being forced, we need to check for unresolved
+ * conflicts and unsaved changes in the index before
+ * proceeding.
+ */
+ if (git_index_has_conflicts(data->index)) {
+ error = GIT_ECONFLICT;
+ git_error_set(GIT_ERROR_CHECKOUT,
+ "unresolved conflicts exist in the index");
+ goto cleanup;
+ }
+
+ if ((error = git_index_read_safely(data->index)) < 0)
+ goto cleanup;
}
/* clean conflict data in the current index */
if (error == GIT_EUNBORNBRANCH) {
error = 0;
- giterr_clear();
+ git_error_clear();
}
if (error < 0)
else if (strcmp(conflict_style->value, "diff3") == 0)
data->opts.checkout_strategy |= GIT_CHECKOUT_CONFLICT_STYLE_DIFF3;
else {
- giterr_set(GITERR_CHECKOUT, "unknown style '%s' given for 'merge.conflictstyle'",
+ git_error_set(GIT_ERROR_CHECKOUT, "unknown style '%s' given for 'merge.conflictstyle'",
conflict_style->value);
error = -1;
git_config_entry_free(conflict_style);
git_iterator *index_i;
if (!index && !repo) {
- giterr_set(GITERR_CHECKOUT,
+ git_error_set(GIT_ERROR_CHECKOUT,
"must provide either repository or index to checkout");
return -1;
}
if (index && repo &&
git_index_owner(index) &&
git_index_owner(index) != repo) {
- giterr_set(GITERR_CHECKOUT,
+ git_error_set(GIT_ERROR_CHECKOUT,
"index to checkout does not match repository");
return -1;
} else if(index && repo && !git_index_owner(index)) {
git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT;
if (!treeish && !repo) {
- giterr_set(GITERR_CHECKOUT,
+ git_error_set(GIT_ERROR_CHECKOUT,
"must provide either repository or tree to checkout");
return -1;
}
if (treeish && repo && git_object_owner(treeish) != repo) {
- giterr_set(GITERR_CHECKOUT,
+ git_error_set(GIT_ERROR_CHECKOUT,
"object to checkout does not match repository");
return -1;
}
repo = git_object_owner(treeish);
if (treeish) {
- if (git_object_peel((git_object **)&tree, treeish, GIT_OBJ_TREE) < 0) {
- giterr_set(
- GITERR_CHECKOUT, "provided object cannot be peeled to a tree");
+ if (git_object_peel((git_object **)&tree, treeish, GIT_OBJECT_TREE) < 0) {
+ git_error_set(
+ GIT_ERROR_CHECKOUT, "provided object cannot be peeled to a tree");
return -1;
}
}
else {
if ((error = checkout_lookup_head_tree(&tree, repo)) < 0) {
if (error != GIT_EUNBORNBRANCH)
- giterr_set(
- GITERR_CHECKOUT,
+ git_error_set(
+ GIT_ERROR_CHECKOUT,
"HEAD could not be peeled to a tree and no treeish given");
return error;
}
if (error < 0)
git_filebuf_cleanup(&file);
- git_buf_free(&file_path);
+ git_buf_dispose(&file_path);
return error;
}
if (error < 0)
git_filebuf_cleanup(&file);
- git_buf_free(&file_path);
+ git_buf_dispose(&file_path);
return error;
}
{
char commit_oidstr[GIT_OID_HEXSZ + 1];
- giterr_set(GITERR_CHERRYPICK, fmt,
+ git_error_set(GIT_ERROR_CHERRYPICK, fmt,
git_oid_tostr(commit_oidstr, GIT_OID_HEXSZ + 1, git_commit_id(commit)));
return -1;
assert(repo && commit);
- GITERR_CHECK_VERSION(given_opts, GIT_CHERRYPICK_OPTIONS_VERSION, "git_cherrypick_options");
+ GIT_ERROR_CHECK_VERSION(given_opts, GIT_CHERRYPICK_OPTIONS_VERSION, "git_cherrypick_options");
if ((error = git_repository__ensure_not_bare(repo, "cherry-pick")) < 0)
return error;
(error = git_indexwriter_init_for_operation(&indexwriter, repo, &opts.checkout_opts.checkout_strategy)) < 0 ||
(error = write_cherrypick_head(repo, commit_oidstr)) < 0 ||
(error = git_repository_head(&our_ref, repo)) < 0 ||
- (error = git_reference_peel((git_object **)&our_commit, our_ref, GIT_OBJ_COMMIT)) < 0 ||
+ (error = git_reference_peel((git_object **)&our_commit, our_ref, GIT_OBJECT_COMMIT)) < 0 ||
(error = git_cherrypick_commit(&index, repo, commit, our_commit, opts.mainline, &opts.merge_opts)) < 0 ||
(error = git_merge__check_result(repo, index)) < 0 ||
(error = git_merge__append_conflicts_to_merge_msg(repo, index)) < 0 ||
git_index_free(index);
git_commit_free(our_commit);
git_reference_free(our_ref);
- git_buf_free(&their_label);
+ git_buf_dispose(&their_label);
return error;
}
return error;
error = git_reference_create(&branch_ref, repo, git_buf_cstr(&refname), target, 0, log_message);
- git_buf_free(&refname);
+ git_buf_dispose(&refname);
git_commit_free(head_obj);
if (!error)
error = 0;
cleanup:
- git_buf_free(&remote_key);
- git_buf_free(&merge_key);
+ git_buf_dispose(&remote_key);
+ git_buf_dispose(&merge_key);
return error;
}
refspec = git_remote__matching_refspec(remote, git_buf_cstr(&branch));
if (refspec == NULL) {
- giterr_set(GITERR_NET, "the remote's default branch does not fit the refspec configuration");
+ git_error_set(GIT_ERROR_NET, "the remote's default branch does not fit the refspec configuration");
error = GIT_EINVALIDSPEC;
goto cleanup;
}
reflog_message);
cleanup:
- git_buf_free(&remote_master_name);
- git_buf_free(&branch);
+ git_buf_dispose(&remote_master_name);
+ git_buf_dispose(&branch);
return error;
}
cleanup:
git_reference_free(remote_ref);
- git_buf_free(&remote_branch_name);
+ git_buf_dispose(&remote_branch_name);
return retcode;
}
assert(repo && _remote);
if (!git_repository_is_empty(repo)) {
- giterr_set(GITERR_INVALID, "the repository is not empty");
+ git_error_set(GIT_ERROR_INVALID, "the repository is not empty");
return -1;
}
cleanup:
git_remote_free(remote);
- git_buf_free(&reflog_message);
+ git_buf_dispose(&reflog_message);
return error;
}
git_path_isdir(path);
done:
- git_buf_free(&fromurl);
+ git_buf_dispose(&fromurl);
return is_local;
}
if (_options)
memcpy(&options, _options, sizeof(git_clone_options));
- GITERR_CHECK_VERSION(&options, GIT_CLONE_OPTIONS_VERSION, "git_clone_options");
+ GIT_ERROR_CHECK_VERSION(&options, GIT_CLONE_OPTIONS_VERSION, "git_clone_options");
/* Only clone to a new directory or an empty directory */
if (git_path_exists(local_path) && !git_path_is_empty_dir(local_path)) {
- giterr_set(GITERR_INVALID,
+ git_error_set(GIT_ERROR_INVALID,
"'%s' exists and is not an empty directory", local_path);
return GIT_EEXISTS;
}
if (error != 0) {
git_error_state last_error = {0};
- giterr_state_capture(&last_error, error);
+ git_error_state_capture(&last_error, error);
git_repository_free(repo);
repo = NULL;
(void)git_futils_rmdir_r(local_path, NULL, rmdir_flags);
- giterr_state_restore(&last_error);
+ git_error_state_restore(&last_error);
}
*out = repo;
assert(repo && remote);
if (!git_repository_is_empty(repo)) {
- giterr_set(GITERR_INVALID, "the repository is not empty");
+ git_error_set(GIT_ERROR_INVALID, "the repository is not empty");
return -1;
}
/* Copy .git/objects/ from the source to the target */
if ((error = git_repository_open(&src, git_buf_cstr(&src_path))) < 0) {
- git_buf_free(&src_path);
+ git_buf_dispose(&src_path);
return error;
}
error = checkout_branch(repo, remote, co_opts, branch, git_buf_cstr(&reflog_message));
cleanup:
- git_buf_free(&reflog_message);
- git_buf_free(&src_path);
- git_buf_free(&src_odb);
- git_buf_free(&dst_odb);
+ git_buf_dispose(&reflog_message);
+ git_buf_dispose(&src_path);
+ git_buf_dispose(&src_odb);
+ git_buf_dispose(&dst_odb);
git_repository_free(src);
return error;
}
#include "git2/object.h"
#include "git2/repository.h"
#include "git2/signature.h"
+#include "git2/mailmap.h"
#include "git2/sys/commit.h"
#include "odb.h"
return 0;
on_error:
- git_buf_free(out);
+ git_buf_dispose(out);
return -1;
}
git_oid *parent_cpy;
const git_oid *parent;
- if (validate && !git_object__is_valid(repo, tree, GIT_OBJ_TREE))
+ if (validate && !git_object__is_valid(repo, tree, GIT_OBJECT_TREE))
return -1;
i = 0;
while ((parent = parent_cb(i, parent_payload)) != NULL) {
- if (validate && !git_object__is_valid(repo, parent, GIT_OBJ_COMMIT)) {
+ if (validate && !git_object__is_valid(repo, parent, GIT_OBJECT_COMMIT)) {
error = -1;
goto on_error;
}
parent_cpy = git_array_alloc(*parents);
- GITERR_CHECK_ALLOC(parent_cpy);
+ GIT_ERROR_CHECK_ALLOC(parent_cpy);
git_oid_cpy(parent_cpy, parent);
i++;
}
if (current_id && (parents->size == 0 || git_oid_cmp(current_id, git_array_get(*parents, 0)))) {
- giterr_set(GITERR_OBJECT, "failed to create commit: current tip is not the first parent");
+ git_error_set(GIT_ERROR_OBJECT, "failed to create commit: current tip is not the first parent");
error = GIT_EMODIFIED;
goto on_error;
}
if (error < 0 && error != GIT_ENOTFOUND)
return error;
}
- giterr_clear();
+ git_error_clear();
if (ref)
current_id = git_reference_target(ref);
if (git_odb__freshen(odb, tree) < 0)
goto cleanup;
- if (git_odb_write(id, odb, buf.ptr, buf.size, GIT_OBJ_COMMIT) < 0)
+ if (git_odb_write(id, odb, buf.ptr, buf.size, GIT_OBJECT_COMMIT) < 0)
goto cleanup;
cleanup:
git_array_clear(parents);
git_reference_free(ref);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return error;
}
if (!tree) {
git_tree *old_tree;
- GITERR_CHECK_ERROR( git_commit_tree(&old_tree, commit_to_amend) );
+ GIT_ERROR_CHECK_ERROR( git_commit_tree(&old_tree, commit_to_amend) );
git_oid_cpy(&tree_id, git_tree_id(old_tree));
git_tree_free(old_tree);
} else {
if (git_oid_cmp(git_commit_id(commit_to_amend), git_reference_target(ref))) {
git_reference_free(ref);
- giterr_set(GITERR_REFERENCE, "commit to amend is not the tip of the given branch");
+ git_error_set(GIT_ERROR_REFERENCE, "commit to amend is not the tip of the given branch");
return -1;
}
}
return error;
}
-int git_commit__parse(void *_commit, git_odb_object *odb_obj)
+int git_commit__parse_raw(void *_commit, const char *data, size_t size)
{
git_commit *commit = _commit;
- const char *buffer_start = git_odb_object_data(odb_obj), *buffer;
- const char *buffer_end = buffer_start + git_odb_object_size(odb_obj);
+ const char *buffer_start = data, *buffer;
+ const char *buffer_end = buffer_start + size;
git_oid parent_id;
size_t header_len;
git_signature dummy_sig;
/* Allocate for one, which will allow not to realloc 90% of the time */
git_array_init_to_size(commit->parent_ids, 1);
- GITERR_CHECK_ARRAY(commit->parent_ids);
+ GIT_ERROR_CHECK_ARRAY(commit->parent_ids);
/* The tree is always the first field */
if (git_oid__parse(&commit->tree_id, &buffer, buffer_end, "tree ") < 0)
while (git_oid__parse(&parent_id, &buffer, buffer_end, "parent ") == 0) {
git_oid *new_id = git_array_alloc(commit->parent_ids);
- GITERR_CHECK_ALLOC(new_id);
+ GIT_ERROR_CHECK_ALLOC(new_id);
git_oid_cpy(new_id, &parent_id);
}
commit->author = git__malloc(sizeof(git_signature));
- GITERR_CHECK_ALLOC(commit->author);
+ GIT_ERROR_CHECK_ALLOC(commit->author);
if (git_signature__parse(commit->author, &buffer, buffer_end, "author ", '\n') < 0)
return -1;
/* Some tools create multiple author fields, ignore the extra ones */
- while ((size_t)(buffer_end - buffer) >= strlen("author ") && !git__prefixcmp(buffer, "author ")) {
+ while (!git__prefixncmp(buffer, buffer_end - buffer, "author ")) {
if (git_signature__parse(&dummy_sig, &buffer, buffer_end, "author ", '\n') < 0)
return -1;
/* Always parse the committer; we need the commit time */
commit->committer = git__malloc(sizeof(git_signature));
- GITERR_CHECK_ALLOC(commit->committer);
+ GIT_ERROR_CHECK_ALLOC(commit->committer);
if (git_signature__parse(commit->committer, &buffer, buffer_end, "committer ", '\n') < 0)
return -1;
buffer += strlen("encoding ");
commit->message_encoding = git__strndup(buffer, eoln - buffer);
- GITERR_CHECK_ALLOC(commit->message_encoding);
+ GIT_ERROR_CHECK_ALLOC(commit->message_encoding);
}
if (eoln < buffer_end && *eoln == '\n')
header_len = buffer - buffer_start;
commit->raw_header = git__strndup(buffer_start, header_len);
- GITERR_CHECK_ALLOC(commit->raw_header);
+ GIT_ERROR_CHECK_ALLOC(commit->raw_header);
/* point "buffer" to data after header, +1 for the final LF */
buffer = buffer_start + header_len + 1;
commit->raw_message = git__strndup(buffer, buffer_end - buffer);
else
commit->raw_message = git__strdup("");
- GITERR_CHECK_ALLOC(commit->raw_message);
+ GIT_ERROR_CHECK_ALLOC(commit->raw_message);
return 0;
bad_buffer:
- giterr_set(GITERR_OBJECT, "failed to parse bad commit object");
+ git_error_set(GIT_ERROR_OBJECT, "failed to parse bad commit object");
return -1;
}
+int git_commit__parse(void *_commit, git_odb_object *odb_obj)
+{
+ return git_commit__parse_raw(_commit,
+ git_odb_object_data(odb_obj),
+ git_odb_object_size(odb_obj));
+}
+
#define GIT_COMMIT_GETTER(_rvalue, _name, _return) \
_rvalue git_commit_##_name(const git_commit *commit) \
{\
parent_id = git_commit_parent_id(commit, n);
if (parent_id == NULL) {
- giterr_set(GITERR_INVALID, "parent %u does not exist", n);
+ git_error_set(GIT_ERROR_INVALID, "parent %u does not exist", n);
return GIT_ENOTFOUND;
}
return 0;
}
- giterr_set(GITERR_OBJECT, "no such field '%s'", field);
+ git_error_set(GIT_ERROR_OBJECT, "no such field '%s'", field);
return GIT_ENOTFOUND;
malformed:
- giterr_set(GITERR_OBJECT, "malformed header");
+ git_error_set(GIT_ERROR_OBJECT, "malformed header");
return -1;
oom:
- giterr_set_oom();
+ git_error_set_oom();
return -1;
}
if ((error = git_odb_read(&obj, odb, commit_id)) < 0)
return error;
- if (obj->cached.type != GIT_OBJ_COMMIT) {
- giterr_set(GITERR_INVALID, "the requested type does not match the type in ODB");
+ if (obj->cached.type != GIT_OBJECT_COMMIT) {
+ git_error_set(GIT_ERROR_INVALID, "the requested type does not match the type in ODB");
error = GIT_ENOTFOUND;
goto cleanup;
}
return error;
}
- giterr_set(GITERR_OBJECT, "this commit is not signed");
+ git_error_set(GIT_ERROR_OBJECT, "this commit is not signed");
error = GIT_ENOTFOUND;
goto cleanup;
malformed:
- giterr_set(GITERR_OBJECT, "malformed header");
+ git_error_set(GIT_ERROR_OBJECT, "malformed header");
error = -1;
goto cleanup;
oom:
- giterr_set_oom();
+ git_error_set_oom();
error = -1;
goto cleanup;
/* We start by identifying the end of the commit header */
header_end = strstr(commit_content, "\n\n");
if (!header_end) {
- giterr_set(GITERR_INVALID, "malformed commit contents");
+ git_error_set(GIT_ERROR_INVALID, "malformed commit contents");
return -1;
}
if ((error = git_repository_odb__weakptr(&odb, repo)) < 0)
goto cleanup;
- if ((error = git_odb_write(out, odb, commit.ptr, commit.size, GIT_OBJ_COMMIT)) < 0)
+ if ((error = git_odb_write(out, odb, commit.ptr, commit.size, GIT_OBJECT_COMMIT)) < 0)
goto cleanup;
cleanup:
- git_buf_free(&commit);
+ git_buf_dispose(&commit);
return error;
}
+
+int git_commit_committer_with_mailmap(
+ git_signature **out, const git_commit *commit, const git_mailmap *mailmap)
+{
+ return git_mailmap_resolve_signature(out, mailmap, commit->committer);
+}
+
+int git_commit_author_with_mailmap(
+ git_signature **out, const git_commit *commit, const git_mailmap *mailmap)
+{
+ return git_mailmap_resolve_signature(out, mailmap, commit->author);
+}
void git_commit__free(void *commit);
int git_commit__parse(void *commit, git_odb_object *obj);
+int git_commit__parse_raw(void *commit, const char *data, size_t size);
#endif
git_oid_fmt(commit_oid, &commit->oid);
commit_oid[GIT_OID_HEXSZ] = '\0';
- giterr_set(GITERR_ODB, "failed to parse commit %s - %s", commit_oid, msg);
+ git_error_set(GIT_ERROR_ODB, "failed to parse commit %s - %s", commit_oid, msg);
return -1;
}
}
commit->parents = alloc_parents(walk, commit, parents);
- GITERR_CHECK_ALLOC(commit->parents);
+ GIT_ERROR_CHECK_ALLOC(commit->parents);
buffer = parents_start;
for (i = 0; i < parents; ++i) {
if ((error = git_odb_read(&obj, walk->odb, &commit->oid)) < 0)
return error;
- if (obj->cached.type != GIT_OBJ_COMMIT) {
- giterr_set(GITERR_INVALID, "object is no commit object");
+ if (obj->cached.type != GIT_OBJECT_COMMIT) {
+ git_error_set(GIT_ERROR_INVALID, "object is no commit object");
error = -1;
} else
error = commit_quick_parse(
/** Declare a function as always inlined. */
#if defined(_MSC_VER)
# define GIT_INLINE(type) static __inline type
+#elif defined(__GNUC__)
+# define GIT_INLINE(type) static __inline__ type
#else
-# define GIT_INLINE(type) static inline type
+# define GIT_INLINE(type) static type
#endif
/** Support for gcc/clang __has_builtin intrinsic */
#include "thread-utils.h"
#include "integer.h"
+/*
+ * Include the declarations for deprecated functions; this ensures
+ * that they're decorated with the proper extern/visibility attributes.
+ */
+#include "git2/deprecated.h"
+
#include <regex.h>
#define DEFAULT_BUFSIZE 65536
/**
* Check a pointer allocation result, returning -1 if it failed.
*/
-#define GITERR_CHECK_ALLOC(ptr) if (ptr == NULL) { return -1; }
+#define GIT_ERROR_CHECK_ALLOC(ptr) if (ptr == NULL) { return -1; }
/**
* Check a buffer allocation result, returning -1 if it failed.
*/
-#define GITERR_CHECK_ALLOC_BUF(buf) if ((void *)(buf) == NULL || git_buf_oom(buf)) { return -1; }
+#define GIT_ERROR_CHECK_ALLOC_BUF(buf) if ((void *)(buf) == NULL || git_buf_oom(buf)) { return -1; }
/**
* Check a return value and propagate result if non-zero.
*/
-#define GITERR_CHECK_ERROR(code) \
+#define GIT_ERROR_CHECK_ERROR(code) \
do { int _err = (code); if (_err) return _err; } while (0)
/**
* Set the error message for this thread, formatting as needed.
*/
-void giterr_set(int error_class, const char *string, ...) GIT_FORMAT_PRINTF(2, 3);
+void git_error_set(int error_class, const char *string, ...) GIT_FORMAT_PRINTF(2, 3);
/**
* Set the error message for a regex failure, using the internal regex
* error code lookup and return a libgit error code.
*/
-int giterr_set_regex(const regex_t *regex, int error_code);
+int git_error_set_regex(const regex_t *regex, int error_code);
/**
* Set error message for user callback if needed.
*
* @return This always returns the `error_code` parameter.
*/
-GIT_INLINE(int) giterr_set_after_callback_function(
+GIT_INLINE(int) git_error_set_after_callback_function(
int error_code, const char *action)
{
if (error_code) {
- const git_error *e = giterr_last();
+ const git_error *e = git_error_last();
if (!e || !e->message)
- giterr_set(e ? e->klass : GITERR_CALLBACK,
+ git_error_set(e ? e->klass : GIT_ERROR_CALLBACK,
"%s callback returned %d", action, error_code);
}
return error_code;
}
#ifdef GIT_WIN32
-#define giterr_set_after_callback(code) \
- giterr_set_after_callback_function((code), __FUNCTION__)
+#define git_error_set_after_callback(code) \
+ git_error_set_after_callback_function((code), __FUNCTION__)
#else
-#define giterr_set_after_callback(code) \
- giterr_set_after_callback_function((code), __func__)
+#define git_error_set_after_callback(code) \
+ git_error_set_after_callback_function((code), __func__)
#endif
/**
* Gets the system error code for this thread.
*/
-int giterr_system_last(void);
+int git_error_system_last(void);
/**
* Sets the system error code for this thread.
*/
-void giterr_system_set(int code);
+void git_error_system_set(int code);
/**
* Structure to preserve libgit2 error state
* If `error_code` is zero, this does not clear the current error state.
* You must either restore this error state, or free it.
*/
-extern int giterr_state_capture(git_error_state *state, int error_code);
+extern int git_error_state_capture(git_error_state *state, int error_code);
/**
* Restore error state to a previous value, returning saved error code.
*/
-extern int giterr_state_restore(git_error_state *state);
+extern int git_error_state_restore(git_error_state *state);
/** Free an error state. */
-extern void giterr_state_free(git_error_state *state);
+extern void git_error_state_free(git_error_state *state);
/**
* Check a versioned structure for validity
*/
-GIT_INLINE(int) giterr__check_version(const void *structure, unsigned int expected_max, const char *name)
+GIT_INLINE(int) git_error__check_version(const void *structure, unsigned int expected_max, const char *name)
{
unsigned int actual;
if (actual > 0 && actual <= expected_max)
return 0;
- giterr_set(GITERR_INVALID, "invalid version %d on %s", actual, name);
+ git_error_set(GIT_ERROR_INVALID, "invalid version %d on %s", actual, name);
return -1;
}
-#define GITERR_CHECK_VERSION(S,V,N) if (giterr__check_version(S,V,N) < 0) return -1
+#define GIT_ERROR_CHECK_VERSION(S,V,N) if (git_error__check_version(S,V,N) < 0) return -1
/**
* Initialize a structure with a version.
#define GIT_INIT_STRUCTURE_FROM_TEMPLATE(PTR,VERSION,TYPE,TPL) do { \
TYPE _tmpl = TPL; \
- GITERR_CHECK_VERSION(&(VERSION), _tmpl.version, #TYPE); \
+ GIT_ERROR_CHECK_VERSION(&(VERSION), _tmpl.version, #TYPE); \
memcpy((PTR), &_tmpl, sizeof(_tmpl)); } while (0)
/** Check for additive overflow, setting an error if would occur. */
#define GIT_ADD_SIZET_OVERFLOW(out, one, two) \
- (git__add_sizet_overflow(out, one, two) ? (giterr_set_oom(), 1) : 0)
+ (git__add_sizet_overflow(out, one, two) ? (git_error_set_oom(), 1) : 0)
/** Check for additive overflow, setting an error if would occur. */
#define GIT_MULTIPLY_SIZET_OVERFLOW(out, nelem, elsize) \
- (git__multiply_sizet_overflow(out, nelem, elsize) ? (giterr_set_oom(), 1) : 0)
+ (git__multiply_sizet_overflow(out, nelem, elsize) ? (git_error_set_oom(), 1) : 0)
/** Check for additive overflow, failing if it would occur. */
-#define GITERR_CHECK_ALLOC_ADD(out, one, two) \
+#define GIT_ERROR_CHECK_ALLOC_ADD(out, one, two) \
if (GIT_ADD_SIZET_OVERFLOW(out, one, two)) { return -1; }
-#define GITERR_CHECK_ALLOC_ADD3(out, one, two, three) \
+#define GIT_ERROR_CHECK_ALLOC_ADD3(out, one, two, three) \
if (GIT_ADD_SIZET_OVERFLOW(out, one, two) || \
GIT_ADD_SIZET_OVERFLOW(out, *(out), three)) { return -1; }
-#define GITERR_CHECK_ALLOC_ADD4(out, one, two, three, four) \
+#define GIT_ERROR_CHECK_ALLOC_ADD4(out, one, two, three, four) \
if (GIT_ADD_SIZET_OVERFLOW(out, one, two) || \
GIT_ADD_SIZET_OVERFLOW(out, *(out), three) || \
GIT_ADD_SIZET_OVERFLOW(out, *(out), four)) { return -1; }
-#define GITERR_CHECK_ALLOC_ADD5(out, one, two, three, four, five) \
+#define GIT_ERROR_CHECK_ALLOC_ADD5(out, one, two, three, four, five) \
if (GIT_ADD_SIZET_OVERFLOW(out, one, two) || \
GIT_ADD_SIZET_OVERFLOW(out, *(out), three) || \
GIT_ADD_SIZET_OVERFLOW(out, *(out), four) || \
GIT_ADD_SIZET_OVERFLOW(out, *(out), five)) { return -1; }
/** Check for multiplicative overflow, failing if it would occur. */
-#define GITERR_CHECK_ALLOC_MULTIPLY(out, nelem, elsize) \
+#define GIT_ERROR_CHECK_ALLOC_MULTIPLY(out, nelem, elsize) \
if (GIT_MULTIPLY_SIZET_OVERFLOW(out, nelem, elsize)) { return -1; }
-/* NOTE: other giterr functions are in the public errors.h header file */
+/* NOTE: other git_error functions are in the public errors.h header file */
#include "util.h"
#include "git2/sys/config.h"
#include "vector.h"
#include "buf_text.h"
-#include "config_file.h"
+#include "config_backend.h"
#include "transaction.h"
#if GIT_WIN32
# include <windows.h>
typedef struct {
git_refcount rc;
- git_config_backend *file;
+ git_config_backend *backend;
git_config_level_t level;
-} file_internal;
+} backend_internal;
-static void file_internal_free(file_internal *internal)
+static void backend_internal_free(backend_internal *internal)
{
- git_config_backend *file;
+ git_config_backend *backend;
- file = internal->file;
- file->free(file);
+ backend = internal->backend;
+ backend->free(backend);
git__free(internal);
}
static void config_free(git_config *cfg)
{
size_t i;
- file_internal *internal;
+ backend_internal *internal;
- for (i = 0; i < cfg->files.length; ++i) {
- internal = git_vector_get(&cfg->files, i);
- GIT_REFCOUNT_DEC(internal, file_internal_free);
+ for (i = 0; i < cfg->backends.length; ++i) {
+ internal = git_vector_get(&cfg->backends, i);
+ GIT_REFCOUNT_DEC(internal, backend_internal_free);
}
- git_vector_free(&cfg->files);
+ git_vector_free(&cfg->backends);
git__memzero(cfg, sizeof(*cfg));
git__free(cfg);
static int config_backend_cmp(const void *a, const void *b)
{
- const file_internal *bk_a = (const file_internal *)(a);
- const file_internal *bk_b = (const file_internal *)(b);
+ const backend_internal *bk_a = (const backend_internal *)(a);
+ const backend_internal *bk_b = (const backend_internal *)(b);
return bk_b->level - bk_a->level;
}
git_config *cfg;
cfg = git__malloc(sizeof(git_config));
- GITERR_CHECK_ALLOC(cfg);
+ GIT_ERROR_CHECK_ALLOC(cfg);
memset(cfg, 0x0, sizeof(git_config));
- if (git_vector_init(&cfg->files, 3, config_backend_cmp) < 0) {
+ if (git_vector_init(&cfg->backends, 3, config_backend_cmp) < 0) {
git__free(cfg);
return -1;
}
assert(cfg && path);
res = p_stat(path, &st);
- if (res < 0 && errno != ENOENT) {
- giterr_set(GITERR_CONFIG, "failed to stat '%s'", path);
+ if (res < 0 && errno != ENOENT && errno != ENOTDIR) {
+ git_error_set(GIT_ERROR_CONFIG, "failed to stat '%s'", path);
return -1;
}
- if (git_config_file__ondisk(&file, path) < 0)
+ if (git_config_backend_from_file(&file, path) < 0)
return -1;
if ((res = git_config_add_backend(cfg, file, level, repo, force)) < 0) {
{
int error = 0;
size_t i;
- file_internal *internal;
+ backend_internal *internal;
git_config *config;
*out = NULL;
if (git_config_new(&config) < 0)
return -1;
- git_vector_foreach(&in->files, i, internal) {
+ git_vector_foreach(&in->backends, i, internal) {
git_config_backend *b;
- if ((error = internal->file->snapshot(&b, internal->file)) < 0)
+ if ((error = internal->backend->snapshot(&b, internal->backend)) < 0)
break;
if ((error = git_config_add_backend(config, b, internal->level, NULL, 0)) < 0) {
return error;
}
-static int find_internal_file_by_level(
- file_internal **internal_out,
+static int find_backend_by_level(
+ backend_internal **out,
const git_config *cfg,
git_config_level_t level)
{
int pos = -1;
- file_internal *internal;
+ backend_internal *internal;
size_t i;
- /* when passing GIT_CONFIG_HIGHEST_LEVEL, the idea is to get the config file
- * which has the highest level. As config files are stored in a vector
- * sorted by decreasing order of level, getting the file at position 0
+ /* when passing GIT_CONFIG_HIGHEST_LEVEL, the idea is to get the config backend
+ * which has the highest level. As config backends are stored in a vector
+ * sorted by decreasing order of level, getting the backend at position 0
* will do the job.
*/
if (level == GIT_CONFIG_HIGHEST_LEVEL) {
pos = 0;
} else {
- git_vector_foreach(&cfg->files, i, internal) {
+ git_vector_foreach(&cfg->backends, i, internal) {
if (internal->level == level)
pos = (int)i;
}
}
if (pos == -1) {
- giterr_set(GITERR_CONFIG,
- "no config file exists for the given level '%i'", (int)level);
+ git_error_set(GIT_ERROR_CONFIG,
+ "no configuration exists for the given level '%i'", (int)level);
return GIT_ENOTFOUND;
}
- *internal_out = git_vector_get(&cfg->files, pos);
+ *out = git_vector_get(&cfg->backends, pos);
return 0;
}
static int duplicate_level(void **old_raw, void *new_raw)
{
- file_internal **old = (file_internal **)old_raw;
+ backend_internal **old = (backend_internal **)old_raw;
GIT_UNUSED(new_raw);
- giterr_set(GITERR_CONFIG, "a file with the same level (%i) has already been added to the config", (int)(*old)->level);
+ git_error_set(GIT_ERROR_CONFIG, "there already exists a configuration for the given level (%i)", (int)(*old)->level);
return GIT_EEXISTS;
}
-static void try_remove_existing_file_internal(
+static void try_remove_existing_backend(
git_config *cfg,
git_config_level_t level)
{
int pos = -1;
- file_internal *internal;
+ backend_internal *internal;
size_t i;
- git_vector_foreach(&cfg->files, i, internal) {
+ git_vector_foreach(&cfg->backends, i, internal) {
if (internal->level == level)
pos = (int)i;
}
if (pos == -1)
return;
- internal = git_vector_get(&cfg->files, pos);
+ internal = git_vector_get(&cfg->backends, pos);
- if (git_vector_remove(&cfg->files, pos) < 0)
+ if (git_vector_remove(&cfg->backends, pos) < 0)
return;
- GIT_REFCOUNT_DEC(internal, file_internal_free);
+ GIT_REFCOUNT_DEC(internal, backend_internal_free);
}
static int git_config__add_internal(
git_config *cfg,
- file_internal *internal,
+ backend_internal *internal,
git_config_level_t level,
int force)
{
int result;
- /* delete existing config file for level if it exists */
+ /* delete existing config backend for level if it exists */
if (force)
- try_remove_existing_file_internal(cfg, level);
+ try_remove_existing_backend(cfg, level);
- if ((result = git_vector_insert_sorted(&cfg->files,
+ if ((result = git_vector_insert_sorted(&cfg->backends,
internal, &duplicate_level)) < 0)
return result;
- git_vector_sort(&cfg->files);
- internal->file->cfg = cfg;
+ git_vector_sort(&cfg->backends);
+ internal->backend->cfg = cfg;
GIT_REFCOUNT_INC(internal);
git_config_level_t level)
{
git_config *cfg;
- file_internal *internal;
+ backend_internal *internal;
int res;
- if ((res = find_internal_file_by_level(&internal, cfg_parent, level)) < 0)
+ if ((res = find_backend_by_level(&internal, cfg_parent, level)) < 0)
return res;
if ((res = git_config_new(&cfg)) < 0)
int git_config_add_backend(
git_config *cfg,
- git_config_backend *file,
+ git_config_backend *backend,
git_config_level_t level,
const git_repository *repo,
int force)
{
- file_internal *internal;
+ backend_internal *internal;
int result;
- assert(cfg && file);
+ assert(cfg && backend);
- GITERR_CHECK_VERSION(file, GIT_CONFIG_BACKEND_VERSION, "git_config_backend");
+ GIT_ERROR_CHECK_VERSION(backend, GIT_CONFIG_BACKEND_VERSION, "git_config_backend");
- if ((result = file->open(file, level, repo)) < 0)
+ if ((result = backend->open(backend, level, repo)) < 0)
return result;
- internal = git__malloc(sizeof(file_internal));
- GITERR_CHECK_ALLOC(internal);
+ internal = git__malloc(sizeof(backend_internal));
+ GIT_ERROR_CHECK_ALLOC(internal);
- memset(internal, 0x0, sizeof(file_internal));
+ memset(internal, 0x0, sizeof(backend_internal));
- internal->file = file;
+ internal->backend = backend;
internal->level = level;
if ((result = git_config__add_internal(cfg, internal, level, force)) < 0) {
static int find_next_backend(size_t *out, const git_config *cfg, size_t i)
{
- file_internal *internal;
+ backend_internal *internal;
for (; i > 0; --i) {
- internal = git_vector_get(&cfg->files, i - 1);
- if (!internal || !internal->file)
+ internal = git_vector_get(&cfg->backends, i - 1);
+ if (!internal || !internal->backend)
continue;
*out = i;
static int all_iter_next(git_config_entry **entry, git_config_iterator *_iter)
{
all_iter *iter = (all_iter *) _iter;
- file_internal *internal;
+ backend_internal *internal;
git_config_backend *backend;
size_t i;
int error = 0;
if (find_next_backend(&i, iter->cfg, iter->i) < 0)
return GIT_ITEROVER;
- internal = git_vector_get(&iter->cfg->files, i - 1);
- backend = internal->file;
+ internal = git_vector_get(&iter->cfg->backends, i - 1);
+ backend = internal->backend;
iter->i = i - 1;
if (iter->current)
all_iter *iter;
iter = git__calloc(1, sizeof(all_iter));
- GITERR_CHECK_ALLOC(iter);
+ GIT_ERROR_CHECK_ALLOC(iter);
iter->parent.free = all_iter_free;
iter->parent.next = all_iter_next;
- iter->i = cfg->files.length;
+ iter->i = cfg->backends.length;
iter->cfg = cfg;
*out = (git_config_iterator *) iter;
return git_config_iterator_new(out, cfg);
iter = git__calloc(1, sizeof(all_iter));
- GITERR_CHECK_ALLOC(iter);
+ GIT_ERROR_CHECK_ALLOC(iter);
if ((result = p_regcomp(&iter->regex, regexp, REG_EXTENDED)) != 0) {
- giterr_set_regex(&iter->regex, result);
+ git_error_set_regex(&iter->regex, result);
git__free(iter);
return -1;
}
iter->parent.next = all_iter_glob_next;
iter->parent.free = all_iter_glob_free;
- iter->i = cfg->files.length;
+ iter->i = cfg->backends.length;
iter->cfg = cfg;
*out = (git_config_iterator *) iter;
regex_t regex;
int error = 0;
+ assert(backend && cb);
+
if (regexp != NULL) {
if ((error = p_regcomp(®ex, regexp, REG_EXTENDED)) != 0) {
- giterr_set_regex(®ex, error);
+ git_error_set_regex(®ex, error);
regfree(®ex);
return -1;
}
/* abort iterator on non-zero return value */
if ((error = cb(entry, payload)) != 0) {
- giterr_set_after_callback(error);
+ git_error_set_after_callback(error);
break;
}
}
while (!(error = git_config_next(&entry, iter))) {
if ((error = cb(entry, payload)) != 0) {
- giterr_set_after_callback(error);
+ git_error_set_after_callback(error);
break;
}
}
git_config *cfg, const char *name, backend_use use)
{
size_t i;
- file_internal *f;
+ backend_internal *backend;
*out = NULL;
- if (git_vector_length(&cfg->files) == 0) {
- giterr_set(GITERR_CONFIG,
- "cannot %s value for '%s' when no config files exist",
+ if (git_vector_length(&cfg->backends) == 0) {
+ git_error_set(GIT_ERROR_CONFIG,
+ "cannot %s value for '%s' when no config backends exist",
uses[use], name);
return GIT_ENOTFOUND;
}
- git_vector_foreach(&cfg->files, i, f) {
- if (!f->file->readonly) {
- *out = f->file;
+ git_vector_foreach(&cfg->backends, i, backend) {
+ if (!backend->backend->readonly) {
+ *out = backend->backend;
return 0;
}
}
- giterr_set(GITERR_CONFIG,
- "cannot %s value for '%s' when all config files are readonly",
+ git_error_set(GIT_ERROR_CONFIG,
+ "cannot %s value for '%s' when all config backends are readonly",
uses[use], name);
return GIT_ENOTFOUND;
}
int git_config_delete_entry(git_config *cfg, const char *name)
{
- git_config_backend *file;
+ git_config_backend *backend;
- if (get_backend_for_use(&file, cfg, name, BACKEND_USE_DELETE) < 0)
+ if (get_backend_for_use(&backend, cfg, name, BACKEND_USE_DELETE) < 0)
return GIT_ENOTFOUND;
- return file->del(file, name);
+ return backend->del(backend, name);
}
int git_config_set_int64(git_config *cfg, const char *name, int64_t value)
int git_config_set_string(git_config *cfg, const char *name, const char *value)
{
int error;
- git_config_backend *file;
+ git_config_backend *backend;
if (!value) {
- giterr_set(GITERR_CONFIG, "the value to set cannot be NULL");
+ git_error_set(GIT_ERROR_CONFIG, "the value to set cannot be NULL");
return -1;
}
- if (get_backend_for_use(&file, cfg, name, BACKEND_USE_SET) < 0)
+ if (get_backend_for_use(&backend, cfg, name, BACKEND_USE_SET) < 0)
return GIT_ENOTFOUND;
- error = file->set(file, name, value);
+ error = backend->set(backend, name, value);
if (!error && GIT_REFCOUNT_OWNER(cfg) != NULL)
git_repository__cvar_cache_clear(GIT_REFCOUNT_OWNER(cfg));
static int config_error_notfound(const char *name)
{
- giterr_set(GITERR_CONFIG, "config value '%s' was not found", name);
+ git_error_set(GIT_ERROR_CONFIG, "config value '%s' was not found", name);
return GIT_ENOTFOUND;
}
const char *key = name;
char *normalized = NULL;
size_t i;
- file_internal *internal;
+ backend_internal *internal;
*out = NULL;
}
res = GIT_ENOTFOUND;
- git_vector_foreach(&cfg->files, i, internal) {
- if (!internal || !internal->file)
+ git_vector_foreach(&cfg->backends, i, internal) {
+ if (!internal || !internal->backend)
continue;
- res = internal->file->get(internal->file, key, out);
+ res = internal->backend->get(internal->backend, key, out);
if (res != GIT_ENOTFOUND)
break;
}
if (res == GIT_ENOTFOUND)
res = (want_errors > GET_ALL_ERRORS) ? 0 : config_error_notfound(name);
else if (res && (want_errors == GET_NO_ERRORS)) {
- giterr_clear();
+ git_error_clear();
res = 0;
}
static int is_readonly(const git_config *cfg)
{
size_t i;
- file_internal *internal;
+ backend_internal *internal;
- git_vector_foreach(&cfg->files, i, internal) {
- if (!internal || !internal->file)
+ git_vector_foreach(&cfg->backends, i, internal) {
+ if (!internal || !internal->backend)
continue;
- if (!internal->file->readonly)
+ if (!internal->backend->readonly)
return 0;
}
int ret;
if (!is_readonly(cfg)) {
- giterr_set(GITERR_CONFIG, "get_string called on a live config object");
+ git_error_set(GIT_ERROR_CONFIG, "get_string called on a live config object");
return -1;
}
get_entry(&entry, cfg, key, false, GET_NO_ERRORS);
if (entry && git_config_parse_bool(&val, entry->value) < 0)
- giterr_clear();
+ git_error_clear();
git_config_entry_free(entry);
return val;
get_entry(&entry, cfg, key, false, GET_NO_ERRORS);
if (entry && git_config_parse_int32(&val, entry->value) < 0)
- giterr_clear();
+ git_error_clear();
git_config_entry_free(entry);
return (int)val;
found = 1;
if ((err = cb(entry, payload)) != 0) {
- giterr_set_after_callback(err);
+ git_error_set_after_callback(err);
break;
}
}
return error;
iter = git__calloc(1, sizeof(multivar_iter));
- GITERR_CHECK_ALLOC(iter);
+ GIT_ERROR_CHECK_ALLOC(iter);
if ((error = git_config__normalize_name(name, &iter->name)) < 0)
goto on_error;
if (regexp != NULL) {
error = p_regcomp(&iter->regex, regexp, REG_EXTENDED);
if (error != 0) {
- giterr_set_regex(&iter->regex, error);
+ git_error_set_regex(&iter->regex, error);
error = -1;
regfree(&iter->regex);
goto on_error;
int git_config_set_multivar(git_config *cfg, const char *name, const char *regexp, const char *value)
{
- git_config_backend *file;
+ git_config_backend *backend;
- if (get_backend_for_use(&file, cfg, name, BACKEND_USE_DELETE) < 0)
+ if (get_backend_for_use(&backend, cfg, name, BACKEND_USE_DELETE) < 0)
return GIT_ENOTFOUND;
- return file->set_multivar(file, name, regexp, value);
+ return backend->set_multivar(backend, name, regexp, value);
}
int git_config_delete_multivar(git_config *cfg, const char *name, const char *regexp)
{
- git_config_backend *file;
+ git_config_backend *backend;
- if (get_backend_for_use(&file, cfg, name, BACKEND_USE_DELETE) < 0)
+ if (get_backend_for_use(&backend, cfg, name, BACKEND_USE_DELETE) < 0)
return GIT_ENOTFOUND;
- return file->del_multivar(file, name, regexp);
+ return backend->del_multivar(backend, name, regexp);
}
int git_config_next(git_config_entry **entry, git_config_iterator *iter)
error = git_config_add_file_ondisk(cfg, buf.ptr,
GIT_CONFIG_LEVEL_PROGRAMDATA, NULL, 0);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
if (error) {
git_config_free(cfg);
int git_config_lock(git_transaction **out, git_config *cfg)
{
int error;
- git_config_backend *file;
- file_internal *internal;
+ git_config_backend *backend;
+ backend_internal *internal;
- internal = git_vector_get(&cfg->files, 0);
- if (!internal || !internal->file) {
- giterr_set(GITERR_CONFIG, "cannot lock; the config has no backends/files");
+ assert(cfg);
+
+ internal = git_vector_get(&cfg->backends, 0);
+ if (!internal || !internal->backend) {
+ git_error_set(GIT_ERROR_CONFIG, "cannot lock; the config has no backends");
return -1;
}
- file = internal->file;
+ backend = internal->backend;
- if ((error = file->lock(file)) < 0)
+ if ((error = backend->lock(backend)) < 0)
return error;
return git_transaction_config_new(out, cfg);
int git_config_unlock(git_config *cfg, int commit)
{
- git_config_backend *file;
- file_internal *internal;
+ git_config_backend *backend;
+ backend_internal *internal;
+
+ assert(cfg);
- internal = git_vector_get(&cfg->files, 0);
- if (!internal || !internal->file) {
- giterr_set(GITERR_CONFIG, "cannot lock; the config has no backends/files");
+ internal = git_vector_get(&cfg->backends, 0);
+ if (!internal || !internal->backend) {
+ git_error_set(GIT_ERROR_CONFIG, "cannot lock; the config has no backends");
return -1;
}
- file = internal->file;
+ backend = internal->backend;
- return file->unlock(file, commit);
+ return backend->unlock(backend, commit);
}
/***********
}
fail_parse:
- giterr_set(GITERR_CONFIG, "failed to map '%s'", value);
+ git_error_set(GIT_ERROR_CONFIG, "failed to map '%s'", value);
return -1;
}
return 0;
}
- giterr_set(GITERR_CONFIG, "invalid enum value");
+ git_error_set(GIT_ERROR_CONFIG, "invalid enum value");
return GIT_ENOTFOUND;
}
return 0;
}
- giterr_set(GITERR_CONFIG, "failed to parse '%s' as a boolean value", value);
+ git_error_set(GIT_ERROR_CONFIG, "failed to parse '%s' as a boolean value", value);
return -1;
}
}
fail_parse:
- giterr_set(GITERR_CONFIG, "failed to parse '%s' as an integer", value ? value : "(null)");
+ git_error_set(GIT_ERROR_CONFIG, "failed to parse '%s' as an integer", value ? value : "(null)");
return -1;
}
return 0;
fail_parse:
- giterr_set(GITERR_CONFIG, "failed to parse '%s' as a 32-bit integer", value ? value : "(null)");
+ git_error_set(GIT_ERROR_CONFIG, "failed to parse '%s' as a 32-bit integer", value ? value : "(null)");
return -1;
}
if (value[0] == '~') {
if (value[1] != '\0' && value[1] != '/') {
- giterr_set(GITERR_CONFIG, "retrieving a homedir by name is not supported");
+ git_error_set(GIT_ERROR_CONFIG, "retrieving a homedir by name is not supported");
return -1;
}
return git_buf_sets(out, value);
}
+static int normalize_section(char *start, char *end)
+{
+ char *scan;
+
+ if (start == end)
+ return GIT_EINVALIDSPEC;
+
+ /* Validate and downcase range */
+ for (scan = start; *scan; ++scan) {
+ if (end && scan >= end)
+ break;
+ if (isalnum(*scan))
+ *scan = (char)git__tolower(*scan);
+ else if (*scan != '-' || scan == start)
+ return GIT_EINVALIDSPEC;
+ }
+
+ if (scan == start)
+ return GIT_EINVALIDSPEC;
+
+ return 0;
+}
+
+
/* Take something the user gave us and make it nice for our hash function */
int git_config__normalize_name(const char *in, char **out)
{
assert(in && out);
name = git__strdup(in);
- GITERR_CHECK_ALLOC(name);
+ GIT_ERROR_CHECK_ALLOC(name);
fdot = strchr(name, '.');
ldot = strrchr(name, '.');
goto invalid;
/* Validate and downcase up to first dot and after last dot */
- if (git_config_file_normalize_section(name, fdot) < 0 ||
- git_config_file_normalize_section(ldot + 1, NULL) < 0)
+ if (normalize_section(name, fdot) < 0 ||
+ normalize_section(ldot + 1, NULL) < 0)
goto invalid;
/* If there is a middle range, make sure it doesn't have newlines */
invalid:
git__free(name);
- giterr_set(GITERR_CONFIG, "invalid config item name '%s'", in);
+ git_error_set(GIT_ERROR_CONFIG, "invalid config item name '%s'", in);
return GIT_EINVALIDSPEC;
}
goto cleanup;
if (new_section_name != NULL &&
- (error = git_config_file_normalize_section(
- replace.ptr, strchr(replace.ptr, '.'))) < 0)
+ (error = normalize_section(replace.ptr, strchr(replace.ptr, '.'))) < 0)
{
- giterr_set(
- GITERR_CONFIG, "invalid config section '%s'", new_section_name);
+ git_error_set(
+ GIT_ERROR_CONFIG, "invalid config section '%s'", new_section_name);
goto cleanup;
}
config, git_buf_cstr(&pattern), rename_config_entries_cb, &data);
cleanup:
- git_buf_free(&pattern);
- git_buf_free(&replace);
+ git_buf_dispose(&pattern);
+ git_buf_dispose(&replace);
return error;
}
struct git_config {
git_refcount rc;
- git_vector files;
+ git_vector backends;
};
extern int git_config__global_location(git_buf *buf);
const char *old_section_name, /* eg "branch.dummy" */
const char *new_section_name); /* NULL to drop the old section */
-/**
- * Create a configuration file backend for ondisk files
- *
- * These are the normal `.gitconfig` files that Core Git
- * processes. Note that you first have to add this file to a
- * configuration object before you can query it for configuration
- * variables.
- *
- * @param out the new backend
- * @param path where the config file is located
- */
-extern int git_config_file__ondisk(git_config_backend **out, const char *path);
-
extern int git_config__normalize_name(const char *in, char **out);
/* internal only: does not normalize key and sets out to NULL if not found */
--- /dev/null
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+#ifndef INCLUDE_config_file_h__
+#define INCLUDE_config_file_h__
+
+#include "common.h"
+
+#include "git2/sys/config.h"
+#include "git2/config.h"
+
+/**
+ * Create a configuration file backend for ondisk files
+ *
+ * These are the normal `.gitconfig` files that Core Git
+ * processes. Note that you first have to add this file to a
+ * configuration object before you can query it for configuration
+ * variables.
+ *
+ * @param out the new backend
+ * @param path where the config file is located
+ */
+extern int git_config_backend_from_file(git_config_backend **out, const char *path);
+
+/**
+ * Create an in-memory configuration file backend
+ *
+ * @param out the new backend
+ * @param cfg the configuration that is to be parsed
+ * @param len the length of the string pointed to by `cfg`
+ */
+extern int git_config_backend_from_string(git_config_backend **out, const char *cfg, size_t len);
+
+GIT_INLINE(int) git_config_backend_open(git_config_backend *cfg, unsigned int level, const git_repository *repo)
+{
+ return cfg->open(cfg, level, repo);
+}
+
+GIT_INLINE(void) git_config_backend_free(git_config_backend *cfg)
+{
+ if (cfg)
+ cfg->free(cfg);
+}
+
+GIT_INLINE(int) git_config_backend_get_string(
+ git_config_entry **out, git_config_backend *cfg, const char *name)
+{
+ return cfg->get(cfg, name, out);
+}
+
+GIT_INLINE(int) git_config_backend_set_string(
+ git_config_backend *cfg, const char *name, const char *value)
+{
+ return cfg->set(cfg, name, value);
+}
+
+GIT_INLINE(int) git_config_backend_delete(
+ git_config_backend *cfg, const char *name)
+{
+ return cfg->del(cfg, name);
+}
+
+GIT_INLINE(int) git_config_backend_foreach(
+ git_config_backend *cfg,
+ int (*fn)(const git_config_entry *entry, void *data),
+ void *data)
+{
+ return git_config_backend_foreach_match(cfg, NULL, fn, data);
+}
+
+GIT_INLINE(int) git_config_backend_lock(git_config_backend *cfg)
+{
+ return cfg->lock(cfg);
+}
+
+GIT_INLINE(int) git_config_backend_unlock(git_config_backend *cfg, int success)
+{
+ return cfg->unlock(cfg, success);
+}
+
+#endif
{GIT_CVAR_STRING, "warn", GIT_SAFE_CRLF_WARN}
};
+static git_cvar_map _cvar_map_logallrefupdates[] = {
+ {GIT_CVAR_FALSE, NULL, GIT_LOGALLREFUPDATES_FALSE},
+ {GIT_CVAR_TRUE, NULL, GIT_LOGALLREFUPDATES_TRUE},
+ {GIT_CVAR_STRING, "always", GIT_LOGALLREFUPDATES_ALWAYS},
+};
+
/*
* Generic map for integer values
*/
{"core.abbrev", _cvar_map_int, 1, GIT_ABBREV_DEFAULT },
{"core.precomposeunicode", NULL, 0, GIT_PRECOMPOSE_DEFAULT },
{"core.safecrlf", _cvar_map_safecrlf, ARRAY_SIZE(_cvar_map_safecrlf), GIT_SAFE_CRLF_DEFAULT},
- {"core.logallrefupdates", NULL, 0, GIT_LOGALLREFUPDATES_DEFAULT },
+ {"core.logallrefupdates", _cvar_map_logallrefupdates, ARRAY_SIZE(_cvar_map_logallrefupdates), GIT_LOGALLREFUPDATES_DEFAULT},
{"core.protecthfs", NULL, 0, GIT_PROTECTHFS_DEFAULT },
{"core.protectntfs", NULL, 0, GIT_PROTECTNTFS_DEFAULT },
{"core.fsyncobjectfiles", NULL, 0, GIT_FSYNCOBJECTFILES_DEFAULT },
--- /dev/null
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#include "config_entries.h"
+
+typedef struct config_entry_list {
+ struct config_entry_list *next;
+ struct config_entry_list *last;
+ git_config_entry *entry;
+} config_entry_list;
+
+typedef struct config_entries_iterator {
+ git_config_iterator parent;
+ git_config_entries *entries;
+ config_entry_list *head;
+} config_entries_iterator;
+
+struct git_config_entries {
+ git_refcount rc;
+ git_strmap *map;
+ config_entry_list *list;
+};
+
+static void config_entry_list_free(config_entry_list *list)
+{
+ config_entry_list *next;
+
+ while (list != NULL) {
+ next = list->next;
+
+ git__free((char*) list->entry->name);
+ git__free((char *) list->entry->value);
+ git__free(list->entry);
+ git__free(list);
+
+ list = next;
+ };
+}
+
+static void config_entry_list_append(config_entry_list **list, config_entry_list *entry)
+{
+ if (*list)
+ (*list)->last->next = entry;
+ else
+ *list = entry;
+ (*list)->last = entry;
+}
+
+int git_config_entries_new(git_config_entries **out)
+{
+ git_config_entries *entries;
+ int error;
+
+ entries = git__calloc(1, sizeof(git_config_entries));
+ GIT_ERROR_CHECK_ALLOC(entries);
+ GIT_REFCOUNT_INC(entries);
+
+ if ((error = git_strmap_alloc(&entries->map)) < 0)
+ git__free(entries);
+ else
+ *out = entries;
+
+ return error;
+}
+
+int git_config_entries_dup(git_config_entries **out, git_config_entries *entries)
+{
+ git_config_entries *result = NULL;
+ config_entry_list *head;
+ int error;
+
+ if ((error = git_config_entries_new(&result)) < 0)
+ goto out;
+
+ for (head = entries->list; head; head = head->next) {
+ git_config_entry *dup;
+
+ dup = git__calloc(1, sizeof(git_config_entry));
+ dup->name = git__strdup(head->entry->name);
+ GIT_ERROR_CHECK_ALLOC(dup->name);
+ if (head->entry->value) {
+ dup->value = git__strdup(head->entry->value);
+ GIT_ERROR_CHECK_ALLOC(dup->value);
+ }
+ dup->level = head->entry->level;
+ dup->include_depth = head->entry->include_depth;
+
+ if ((error = git_config_entries_append(result, dup)) < 0)
+ goto out;
+ }
+
+ *out = result;
+ result = NULL;
+
+out:
+ git_config_entries_free(result);
+ return error;
+}
+
+void git_config_entries_incref(git_config_entries *entries)
+{
+ GIT_REFCOUNT_INC(entries);
+}
+
+static void config_entries_free(git_config_entries *entries)
+{
+ config_entry_list *list = NULL, *next;
+
+ git_strmap_foreach_value(entries->map, list, config_entry_list_free(list));
+ git_strmap_free(entries->map);
+
+ list = entries->list;
+ while (list != NULL) {
+ next = list->next;
+ git__free(list);
+ list = next;
+ }
+
+ git__free(entries);
+}
+
+void git_config_entries_free(git_config_entries *entries)
+{
+ if (entries)
+ GIT_REFCOUNT_DEC(entries, config_entries_free);
+}
+
+int git_config_entries_append(git_config_entries *entries, git_config_entry *entry)
+{
+ config_entry_list *existing, *var;
+ int error = 0;
+ size_t pos;
+
+ var = git__calloc(1, sizeof(config_entry_list));
+ GIT_ERROR_CHECK_ALLOC(var);
+ var->entry = entry;
+
+ pos = git_strmap_lookup_index(entries->map, entry->name);
+ if (!git_strmap_valid_index(entries->map, pos)) {
+ /*
+ * We only ever inspect `last` from the first config
+ * entry in a multivar. In case where this new entry is
+ * the first one in the entry map, it will also be the
+ * last one at the time of adding it, which is
+ * why we set `last` here to itself. Otherwise we
+ * do not have to set `last` and leave it set to
+ * `NULL`.
+ */
+ var->last = var;
+
+ git_strmap_insert(entries->map, entry->name, var, &error);
+
+ if (error > 0)
+ error = 0;
+ } else {
+ existing = git_strmap_value_at(entries->map, pos);
+ config_entry_list_append(&existing, var);
+ }
+
+ var = git__calloc(1, sizeof(config_entry_list));
+ GIT_ERROR_CHECK_ALLOC(var);
+ var->entry = entry;
+ config_entry_list_append(&entries->list, var);
+
+ return error;
+}
+
+int config_entry_get(config_entry_list **out, git_config_entries *entries, const char *key)
+{
+ size_t pos;
+
+ pos = git_strmap_lookup_index(entries->map, key);
+
+ /* no error message; the config system will write one */
+ if (!git_strmap_valid_index(entries->map, pos))
+ return GIT_ENOTFOUND;
+
+ *out = git_strmap_value_at(entries->map, pos);
+
+ return 0;
+}
+
+int git_config_entries_get(git_config_entry **out, git_config_entries *entries, const char *key)
+{
+ config_entry_list *entry;
+ int error;
+
+ if ((error = config_entry_get(&entry, entries, key)) < 0)
+ return error;
+ *out = entry->last->entry;
+
+ return 0;
+}
+
+int git_config_entries_get_unique(git_config_entry **out, git_config_entries *entries, const char *key)
+{
+ config_entry_list *entry;
+ int error;
+
+ if ((error = config_entry_get(&entry, entries, key)) < 0)
+ return error;
+
+ if (entry->next != NULL) {
+ git_error_set(GIT_ERROR_CONFIG, "entry is not unique due to being a multivar");
+ return -1;
+ }
+
+ if (entry->entry->include_depth) {
+ git_error_set(GIT_ERROR_CONFIG, "entry is not unique due to being included");
+ return -1;
+ }
+
+ *out = entry->entry;
+
+ return 0;
+}
+
+void config_iterator_free(git_config_iterator *iter)
+{
+ config_entries_iterator *it = (config_entries_iterator *) iter;
+ git_config_entries_free(it->entries);
+ git__free(it);
+}
+
+int config_iterator_next(
+ git_config_entry **entry,
+ git_config_iterator *iter)
+{
+ config_entries_iterator *it = (config_entries_iterator *) iter;
+
+ if (!it->head)
+ return GIT_ITEROVER;
+
+ *entry = it->head->entry;
+ it->head = it->head->next;
+
+ return 0;
+}
+
+int git_config_entries_iterator_new(git_config_iterator **out, git_config_entries *entries)
+{
+ config_entries_iterator *it;
+
+ it = git__calloc(1, sizeof(config_entries_iterator));
+ GIT_ERROR_CHECK_ALLOC(it);
+ it->parent.next = config_iterator_next;
+ it->parent.free = config_iterator_free;
+ it->head = entries->list;
+ it->entries = entries;
+
+ git_config_entries_incref(entries);
+ *out = &it->parent;
+
+ return 0;
+}
--- /dev/null
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#include "common.h"
+
+#include "git2/sys/config.h"
+#include "config.h"
+
+typedef struct git_config_entries git_config_entries;
+
+int git_config_entries_new(git_config_entries **out);
+int git_config_entries_dup(git_config_entries **out, git_config_entries *entries);
+void git_config_entries_incref(git_config_entries *entries);
+void git_config_entries_free(git_config_entries *entries);
+/* Add or append the new config option */
+int git_config_entries_append(git_config_entries *entries, git_config_entry *entry);
+int git_config_entries_get(git_config_entry **out, git_config_entries *entries, const char *key);
+int git_config_entries_get_unique(git_config_entry **out, git_config_entries *entries, const char *key);
+int git_config_entries_iterator_new(git_config_iterator **out, git_config_entries *entries);
* a Linking Exception. For full terms see the included COPYING file.
*/
-#include "config_file.h"
-
#include "config.h"
+
#include "filebuf.h"
#include "sysdir.h"
#include "buffer.h"
#include "strmap.h"
#include "array.h"
#include "config_parse.h"
+#include "config_entries.h"
#include <ctype.h>
#include <sys/types.h>
#include <regex.h>
-typedef struct cvar_t {
- struct cvar_t *next;
- git_config_entry *entry;
- bool included; /* whether this is part of [include] */
-} cvar_t;
-
-typedef struct git_config_file_iter {
- git_config_iterator parent;
- git_strmap_iter iter;
- cvar_t* next_var;
-} git_config_file_iter;
-
/* Max depth for [include] directives */
#define MAX_INCLUDE_DEPTH 10
-#define CVAR_LIST_HEAD(list) ((list)->head)
-
-#define CVAR_LIST_TAIL(list) ((list)->tail)
-
-#define CVAR_LIST_NEXT(var) ((var)->next)
-
-#define CVAR_LIST_EMPTY(list) ((list)->head == NULL)
-
-#define CVAR_LIST_APPEND(list, var) do {\
- if (CVAR_LIST_EMPTY(list)) {\
- CVAR_LIST_HEAD(list) = CVAR_LIST_TAIL(list) = var;\
- } else {\
- CVAR_LIST_NEXT(CVAR_LIST_TAIL(list)) = var;\
- CVAR_LIST_TAIL(list) = var;\
- }\
-} while(0)
-
-#define CVAR_LIST_REMOVE_HEAD(list) do {\
- CVAR_LIST_HEAD(list) = CVAR_LIST_NEXT(CVAR_LIST_HEAD(list));\
-} while(0)
-
-#define CVAR_LIST_REMOVE_AFTER(var) do {\
- CVAR_LIST_NEXT(var) = CVAR_LIST_NEXT(CVAR_LIST_NEXT(var));\
-} while(0)
-
-#define CVAR_LIST_FOREACH(list, iter)\
- for ((iter) = CVAR_LIST_HEAD(list);\
- (iter) != NULL;\
- (iter) = CVAR_LIST_NEXT(iter))
-
-/*
- * Inspired by the FreeBSD functions
- */
-#define CVAR_LIST_FOREACH_SAFE(start, iter, tmp)\
- for ((iter) = CVAR_LIST_HEAD(vars);\
- (iter) && (((tmp) = CVAR_LIST_NEXT(iter) || 1));\
- (iter) = (tmp))
-
-typedef struct {
- git_atomic refcount;
- git_strmap *values;
-} refcounted_strmap;
-
typedef struct {
git_config_backend parent;
/* mutex to coordinate accessing the values */
git_mutex values_mutex;
- refcounted_strmap *values;
+ git_config_entries *entries;
const git_repository *repo;
git_config_level_t level;
} diskfile_header;
diskfile_backend *snapshot_from;
} diskfile_readonly_backend;
-static int config_read(git_strmap *values, const git_repository *repo, git_config_file *file, git_config_level_t level, int depth);
+typedef struct {
+ const git_repository *repo;
+ const char *file_path;
+ git_config_entries *entries;
+ git_config_level_t level;
+ unsigned int depth;
+} diskfile_parse_state;
+
+static int config_read(git_config_entries *entries, const git_repository *repo, git_config_file *file, git_config_level_t level, int depth);
static int config_write(diskfile_backend *cfg, const char *orig_key, const char *key, const regex_t *preg, const char *value);
static char *escape_value(const char *ptr);
-int git_config_file__snapshot(git_config_backend **out, diskfile_backend *in);
static int config_snapshot(git_config_backend **out, git_config_backend *in);
static int config_error_readonly(void)
{
- giterr_set(GITERR_CONFIG, "this backend is read-only");
+ git_error_set(GIT_ERROR_CONFIG, "this backend is read-only");
return -1;
}
-static void cvar_free(cvar_t *var)
-{
- if (var == NULL)
- return;
-
- git__free((char*)var->entry->name);
- git__free((char *)var->entry->value);
- git__free(var->entry);
- git__free(var);
-}
-
-int git_config_file_normalize_section(char *start, char *end)
-{
- char *scan;
-
- if (start == end)
- return GIT_EINVALIDSPEC;
-
- /* Validate and downcase range */
- for (scan = start; *scan; ++scan) {
- if (end && scan >= end)
- break;
- if (isalnum(*scan))
- *scan = (char)git__tolower(*scan);
- else if (*scan != '-' || scan == start)
- return GIT_EINVALIDSPEC;
- }
-
- if (scan == start)
- return GIT_EINVALIDSPEC;
-
- return 0;
-}
-
-/* Add or append the new config option */
-static int append_entry(git_strmap *values, cvar_t *var)
-{
- git_strmap_iter pos;
- cvar_t *existing;
- int error = 0;
-
- pos = git_strmap_lookup_index(values, var->entry->name);
- if (!git_strmap_valid_index(values, pos)) {
- git_strmap_insert(values, var->entry->name, var, &error);
- } else {
- existing = git_strmap_value_at(values, pos);
- while (existing->next != NULL) {
- existing = existing->next;
- }
- existing->next = var;
- }
-
- if (error > 0)
- error = 0;
-
- return error;
-}
-
-static void free_vars(git_strmap *values)
-{
- cvar_t *var = NULL;
-
- if (values == NULL)
- return;
-
- git_strmap_foreach_value(values, var,
- while (var != NULL) {
- cvar_t *next = CVAR_LIST_NEXT(var);
- cvar_free(var);
- var = next;
- });
-
- git_strmap_free(values);
-}
-
-static void refcounted_strmap_free(refcounted_strmap *map)
-{
- if (!map)
- return;
-
- if (git_atomic_dec(&map->refcount) != 0)
- return;
-
- free_vars(map->values);
- git__free(map);
-}
-
/**
* Take the current values map from the backend and increase its
* refcount. This is its own function to make sure we use the mutex to
* avoid the map pointer from changing under us.
*/
-static refcounted_strmap *refcounted_strmap_take(diskfile_header *h)
+static git_config_entries *diskfile_entries_take(diskfile_header *h)
{
- refcounted_strmap *map;
+ git_config_entries *entries;
if (git_mutex_lock(&h->values_mutex) < 0) {
- giterr_set(GITERR_OS, "failed to lock config backend");
+ git_error_set(GIT_ERROR_OS, "failed to lock config backend");
return NULL;
}
- map = h->values;
- git_atomic_inc(&map->refcount);
+ entries = h->entries;
+ git_config_entries_incref(entries);
git_mutex_unlock(&h->values_mutex);
- return map;
-}
-
-static int refcounted_strmap_alloc(refcounted_strmap **out)
-{
- refcounted_strmap *map;
- int error;
-
- map = git__calloc(1, sizeof(refcounted_strmap));
- GITERR_CHECK_ALLOC(map);
-
- git_atomic_set(&map->refcount, 1);
-
- if ((error = git_strmap_alloc(&map->values)) < 0)
- git__free(map);
- else
- *out = map;
-
- return error;
+ return entries;
}
static void config_file_clear(struct config_file *file)
b->header.level = level;
b->header.repo = repo;
- if ((res = refcounted_strmap_alloc(&b->header.values)) < 0)
+ if ((res = git_config_entries_new(&b->header.entries)) < 0)
return res;
if (!git_path_exists(b->file.path))
return 0;
- if (res < 0 || (res = config_read(b->header.values->values, repo, &b->file, level, 0)) < 0) {
- refcounted_strmap_free(b->header.values);
- b->header.values = NULL;
+ if (res < 0 || (res = config_read(b->header.entries, repo, &b->file, level, 0)) < 0) {
+ git_config_entries_free(b->header.entries);
+ b->header.entries = NULL;
}
return res;
}
out:
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return error;
}
static int config_refresh(git_config_backend *cfg)
{
diskfile_backend *b = (diskfile_backend *)cfg;
- refcounted_strmap *values = NULL, *tmp;
+ git_config_entries *entries = NULL, *tmp;
git_config_file *include;
int error, modified;
uint32_t i;
if (!modified)
return 0;
- if ((error = refcounted_strmap_alloc(&values)) < 0)
+ if ((error = git_config_entries_new(&entries)) < 0)
goto out;
/* Reparse the current configuration */
}
git_array_clear(b->file.includes);
- if ((error = config_read(values->values, b->header.repo, &b->file, b->header.level, 0)) < 0)
+ if ((error = config_read(entries, b->header.repo, &b->file, b->header.level, 0)) < 0)
goto out;
if ((error = git_mutex_lock(&b->header.values_mutex)) < 0) {
- giterr_set(GITERR_OS, "failed to lock config backend");
+ git_error_set(GIT_ERROR_OS, "failed to lock config backend");
goto out;
}
- tmp = b->header.values;
- b->header.values = values;
- values = tmp;
+ tmp = b->header.entries;
+ b->header.entries = entries;
+ entries = tmp;
git_mutex_unlock(&b->header.values_mutex);
out:
- refcounted_strmap_free(values);
+ git_config_entries_free(entries);
return (error == GIT_ENOTFOUND) ? 0 : error;
}
return;
config_file_clear(&backend->file);
- refcounted_strmap_free(backend->header.values);
+ git_config_entries_free(backend->header.entries);
git_mutex_free(&backend->header.values_mutex);
git__free(backend);
}
-static void config_iterator_free(
- git_config_iterator* iter)
-{
- iter->backend->free(iter->backend);
- git__free(iter);
-}
-
-static int config_iterator_next(
- git_config_entry **entry,
- git_config_iterator *iter)
-{
- git_config_file_iter *it = (git_config_file_iter *) iter;
- diskfile_header *h = (diskfile_header *) it->parent.backend;
- git_strmap *values = h->values->values;
- int err = 0;
- cvar_t * var;
-
- if (it->next_var == NULL) {
- err = git_strmap_next((void**) &var, &(it->iter), values);
- } else {
- var = it->next_var;
- }
-
- if (err < 0) {
- it->next_var = NULL;
- return err;
- }
-
- *entry = var->entry;
- it->next_var = CVAR_LIST_NEXT(var);
-
- return 0;
-}
-
static int config_iterator_new(
git_config_iterator **iter,
struct git_config_backend* backend)
{
- diskfile_header *h;
- git_config_file_iter *it;
- git_config_backend *snapshot;
diskfile_header *bh = (diskfile_header *) backend;
+ git_config_entries *entries;
int error;
- if ((error = config_snapshot(&snapshot, backend)) < 0)
+ if ((error = git_config_entries_dup(&entries, bh->entries)) < 0)
return error;
- if ((error = snapshot->open(snapshot, bh->level, bh->repo)) < 0)
- return error;
-
- it = git__calloc(1, sizeof(git_config_file_iter));
- GITERR_CHECK_ALLOC(it);
-
- h = (diskfile_header *)snapshot;
-
- /* strmap_begin() is currently a macro returning 0 */
- GIT_UNUSED(h);
-
- it->parent.backend = snapshot;
- it->iter = git_strmap_begin(h->values);
- it->next_var = NULL;
-
- it->parent.next = config_iterator_next;
- it->parent.free = config_iterator_free;
- *iter = (git_config_iterator *) it;
+ if ((error = git_config_entries_iterator_new(iter, entries)) < 0)
+ goto out;
- return 0;
+out:
+ /* Let iterator delete duplicated entries when it's done */
+ git_config_entries_free(entries);
+ return error;
}
static int config_set(git_config_backend *cfg, const char *name, const char *value)
{
diskfile_backend *b = (diskfile_backend *)cfg;
- refcounted_strmap *map;
- git_strmap *values;
+ git_config_entries *entries;
+ git_config_entry *existing;
char *key, *esc_value = NULL;
- khiter_t pos;
- int rval, ret;
+ int error;
- if ((rval = git_config__normalize_name(name, &key)) < 0)
- return rval;
+ if ((error = git_config__normalize_name(name, &key)) < 0)
+ return error;
- if ((map = refcounted_strmap_take(&b->header)) == NULL)
+ if ((entries = diskfile_entries_take(&b->header)) == NULL)
return -1;
- values = map->values;
-
- /*
- * Try to find it in the existing values and update it if it
- * only has one value.
- */
- pos = git_strmap_lookup_index(values, key);
- if (git_strmap_valid_index(values, pos)) {
- cvar_t *existing = git_strmap_value_at(values, pos);
- if (existing->next != NULL) {
- giterr_set(GITERR_CONFIG, "multivar incompatible with simple set");
- ret = -1;
+ /* Check whether we'd be modifying an included or multivar key */
+ if ((error = git_config_entries_get_unique(&existing, entries, key)) < 0) {
+ if (error != GIT_ENOTFOUND)
goto out;
- }
-
- if (existing->included) {
- giterr_set(GITERR_CONFIG, "modifying included variable is not supported");
- ret = -1;
- goto out;
- }
-
+ error = 0;
+ } else if ((!existing->value && !value) ||
+ (existing->value && value && !strcmp(existing->value, value))) {
/* don't update if old and new values already match */
- if ((!existing->entry->value && !value) ||
- (existing->entry->value && value &&
- !strcmp(existing->entry->value, value))) {
- ret = 0;
- goto out;
- }
+ error = 0;
+ goto out;
}
/* No early returns due to sanity checks, let's write it out and refresh */
-
if (value) {
esc_value = escape_value(value);
- GITERR_CHECK_ALLOC(esc_value);
+ GIT_ERROR_CHECK_ALLOC(esc_value);
}
- if ((ret = config_write(b, name, key, NULL, esc_value)) < 0)
+ if ((error = config_write(b, name, key, NULL, esc_value)) < 0)
goto out;
- ret = config_refresh(cfg);
+ error = config_refresh(cfg);
out:
- refcounted_strmap_free(map);
+ git_config_entries_free(entries);
git__free(esc_value);
git__free(key);
- return ret;
+ return error;
}
/* release the map containing the entry as an equivalent to freeing it */
-static void release_map(git_config_entry *entry)
+static void free_diskfile_entry(git_config_entry *entry)
{
- refcounted_strmap *map = (refcounted_strmap *) entry->payload;
- refcounted_strmap_free(map);
+ git_config_entries *entries = (git_config_entries *) entry->payload;
+ git_config_entries_free(entries);
}
/*
static int config_get(git_config_backend *cfg, const char *key, git_config_entry **out)
{
diskfile_header *h = (diskfile_header *)cfg;
- refcounted_strmap *map;
- git_strmap *values;
- khiter_t pos;
- cvar_t *var;
+ git_config_entries *entries = NULL;
+ git_config_entry *entry;
int error = 0;
if (!h->parent.readonly && ((error = config_refresh(cfg)) < 0))
return error;
- if ((map = refcounted_strmap_take(h)) == NULL)
+ if ((entries = diskfile_entries_take(h)) == NULL)
return -1;
- values = map->values;
-
- pos = git_strmap_lookup_index(values, key);
- /* no error message; the config system will write one */
- if (!git_strmap_valid_index(values, pos)) {
- refcounted_strmap_free(map);
- return GIT_ENOTFOUND;
+ if ((error = (git_config_entries_get(&entry, entries, key))) < 0) {
+ git_config_entries_free(entries);
+ return error;
}
- var = git_strmap_value_at(values, pos);
- while (var->next)
- var = var->next;
-
- *out = var->entry;
- (*out)->free = release_map;
- (*out)->payload = map;
+ entry->free = free_diskfile_entry;
+ entry->payload = entries;
+ *out = entry;
- return error;
+ return 0;
}
static int config_set_multivar(
result = p_regcomp(&preg, regexp, REG_EXTENDED);
if (result != 0) {
- giterr_set_regex(&preg, result);
+ git_error_set_regex(&preg, result);
result = -1;
goto out;
}
static int config_delete(git_config_backend *cfg, const char *name)
{
- cvar_t *var;
diskfile_backend *b = (diskfile_backend *)cfg;
- refcounted_strmap *map; git_strmap *values;
- char *key;
- int result;
- khiter_t pos;
-
- if ((result = git_config__normalize_name(name, &key)) < 0)
- return result;
-
- if ((map = refcounted_strmap_take(&b->header)) == NULL)
- return -1;
- values = b->header.values->values;
-
- pos = git_strmap_lookup_index(values, key);
- git__free(key);
+ git_config_entries *entries = NULL;
+ git_config_entry *entry;
+ char *key = NULL;
+ int error;
- if (!git_strmap_valid_index(values, pos)) {
- refcounted_strmap_free(map);
- giterr_set(GITERR_CONFIG, "could not find key '%s' to delete", name);
- return GIT_ENOTFOUND;
- }
+ if ((error = git_config__normalize_name(name, &key)) < 0)
+ goto out;
- var = git_strmap_value_at(values, pos);
- refcounted_strmap_free(map);
+ if ((entries = diskfile_entries_take(&b->header)) == NULL)
+ goto out;
- if (var->included) {
- giterr_set(GITERR_CONFIG, "cannot delete included variable");
- return -1;
+ /* Check whether we'd be modifying an included or multivar key */
+ if ((error = git_config_entries_get_unique(&entry, entries, key)) < 0) {
+ if (error == GIT_ENOTFOUND)
+ git_error_set(GIT_ERROR_CONFIG, "could not find key '%s' to delete", name);
+ goto out;
}
- if (var->next != NULL) {
- giterr_set(GITERR_CONFIG, "cannot delete multivar with a single delete");
- return -1;
- }
+ if ((error = config_write(b, name, entry->name, NULL, NULL)) < 0)
+ goto out;
- if ((result = config_write(b, name, var->entry->name, NULL, NULL)) < 0)
- return result;
+ if ((error = config_refresh(cfg)) < 0)
+ goto out;
- return config_refresh(cfg);
+out:
+ git_config_entries_free(entries);
+ git__free(key);
+ return error;
}
static int config_delete_multivar(git_config_backend *cfg, const char *name, const char *regexp)
{
diskfile_backend *b = (diskfile_backend *)cfg;
- refcounted_strmap *map;
- git_strmap *values;
- char *key;
- regex_t preg;
+ git_config_entries *entries = NULL;
+ git_config_entry *entry = NULL;
+ regex_t preg = { 0 };
+ char *key = NULL;
int result;
- khiter_t pos;
if ((result = git_config__normalize_name(name, &key)) < 0)
- return result;
-
- if ((map = refcounted_strmap_take(&b->header)) == NULL)
- return -1;
- values = b->header.values->values;
-
- pos = git_strmap_lookup_index(values, key);
+ goto out;
- if (!git_strmap_valid_index(values, pos)) {
- refcounted_strmap_free(map);
- git__free(key);
- giterr_set(GITERR_CONFIG, "could not find key '%s' to delete", name);
- return GIT_ENOTFOUND;
+ if ((entries = diskfile_entries_take(&b->header)) == NULL) {
+ result = -1;
+ goto out;
}
- refcounted_strmap_free(map);
+ if ((result = git_config_entries_get(&entry, entries, key)) < 0) {
+ if (result == GIT_ENOTFOUND)
+ git_error_set(GIT_ERROR_CONFIG, "could not find key '%s' to delete", name);
+ goto out;
+ }
- result = p_regcomp(&preg, regexp, REG_EXTENDED);
- if (result != 0) {
- giterr_set_regex(&preg, result);
+ if ((result = p_regcomp(&preg, regexp, REG_EXTENDED)) != 0) {
+ git_error_set_regex(&preg, result);
result = -1;
goto out;
}
if ((result = config_write(b, name, key, &preg, NULL)) < 0)
goto out;
- result = config_refresh(cfg);
+ if ((result = config_refresh(cfg)) < 0)
+ goto out;
out:
+ git_config_entries_free(entries);
git__free(key);
regfree(&preg);
return result;
}
-static int config_snapshot(git_config_backend **out, git_config_backend *in)
-{
- diskfile_backend *b = (diskfile_backend *) in;
-
- return git_config_file__snapshot(out, b);
-}
-
static int config_lock(git_config_backend *_cfg)
{
diskfile_backend *cfg = (diskfile_backend *) _cfg;
}
git_filebuf_cleanup(&cfg->locked_buf);
- git_buf_free(&cfg->locked_content);
+ git_buf_dispose(&cfg->locked_content);
cfg->locked = false;
return error;
}
-int git_config_file__ondisk(git_config_backend **out, const char *path)
+int git_config_backend_from_file(git_config_backend **out, const char *path)
{
diskfile_backend *backend;
backend = git__calloc(1, sizeof(diskfile_backend));
- GITERR_CHECK_ALLOC(backend);
+ GIT_ERROR_CHECK_ALLOC(backend);
backend->header.parent.version = GIT_CONFIG_BACKEND_VERSION;
git_mutex_init(&backend->header.values_mutex);
backend->file.path = git__strdup(path);
- GITERR_CHECK_ALLOC(backend->file.path);
+ GIT_ERROR_CHECK_ALLOC(backend->file.path);
git_array_init(backend->file.includes);
backend->header.parent.open = config_open;
if (backend == NULL)
return;
- refcounted_strmap_free(backend->header.values);
+ git_config_entries_free(backend->header.entries);
git_mutex_free(&backend->header.values_mutex);
git__free(backend);
}
diskfile_readonly_backend *b = (diskfile_readonly_backend *) cfg;
diskfile_backend *src = b->snapshot_from;
diskfile_header *src_header = &src->header;
- refcounted_strmap *src_map;
+ git_config_entries *entries;
int error;
if (!src_header->parent.readonly && (error = config_refresh(&src_header->parent)) < 0)
GIT_UNUSED(level);
GIT_UNUSED(repo);
- if ((src_map = refcounted_strmap_take(src_header)) == NULL)
+ if ((entries = diskfile_entries_take(src_header)) == NULL)
return -1;
- b->header.values = src_map;
+ b->header.entries = entries;
return 0;
}
-int git_config_file__snapshot(git_config_backend **out, diskfile_backend *in)
+static int config_snapshot(git_config_backend **out, git_config_backend *in)
{
diskfile_readonly_backend *backend;
backend = git__calloc(1, sizeof(diskfile_readonly_backend));
- GITERR_CHECK_ALLOC(backend);
+ GIT_ERROR_CHECK_ALLOC(backend);
backend->header.parent.version = GIT_CONFIG_BACKEND_VERSION;
git_mutex_init(&backend->header.values_mutex);
- backend->snapshot_from = in;
+ backend->snapshot_from = (diskfile_backend *) in;
backend->header.parent.readonly = 1;
backend->header.parent.version = GIT_CONFIG_BACKEND_VERSION;
ptr++;
}
- if (git_buf_oom(&buf)) {
- git_buf_free(&buf);
+ if (git_buf_oom(&buf))
return NULL;
- }
return git_buf_detach(&buf);
}
-struct parse_data {
- const git_repository *repo;
- const char *file_path;
- git_strmap *values;
- git_config_level_t level;
- int depth;
-};
-
static int parse_include(git_config_parser *reader,
- struct parse_data *parse_data, const char *file)
+ diskfile_parse_state *parse_data, const char *file)
{
struct config_file *include;
git_buf path = GIT_BUF_INIT;
git_array_init(include->includes);
include->path = git_buf_detach(&path);
- result = config_read(parse_data->values, parse_data->repo,
+ result = config_read(parse_data->entries, parse_data->repo,
include, parse_data->level, parse_data->depth+1);
if (result == GIT_ENOTFOUND) {
- giterr_clear();
+ git_error_clear();
result = 0;
}
*matches = (error == 0);
out:
- git_buf_free(&path);
+ git_buf_dispose(&path);
return error;
}
};
static int parse_conditional_include(git_config_parser *reader,
- struct parse_data *parse_data, const char *section, const char *file)
+ diskfile_parse_state *parse_data, const char *section, const char *file)
{
char *condition;
size_t i;
static int read_on_variable(
git_config_parser *reader,
const char *current_section,
- char *var_name,
- char *var_value,
+ const char *var_name,
+ const char *var_value,
const char *line,
size_t line_len,
void *data)
{
- struct parse_data *parse_data = (struct parse_data *)data;
+ diskfile_parse_state *parse_data = (diskfile_parse_state *)data;
git_buf buf = GIT_BUF_INIT;
- cvar_t *var;
+ git_config_entry *entry;
+ const char *c;
int result = 0;
GIT_UNUSED(line);
git_buf_puts(&buf, current_section);
git_buf_putc(&buf, '.');
}
- git__strtolower(var_name);
- git_buf_puts(&buf, var_name);
- git__free(var_name);
- if (git_buf_oom(&buf)) {
- git__free(var_value);
- return -1;
- }
+ for (c = var_name; *c; c++)
+ git_buf_putc(&buf, git__tolower(*c));
- var = git__calloc(1, sizeof(cvar_t));
- GITERR_CHECK_ALLOC(var);
- var->entry = git__calloc(1, sizeof(git_config_entry));
- GITERR_CHECK_ALLOC(var->entry);
+ if (git_buf_oom(&buf))
+ return -1;
- var->entry->name = git_buf_detach(&buf);
- var->entry->value = var_value;
- var->entry->level = parse_data->level;
- var->included = !!parse_data->depth;
+ entry = git__calloc(1, sizeof(git_config_entry));
+ GIT_ERROR_CHECK_ALLOC(entry);
+ entry->name = git_buf_detach(&buf);
+ entry->value = var_value ? git__strdup(var_value) : NULL;
+ entry->level = parse_data->level;
+ entry->include_depth = parse_data->depth;
- if ((result = append_entry(parse_data->values, var)) < 0)
+ if ((result = git_config_entries_append(parse_data->entries, entry)) < 0)
return result;
result = 0;
/* Add or append the new config option */
- if (!git__strcmp(var->entry->name, "include.path"))
- result = parse_include(reader, parse_data, var->entry->value);
- else if (!git__prefixcmp(var->entry->name, "includeif.") &&
- !git__suffixcmp(var->entry->name, ".path"))
+ if (!git__strcmp(entry->name, "include.path"))
+ result = parse_include(reader, parse_data, entry->value);
+ else if (!git__prefixcmp(entry->name, "includeif.") &&
+ !git__suffixcmp(entry->name, ".path"))
result = parse_conditional_include(reader, parse_data,
- var->entry->name, var->entry->value);
-
+ entry->name, entry->value);
return result;
}
static int config_read(
- git_strmap *values,
+ git_config_entries *entries,
const git_repository *repo,
git_config_file *file,
git_config_level_t level,
int depth)
{
- struct parse_data parse_data;
+ diskfile_parse_state parse_data;
git_config_parser reader;
git_buf contents = GIT_BUF_INIT;
int error;
if (depth >= MAX_INCLUDE_DEPTH) {
- giterr_set(GITERR_CONFIG, "maximum config include depth reached");
+ git_error_set(GIT_ERROR_CONFIG, "maximum config include depth reached");
return -1;
}
parse_data.repo = repo;
parse_data.file_path = file->path;
- parse_data.values = values;
+ parse_data.entries = entries;
parse_data.level = level;
parse_data.depth = depth;
error = git_config_parse(&reader, NULL, read_on_variable, NULL, NULL, &parse_data);
out:
- git_buf_free(&contents);
+ git_buf_dispose(&contents);
return error;
}
char *escaped;
git_buf_put(&buf, key, dot - key);
escaped = escape_value(dot + 1);
- GITERR_CHECK_ALLOC(escaped);
+ GIT_ERROR_CHECK_ALLOC(escaped);
git_buf_printf(&buf, " \"%s\"", escaped);
git__free(escaped);
}
return -1;
result = git_buf_put(fbuf, git_buf_cstr(&buf), buf.size);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return result;
}
static int write_on_variable(
git_config_parser *reader,
const char *current_section,
- char *var_name,
- char *var_value,
+ const char *var_name,
+ const char *var_value,
const char *line,
size_t line_len,
void *data)
if (has_matched && write_data->preg != NULL)
has_matched = (regexec(write_data->preg, var_value, 0, NULL, 0) == 0);
- git__free(var_name);
- git__free(var_value);
-
/* If this isn't the name/value we're looking for, simply dump the
* existing data back out and continue on.
*/
/* Lock the file */
if ((result = git_filebuf_open(
&file, cfg->file.path, GIT_FILEBUF_HASH_CONTENTS, GIT_CONFIG_FILE_MODE)) < 0) {
- git_buf_free(&contents);
+ git_buf_dispose(&contents);
return result;
}
ldot = strrchr(key, '.');
name = ldot + 1;
section = git__strndup(key, ldot - key);
- GITERR_CHECK_ALLOC(section);
+ GIT_ERROR_CHECK_ALLOC(section);
ldot = strrchr(orig_key, '.');
orig_name = ldot + 1;
orig_section = git__strndup(orig_key, ldot - orig_key);
- GITERR_CHECK_ALLOC(orig_section);
+ GIT_ERROR_CHECK_ALLOC(orig_section);
write_data.buf = &buf;
git_buf_init(&write_data.buffered_comment, 0);
&write_data);
git__free(section);
git__free(orig_section);
- git_buf_free(&write_data.buffered_comment);
+ git_buf_dispose(&write_data.buffered_comment);
if (result < 0) {
git_filebuf_cleanup(&file);
if (cfg->locked) {
size_t len = buf.asize;
/* Update our copy with the modified contents */
- git_buf_free(&cfg->locked_content);
+ git_buf_dispose(&cfg->locked_content);
git_buf_attach(&cfg->locked_content, git_buf_detach(&buf), len);
} else {
git_filebuf_write(&file, git_buf_cstr(&buf), git_buf_len(&buf));
}
done:
- git_buf_free(&buf);
- git_buf_free(&contents);
+ git_buf_dispose(&buf);
+ git_buf_dispose(&contents);
git_parse_ctx_clear(&reader.ctx);
return result;
}
+++ /dev/null
-/*
- * Copyright (C) the libgit2 contributors. All rights reserved.
- *
- * This file is part of libgit2, distributed under the GNU GPL v2 with
- * a Linking Exception. For full terms see the included COPYING file.
- */
-#ifndef INCLUDE_config_file_h__
-#define INCLUDE_config_file_h__
-
-#include "common.h"
-
-#include "git2/sys/config.h"
-#include "git2/config.h"
-
-GIT_INLINE(int) git_config_file_open(git_config_backend *cfg, unsigned int level, const git_repository *repo)
-{
- return cfg->open(cfg, level, repo);
-}
-
-GIT_INLINE(void) git_config_file_free(git_config_backend *cfg)
-{
- if (cfg)
- cfg->free(cfg);
-}
-
-GIT_INLINE(int) git_config_file_get_string(
- git_config_entry **out, git_config_backend *cfg, const char *name)
-{
- return cfg->get(cfg, name, out);
-}
-
-GIT_INLINE(int) git_config_file_set_string(
- git_config_backend *cfg, const char *name, const char *value)
-{
- return cfg->set(cfg, name, value);
-}
-
-GIT_INLINE(int) git_config_file_delete(
- git_config_backend *cfg, const char *name)
-{
- return cfg->del(cfg, name);
-}
-
-GIT_INLINE(int) git_config_file_foreach(
- git_config_backend *cfg,
- int (*fn)(const git_config_entry *entry, void *data),
- void *data)
-{
- return git_config_backend_foreach_match(cfg, NULL, fn, data);
-}
-
-GIT_INLINE(int) git_config_file_foreach_match(
- git_config_backend *cfg,
- const char *regexp,
- int (*fn)(const git_config_entry *entry, void *data),
- void *data)
-{
- return git_config_backend_foreach_match(cfg, regexp, fn, data);
-}
-
-GIT_INLINE(int) git_config_file_lock(git_config_backend *cfg)
-{
- return cfg->lock(cfg);
-}
-
-GIT_INLINE(int) git_config_file_unlock(git_config_backend *cfg, int success)
-{
- return cfg->unlock(cfg, success);
-}
-
-extern int git_config_file_normalize_section(char *start, char *end);
-
-#endif
--- /dev/null
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#include "config.h"
+
+#include "config_backend.h"
+#include "config_parse.h"
+#include "config_entries.h"
+
+typedef struct {
+ git_config_backend parent;
+ git_config_entries *entries;
+ git_buf cfg;
+} config_memory_backend;
+
+typedef struct {
+ git_config_entries *entries;
+ git_config_level_t level;
+} config_memory_parse_data;
+
+static int config_error_readonly(void)
+{
+ git_error_set(GIT_ERROR_CONFIG, "this backend is read-only");
+ return -1;
+}
+
+static int read_variable_cb(
+ git_config_parser *reader,
+ const char *current_section,
+ const char *var_name,
+ const char *var_value,
+ const char *line,
+ size_t line_len,
+ void *payload)
+{
+ config_memory_parse_data *parse_data = (config_memory_parse_data *) payload;
+ git_buf buf = GIT_BUF_INIT;
+ git_config_entry *entry;
+ const char *c;
+ int result;
+
+ GIT_UNUSED(reader);
+ GIT_UNUSED(line);
+ GIT_UNUSED(line_len);
+
+ if (current_section) {
+ /* TODO: Once warnings land, we should likely warn
+ * here. Git appears to warn in most cases if it sees
+ * un-namespaced config options.
+ */
+ git_buf_puts(&buf, current_section);
+ git_buf_putc(&buf, '.');
+ }
+
+ for (c = var_name; *c; c++)
+ git_buf_putc(&buf, git__tolower(*c));
+
+ if (git_buf_oom(&buf))
+ return -1;
+
+ entry = git__calloc(1, sizeof(git_config_entry));
+ GIT_ERROR_CHECK_ALLOC(entry);
+ entry->name = git_buf_detach(&buf);
+ entry->value = var_value ? git__strdup(var_value) : NULL;
+ entry->level = parse_data->level;
+ entry->include_depth = 0;
+
+ if ((result = git_config_entries_append(parse_data->entries, entry)) < 0)
+ return result;
+
+ return result;
+}
+
+static int config_memory_open(git_config_backend *backend, git_config_level_t level, const git_repository *repo)
+{
+ config_memory_backend *memory_backend = (config_memory_backend *) backend;
+ config_memory_parse_data parse_data;
+ git_config_parser reader;
+
+ GIT_UNUSED(repo);
+
+ if (memory_backend->cfg.size == 0)
+ return 0;
+
+ git_parse_ctx_init(&reader.ctx, memory_backend->cfg.ptr, memory_backend->cfg.size);
+ reader.file = NULL;
+ parse_data.entries = memory_backend->entries;
+ parse_data.level = level;
+
+ return git_config_parse(&reader, NULL, read_variable_cb, NULL, NULL, &parse_data);
+}
+
+static int config_memory_get(git_config_backend *backend, const char *key, git_config_entry **out)
+{
+ config_memory_backend *memory_backend = (config_memory_backend *) backend;
+ return git_config_entries_get(out, memory_backend->entries, key);
+}
+
+static int config_memory_iterator(
+ git_config_iterator **iter,
+ git_config_backend *backend)
+{
+ config_memory_backend *memory_backend = (config_memory_backend *) backend;
+ git_config_entries *entries;
+ int error;
+
+ if ((error = git_config_entries_dup(&entries, memory_backend->entries)) < 0)
+ goto out;
+
+ if ((error = git_config_entries_iterator_new(iter, entries)) < 0)
+ goto out;
+
+out:
+ /* Let iterator delete duplicated entries when it's done */
+ git_config_entries_free(entries);
+ return error;
+}
+
+static int config_memory_set(git_config_backend *backend, const char *name, const char *value)
+{
+ GIT_UNUSED(backend);
+ GIT_UNUSED(name);
+ GIT_UNUSED(value);
+ return config_error_readonly();
+}
+
+static int config_memory_set_multivar(
+ git_config_backend *backend, const char *name, const char *regexp, const char *value)
+{
+ GIT_UNUSED(backend);
+ GIT_UNUSED(name);
+ GIT_UNUSED(regexp);
+ GIT_UNUSED(value);
+ return config_error_readonly();
+}
+
+static int config_memory_delete(git_config_backend *backend, const char *name)
+{
+ GIT_UNUSED(backend);
+ GIT_UNUSED(name);
+ return config_error_readonly();
+}
+
+static int config_memory_delete_multivar(git_config_backend *backend, const char *name, const char *regexp)
+{
+ GIT_UNUSED(backend);
+ GIT_UNUSED(name);
+ GIT_UNUSED(regexp);
+ return config_error_readonly();
+}
+
+static int config_memory_lock(git_config_backend *backend)
+{
+ GIT_UNUSED(backend);
+ return config_error_readonly();
+}
+
+static int config_memory_unlock(git_config_backend *backend, int success)
+{
+ GIT_UNUSED(backend);
+ GIT_UNUSED(success);
+ return config_error_readonly();
+}
+
+static int config_memory_snapshot(git_config_backend **out, git_config_backend *backend)
+{
+ GIT_UNUSED(out);
+ GIT_UNUSED(backend);
+ git_error_set(GIT_ERROR_CONFIG, "this backend does not support snapshots");
+ return -1;
+}
+
+static void config_memory_free(git_config_backend *_backend)
+{
+ config_memory_backend *backend = (config_memory_backend *)_backend;
+
+ if (backend == NULL)
+ return;
+
+ git_config_entries_free(backend->entries);
+ git_buf_dispose(&backend->cfg);
+ git__free(backend);
+}
+
+int git_config_backend_from_string(git_config_backend **out, const char *cfg, size_t len)
+{
+ config_memory_backend *backend;
+
+ backend = git__calloc(1, sizeof(config_memory_backend));
+ GIT_ERROR_CHECK_ALLOC(backend);
+
+ if (git_config_entries_new(&backend->entries) < 0) {
+ git__free(backend);
+ return -1;
+ }
+
+ if (git_buf_set(&backend->cfg, cfg, len) < 0) {
+ git_config_entries_free(backend->entries);
+ git__free(backend);
+ return -1;
+ }
+
+ backend->parent.version = GIT_CONFIG_BACKEND_VERSION;
+ backend->parent.readonly = 1;
+ backend->parent.open = config_memory_open;
+ backend->parent.get = config_memory_get;
+ backend->parent.set = config_memory_set;
+ backend->parent.set_multivar = config_memory_set_multivar;
+ backend->parent.del = config_memory_delete;
+ backend->parent.del_multivar = config_memory_delete_multivar;
+ backend->parent.iterator = config_memory_iterator;
+ backend->parent.lock = config_memory_lock;
+ backend->parent.unlock = config_memory_unlock;
+ backend->parent.snapshot = config_memory_snapshot;
+ backend->parent.free = config_memory_free;
+
+ *out = (git_config_backend *)backend;
+
+ return 0;
+}
#include <ctype.h>
+const char *git_config_escapes = "ntb\"\\";
+const char *git_config_escaped = "\n\t\b\"\\";
+
static void set_parse_error(git_config_parser *reader, int col, const char *error_str)
{
- giterr_set(GITERR_CONFIG, "failed to parse config file: %s (in %s:%"PRIuZ", column %d)",
- error_str, reader->file->path, reader->ctx.line_num, col);
+ const char *file = reader->file ? reader->file->path : "in-memory";
+ git_error_set(GIT_ERROR_CONFIG, "failed to parse config file: %s (in %s:%"PRIuZ", column %d)",
+ error_str, file, reader->ctx.line_num, col);
}
{
int c, rpos;
char *first_quote, *last_quote;
+ const char *line_start = line;
git_buf buf = GIT_BUF_INIT;
size_t quoted_len, alloc_len, base_name_len = strlen(base_name);
goto end_error;
}
- GITERR_CHECK_ALLOC_ADD(&alloc_len, base_name_len, quoted_len);
- GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 2);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, base_name_len, quoted_len);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 2);
if (git_buf_grow(&buf, alloc_len) < 0 ||
git_buf_printf(&buf, "%s.", base_name) < 0)
if (line[rpos] != '"' || line[rpos + 1] != ']') {
set_parse_error(reader, rpos, "Unexpected text after closing quotes");
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return -1;
}
*section_name = git_buf_detach(&buf);
- return 0;
+ return &line[rpos + 2] - line_start; /* rpos is at the closing quote */
end_error:
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return -1;
}
return -1;
}
- GITERR_CHECK_ALLOC_ADD(&line_len, (size_t)(name_end - line), 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&line_len, (size_t)(name_end - line), 1);
name = git__malloc(line_len);
- GITERR_CHECK_ALLOC(name);
+ GIT_ERROR_CHECK_ALLOC(name);
name_length = 0;
pos = 0;
name[name_length] = 0;
*section_out = name;
- return 0;
+ return pos;
fail_parse:
git__free(line);
*fixed++ = git_config_escaped[esc - git_config_escapes];
} else {
git__free(str);
- giterr_set(GITERR_CONFIG, "invalid escape at %s", ptr);
+ git_error_set(GIT_ERROR_CONFIG, "invalid escape at %s", ptr);
return -1;
}
}
/* Check that the next line exists */
git_parse_advance_line(&reader->ctx);
line = git__strndup(reader->ctx.line, reader->ctx.line_len);
- GITERR_CHECK_ALLOC(line);
+ GIT_ERROR_CHECK_ALLOC(line);
/*
* We've reached the end of the file, there is no continuation.
static int parse_variable(git_config_parser *reader, char **var_name, char **var_value)
{
const char *value_start = NULL;
- char *line;
- int quote_count;
+ char *line = NULL, *name = NULL, *value = NULL;
+ int quote_count, error;
bool multiline;
+ *var_name = NULL;
+ *var_value = NULL;
+
git_parse_advance_ws(&reader->ctx);
line = git__strndup(reader->ctx.line, reader->ctx.line_len);
- if (line == NULL)
- return -1;
+ GIT_ERROR_CHECK_ALLOC(line);
quote_count = strip_comments(line, 0);
- /* If there is no value, boolean true is assumed */
- *var_value = NULL;
-
- if (parse_name(var_name, &value_start, reader, line) < 0)
- goto on_error;
+ if ((error = parse_name(&name, &value_start, reader, line)) < 0)
+ goto out;
/*
* Now, let's try to parse the value
while (git__isspace(value_start[0]))
value_start++;
- if (unescape_line(var_value, &multiline, value_start, 0) < 0)
- goto on_error;
+ if ((error = unescape_line(&value, &multiline, value_start, 0)) < 0)
+ goto out;
if (multiline) {
git_buf multi_value = GIT_BUF_INIT;
- git_buf_attach(&multi_value, *var_value, 0);
+ git_buf_attach(&multi_value, value, 0);
+ value = NULL;
if (parse_multiline_variable(reader, &multi_value, quote_count) < 0 ||
- git_buf_oom(&multi_value)) {
- git_buf_free(&multi_value);
- goto on_error;
+ git_buf_oom(&multi_value)) {
+ error = -1;
+ git_buf_dispose(&multi_value);
+ goto out;
}
- *var_value = git_buf_detach(&multi_value);
+ value = git_buf_detach(&multi_value);
}
}
- git__free(line);
- return 0;
+ *var_name = name;
+ *var_value = value;
+ name = NULL;
+ value = NULL;
-on_error:
- git__free(*var_name);
+out:
+ git__free(name);
+ git__free(value);
git__free(line);
- return -1;
+ return error;
}
int git_config_parse(
void *data)
{
git_parse_ctx *ctx;
- char *current_section = NULL, *var_name, *var_value;
+ char *current_section = NULL, *var_name = NULL, *var_value = NULL;
int result = 0;
ctx = &parser->ctx;
skip_bom(ctx);
for (; ctx->remain_len > 0; git_parse_advance_line(ctx)) {
- const char *line_start = parser->ctx.line;
- size_t line_len = parser->ctx.line_len;
+ const char *line_start;
+ size_t line_len;
char c;
+ restart:
+ line_start = ctx->line;
+ line_len = ctx->line_len;
+
/*
* Get either first non-whitespace character or, if that does
* not exist, the first whitespace character. This is required
git__free(current_section);
current_section = NULL;
- if ((result = parse_section_header(parser, ¤t_section)) == 0 && on_section) {
+ result = parse_section_header(parser, ¤t_section);
+ if (result < 0)
+ break;
+
+ git_parse_advance_chars(ctx, result);
+
+ if (on_section)
result = on_section(parser, current_section, line_start, line_len, data);
- }
+ /*
+ * After we've parsed the section header we may not be
+ * done with the line. If there's still data in there,
+ * run the next loop with the rest of the current line
+ * instead of moving forward.
+ */
+
+ if (!git_parse_peek(&c, ctx, GIT_PARSE_PEEK_SKIP_WHITESPACE))
+ goto restart;
+
break;
case '\n': /* comment or whitespace-only */
default: /* assume variable declaration */
if ((result = parse_variable(parser, &var_name, &var_value)) == 0 && on_variable) {
result = on_variable(parser, current_section, var_name, var_value, line_start, line_len, data);
+ git__free(var_name);
+ git__free(var_value);
}
+
break;
}
#include "oid.h"
#include "parse.h"
-static const char *git_config_escapes = "ntb\"\\";
-static const char *git_config_escaped = "\n\t\b\"\\";
+extern const char *git_config_escapes;
+extern const char *git_config_escaped;
typedef struct config_file {
git_oid checksum;
typedef int (*git_config_parser_variable_cb)(
git_config_parser *parser,
const char *current_section,
- char *var_name,
- char *var_value,
+ const char *var_name,
+ const char *var_value,
const char *line,
size_t line_len,
void *data);
#include "buf_text.h"
#include "repository.h"
+typedef enum {
+ GIT_CRLF_UNDEFINED,
+ GIT_CRLF_BINARY,
+ GIT_CRLF_TEXT,
+ GIT_CRLF_TEXT_INPUT,
+ GIT_CRLF_TEXT_CRLF,
+ GIT_CRLF_AUTO,
+ GIT_CRLF_AUTO_INPUT,
+ GIT_CRLF_AUTO_CRLF,
+} git_crlf_t;
+
struct crlf_attrs {
- int crlf_action;
- int eol;
+ int attr_action; /* the .gitattributes setting */
+ int crlf_action; /* the core.autocrlf setting */
+
int auto_crlf;
int safe_crlf;
+ int core_eol;
};
struct crlf_filter {
git_filter f;
};
-static int check_crlf(const char *value)
+static git_crlf_t check_crlf(const char *value)
{
if (GIT_ATTR_TRUE(value))
return GIT_CRLF_TEXT;
-
- if (GIT_ATTR_FALSE(value))
+ else if (GIT_ATTR_FALSE(value))
return GIT_CRLF_BINARY;
-
- if (GIT_ATTR_UNSPECIFIED(value))
- return GIT_CRLF_GUESS;
-
- if (strcmp(value, "input") == 0)
- return GIT_CRLF_INPUT;
-
- if (strcmp(value, "auto") == 0)
+ else if (GIT_ATTR_UNSPECIFIED(value))
+ ;
+ else if (strcmp(value, "input") == 0)
+ return GIT_CRLF_TEXT_INPUT;
+ else if (strcmp(value, "auto") == 0)
return GIT_CRLF_AUTO;
- return GIT_CRLF_GUESS;
+ return GIT_CRLF_UNDEFINED;
}
-static int check_eol(const char *value)
+static git_cvar_value check_eol(const char *value)
{
if (GIT_ATTR_UNSPECIFIED(value))
- return GIT_EOL_UNSET;
-
- if (strcmp(value, "lf") == 0)
+ ;
+ else if (strcmp(value, "lf") == 0)
return GIT_EOL_LF;
-
- if (strcmp(value, "crlf") == 0)
+ else if (strcmp(value, "crlf") == 0)
return GIT_EOL_CRLF;
return GIT_EOL_UNSET;
}
-static int crlf_input_action(struct crlf_attrs *ca)
-{
- if (ca->crlf_action == GIT_CRLF_BINARY)
- return GIT_CRLF_BINARY;
-
- if (ca->eol == GIT_EOL_LF)
- return GIT_CRLF_INPUT;
-
- if (ca->eol == GIT_EOL_CRLF)
- return GIT_CRLF_CRLF;
-
- return ca->crlf_action;
-}
-
static int has_cr_in_index(const git_filter_source *src)
{
git_repository *repo = git_filter_source_repo(src);
return false;
if (git_repository_index__weakptr(&index, repo) < 0) {
- giterr_clear();
+ git_error_clear();
return false;
}
return found_cr;
}
-static int crlf_apply_to_odb(
- struct crlf_attrs *ca,
- git_buf *to,
- const git_buf *from,
- const git_filter_source *src)
+static int text_eol_is_crlf(struct crlf_attrs *ca)
{
- /* Empty file? Nothing to do */
- if (!git_buf_len(from))
+ if (ca->auto_crlf == GIT_AUTO_CRLF_TRUE)
+ return 1;
+ else if (ca->auto_crlf == GIT_AUTO_CRLF_INPUT)
return 0;
- /* Heuristics to see if we can skip the conversion.
- * Straight from Core Git.
- */
- if (ca->crlf_action == GIT_CRLF_AUTO || ca->crlf_action == GIT_CRLF_GUESS) {
- git_buf_text_stats stats;
+ if (ca->core_eol == GIT_EOL_CRLF)
+ return 1;
+ if (ca->core_eol == GIT_EOL_UNSET && GIT_EOL_NATIVE == GIT_EOL_CRLF)
+ return 1;
- /* Check heuristics for binary vs text - returns true if binary */
- if (git_buf_text_gather_stats(&stats, from, false))
- return GIT_PASSTHROUGH;
+ return 0;
+}
- /* If there are no CR characters to filter out, then just pass */
- if (!stats.cr)
- return GIT_PASSTHROUGH;
+static git_cvar_value output_eol(struct crlf_attrs *ca)
+{
+ switch (ca->crlf_action) {
+ case GIT_CRLF_BINARY:
+ return GIT_EOL_UNSET;
+ case GIT_CRLF_TEXT_CRLF:
+ return GIT_EOL_CRLF;
+ case GIT_CRLF_TEXT_INPUT:
+ return GIT_EOL_LF;
+ case GIT_CRLF_UNDEFINED:
+ case GIT_CRLF_AUTO_CRLF:
+ return GIT_EOL_CRLF;
+ case GIT_CRLF_AUTO_INPUT:
+ return GIT_EOL_LF;
+ case GIT_CRLF_TEXT:
+ case GIT_CRLF_AUTO:
+ return text_eol_is_crlf(ca) ? GIT_EOL_CRLF : GIT_EOL_LF;
+ }
+
+ /* TODO: warn when available */
+ return ca->core_eol;
+}
+
+GIT_INLINE(int) check_safecrlf(
+ struct crlf_attrs *ca,
+ const git_filter_source *src,
+ git_buf_text_stats *stats)
+{
+ const char *filename = git_filter_source_path(src);
+
+ if (!ca->safe_crlf)
+ return 0;
+
+ if (output_eol(ca) == GIT_EOL_LF) {
+ /*
+ * CRLFs would not be restored by checkout:
+ * check if we'd remove CRLFs
+ */
+ if (stats->crlf) {
+ if (ca->safe_crlf == GIT_SAFE_CRLF_WARN) {
+ /* TODO: issue a warning when available */
+ } else {
+ if (filename && *filename)
+ git_error_set(
+ GIT_ERROR_FILTER, "CRLF would be replaced by LF in '%s'",
+ filename);
+ else
+ git_error_set(
+ GIT_ERROR_FILTER, "CRLF would be replaced by LF");
- /* If safecrlf is enabled, sanity-check the result. */
- if (stats.cr != stats.crlf || stats.lf != stats.crlf) {
- switch (ca->safe_crlf) {
- case GIT_SAFE_CRLF_FAIL:
- giterr_set(
- GITERR_FILTER, "LF would be replaced by CRLF in '%s'",
- git_filter_source_path(src));
return -1;
- case GIT_SAFE_CRLF_WARN:
- /* TODO: issue warning when warning API is available */;
- break;
- default:
- break;
}
}
-
+ } else if (output_eol(ca) == GIT_EOL_CRLF) {
/*
- * We're currently not going to even try to convert stuff
- * that has bare CR characters. Does anybody do that crazy
- * stuff?
+ * CRLFs would be added by checkout:
+ * check if we have "naked" LFs
*/
- if (stats.cr != stats.crlf)
- return GIT_PASSTHROUGH;
+ if (stats->crlf != stats->lf) {
+ if (ca->safe_crlf == GIT_SAFE_CRLF_WARN) {
+ /* TODO: issue a warning when available */
+ } else {
+ if (filename && *filename)
+ git_error_set(
+ GIT_ERROR_FILTER, "LF would be replaced by CRLF in '%s'",
+ filename);
+ else
+ git_error_set(
+ GIT_ERROR_FILTER, "LF would be replaced by CRLF");
- if (ca->crlf_action == GIT_CRLF_GUESS) {
- /*
- * If the file in the index has any CR in it, do not convert.
- * This is the new safer autocrlf handling.
- */
- if (has_cr_in_index(src))
- return GIT_PASSTHROUGH;
+ return -1;
+ }
}
-
- if (!stats.cr)
- return GIT_PASSTHROUGH;
}
- /* Actually drop the carriage returns */
- return git_buf_text_crlf_to_lf(to, from);
+ return 0;
}
-static const char *line_ending(struct crlf_attrs *ca)
+static int crlf_apply_to_odb(
+ struct crlf_attrs *ca,
+ git_buf *to,
+ const git_buf *from,
+ const git_filter_source *src)
{
- switch (ca->crlf_action) {
- case GIT_CRLF_BINARY:
- case GIT_CRLF_INPUT:
- return "\n";
+ git_buf_text_stats stats;
+ bool is_binary;
+ int error;
- case GIT_CRLF_CRLF:
- return "\r\n";
+ /* Binary attribute? Empty file? Nothing to do */
+ if (ca->crlf_action == GIT_CRLF_BINARY || !git_buf_len(from))
+ return GIT_PASSTHROUGH;
- case GIT_CRLF_GUESS:
- if (ca->auto_crlf == GIT_AUTO_CRLF_FALSE)
- return "\n";
- break;
+ is_binary = git_buf_text_gather_stats(&stats, from, false);
- case GIT_CRLF_AUTO:
- case GIT_CRLF_TEXT:
- break;
+ /* Heuristics to see if we can skip the conversion.
+ * Straight from Core Git.
+ */
+ if (ca->crlf_action == GIT_CRLF_AUTO ||
+ ca->crlf_action == GIT_CRLF_AUTO_INPUT ||
+ ca->crlf_action == GIT_CRLF_AUTO_CRLF) {
+
+ if (is_binary)
+ return GIT_PASSTHROUGH;
- default:
- goto line_ending_error;
+ /*
+ * If the file in the index has any CR in it, do not convert.
+ * This is the new safer autocrlf handling.
+ */
+ if (has_cr_in_index(src))
+ return GIT_PASSTHROUGH;
}
- if (ca->auto_crlf == GIT_AUTO_CRLF_TRUE)
- return "\r\n";
- else if (ca->auto_crlf == GIT_AUTO_CRLF_INPUT)
- return "\n";
- else if (ca->eol == GIT_EOL_UNSET)
- return GIT_EOL_NATIVE == GIT_EOL_CRLF ? "\r\n" : "\n";
- else if (ca->eol == GIT_EOL_LF)
- return "\n";
- else if (ca->eol == GIT_EOL_CRLF)
- return "\r\n";
-
-line_ending_error:
- giterr_set(GITERR_INVALID, "invalid input to line ending filter");
- return NULL;
+ if ((error = check_safecrlf(ca, src, &stats)) < 0)
+ return error;
+
+ /* If there are no CR characters to filter out, then just pass */
+ if (!stats.crlf)
+ return GIT_PASSTHROUGH;
+
+ /* Actually drop the carriage returns */
+ return git_buf_text_crlf_to_lf(to, from);
}
static int crlf_apply_to_workdir(
- struct crlf_attrs *ca, git_buf *to, const git_buf *from)
+ struct crlf_attrs *ca,
+ git_buf *to,
+ const git_buf *from)
{
git_buf_text_stats stats;
- const char *workdir_ending = NULL;
bool is_binary;
/* Empty file? Nothing to do. */
- if (git_buf_len(from) == 0)
- return 0;
-
- /* Determine proper line ending */
- workdir_ending = line_ending(ca);
- if (!workdir_ending)
- return -1;
-
- /* only LF->CRLF conversion is supported, do nothing on LF platforms */
- if (strcmp(workdir_ending, "\r\n") != 0)
+ if (git_buf_len(from) == 0 || output_eol(ca) != GIT_EOL_CRLF)
return GIT_PASSTHROUGH;
- /* If there are no LFs, or all LFs are part of a CRLF, nothing to do */
is_binary = git_buf_text_gather_stats(&stats, from, false);
+ /* If there are no LFs, or all LFs are part of a CRLF, nothing to do */
if (stats.lf == 0 || stats.lf == stats.crlf)
return GIT_PASSTHROUGH;
if (ca->crlf_action == GIT_CRLF_AUTO ||
- ca->crlf_action == GIT_CRLF_GUESS) {
+ ca->crlf_action == GIT_CRLF_AUTO_INPUT ||
+ ca->crlf_action == GIT_CRLF_AUTO_CRLF) {
/* If we have any existing CR or CRLF line endings, do nothing */
- if (ca->crlf_action == GIT_CRLF_GUESS &&
- stats.cr > 0 && stats.crlf > 0)
- return GIT_PASSTHROUGH;
-
- /* If we have bare CR characters, do nothing */
- if (stats.cr != stats.crlf)
+ if (stats.cr > 0)
return GIT_PASSTHROUGH;
/* Don't filter binary files */
return git_buf_text_lf_to_crlf(to, from);
}
-static int crlf_check(
- git_filter *self,
- void **payload, /* points to NULL ptr on entry, may be set */
- const git_filter_source *src,
- const char **attr_values)
+static int convert_attrs(
+ struct crlf_attrs *ca,
+ const char **attr_values,
+ const git_filter_source *src)
{
int error;
- struct crlf_attrs ca;
- GIT_UNUSED(self);
+ memset(ca, 0, sizeof(struct crlf_attrs));
+
+ if ((error = git_repository__cvar(&ca->auto_crlf,
+ git_filter_source_repo(src), GIT_CVAR_AUTO_CRLF)) < 0 ||
+ (error = git_repository__cvar(&ca->safe_crlf,
+ git_filter_source_repo(src), GIT_CVAR_SAFE_CRLF)) < 0 ||
+ (error = git_repository__cvar(&ca->core_eol,
+ git_filter_source_repo(src), GIT_CVAR_EOL)) < 0)
+ return error;
+
+ /* downgrade FAIL to WARN if ALLOW_UNSAFE option is used */
+ if ((git_filter_source_flags(src) & GIT_FILTER_ALLOW_UNSAFE) &&
+ ca->safe_crlf == GIT_SAFE_CRLF_FAIL)
+ ca->safe_crlf = GIT_SAFE_CRLF_WARN;
+
+ if (attr_values) {
+ /* load the text attribute */
+ ca->crlf_action = check_crlf(attr_values[2]); /* text */
+
+ if (ca->crlf_action == GIT_CRLF_UNDEFINED)
+ ca->crlf_action = check_crlf(attr_values[0]); /* crlf */
+
+ if (ca->crlf_action != GIT_CRLF_BINARY) {
+ /* load the eol attribute */
+ int eol_attr = check_eol(attr_values[1]);
+
+ if (ca->crlf_action == GIT_CRLF_AUTO && eol_attr == GIT_EOL_LF)
+ ca->crlf_action = GIT_CRLF_AUTO_INPUT;
+ else if (ca->crlf_action == GIT_CRLF_AUTO && eol_attr == GIT_EOL_CRLF)
+ ca->crlf_action = GIT_CRLF_AUTO_CRLF;
+ else if (eol_attr == GIT_EOL_LF)
+ ca->crlf_action = GIT_CRLF_TEXT_INPUT;
+ else if (eol_attr == GIT_EOL_CRLF)
+ ca->crlf_action = GIT_CRLF_TEXT_CRLF;
+ }
- if (!attr_values) {
- ca.crlf_action = GIT_CRLF_GUESS;
- ca.eol = GIT_EOL_UNSET;
+ ca->attr_action = ca->crlf_action;
} else {
- ca.crlf_action = check_crlf(attr_values[2]); /* text */
- if (ca.crlf_action == GIT_CRLF_GUESS)
- ca.crlf_action = check_crlf(attr_values[0]); /* clrf */
- ca.eol = check_eol(attr_values[1]); /* eol */
+ ca->crlf_action = GIT_CRLF_UNDEFINED;
}
- ca.auto_crlf = GIT_AUTO_CRLF_DEFAULT;
- ca.safe_crlf = GIT_SAFE_CRLF_DEFAULT;
- /*
- * Use the core Git logic to see if we should perform CRLF for this file
- * based on its attributes & the value of `core.autocrlf`
- */
- ca.crlf_action = crlf_input_action(&ca);
+ if (ca->crlf_action == GIT_CRLF_TEXT)
+ ca->crlf_action = text_eol_is_crlf(ca) ? GIT_CRLF_TEXT_CRLF : GIT_CRLF_TEXT_INPUT;
+ if (ca->crlf_action == GIT_CRLF_UNDEFINED && ca->auto_crlf == GIT_AUTO_CRLF_FALSE)
+ ca->crlf_action = GIT_CRLF_BINARY;
+ if (ca->crlf_action == GIT_CRLF_UNDEFINED && ca->auto_crlf == GIT_AUTO_CRLF_TRUE)
+ ca->crlf_action = GIT_CRLF_AUTO_CRLF;
+ if (ca->crlf_action == GIT_CRLF_UNDEFINED && ca->auto_crlf == GIT_AUTO_CRLF_INPUT)
+ ca->crlf_action = GIT_CRLF_AUTO_INPUT;
- if (ca.crlf_action == GIT_CRLF_BINARY)
- return GIT_PASSTHROUGH;
-
- if (ca.crlf_action == GIT_CRLF_GUESS ||
- ((ca.crlf_action == GIT_CRLF_AUTO || ca.crlf_action == GIT_CRLF_TEXT) &&
- git_filter_source_mode(src) == GIT_FILTER_SMUDGE)) {
-
- error = git_repository__cvar(
- &ca.auto_crlf, git_filter_source_repo(src), GIT_CVAR_AUTO_CRLF);
- if (error < 0)
- return error;
+ return 0;
+}
- if (ca.crlf_action == GIT_CRLF_GUESS &&
- ca.auto_crlf == GIT_AUTO_CRLF_FALSE)
- return GIT_PASSTHROUGH;
+static int crlf_check(
+ git_filter *self,
+ void **payload, /* points to NULL ptr on entry, may be set */
+ const git_filter_source *src,
+ const char **attr_values)
+{
+ struct crlf_attrs ca;
- if (ca.auto_crlf == GIT_AUTO_CRLF_INPUT &&
- git_filter_source_mode(src) == GIT_FILTER_SMUDGE)
- return GIT_PASSTHROUGH;
- }
+ GIT_UNUSED(self);
- if (git_filter_source_mode(src) == GIT_FILTER_CLEAN) {
- error = git_repository__cvar(
- &ca.safe_crlf, git_filter_source_repo(src), GIT_CVAR_SAFE_CRLF);
- if (error < 0)
- return error;
+ convert_attrs(&ca, attr_values, src);
- /* downgrade FAIL to WARN if ALLOW_UNSAFE option is used */
- if ((git_filter_source_flags(src) & GIT_FILTER_ALLOW_UNSAFE) &&
- ca.safe_crlf == GIT_SAFE_CRLF_FAIL)
- ca.safe_crlf = GIT_SAFE_CRLF_WARN;
- }
+ if (ca.crlf_action == GIT_CRLF_BINARY)
+ return GIT_PASSTHROUGH;
*payload = git__malloc(sizeof(ca));
- GITERR_CHECK_ALLOC(*payload);
+ GIT_ERROR_CHECK_ALLOC(*payload);
memcpy(*payload, &ca, sizeof(ca));
return 0;
}
static int crlf_apply(
- git_filter *self,
- void **payload, /* may be read and/or set */
- git_buf *to,
+ git_filter *self,
+ void **payload, /* may be read and/or set */
+ git_buf *to,
const git_buf *from,
const git_filter_source *src)
{
/* initialize payload in case `check` was bypassed */
if (!*payload) {
int error = crlf_check(self, payload, src, NULL);
+
if (error < 0)
return error;
}
{
size_t entries_len, hash_len, index_len;
- GITERR_CHECK_ALLOC_MULTIPLY(&entries_len, entries, sizeof(struct index_entry));
- GITERR_CHECK_ALLOC_MULTIPLY(&hash_len, hash_count, sizeof(struct index_entry *));
+ GIT_ERROR_CHECK_ALLOC_MULTIPLY(&entries_len, entries, sizeof(struct index_entry));
+ GIT_ERROR_CHECK_ALLOC_MULTIPLY(&hash_len, hash_count, sizeof(struct index_entry *));
- GITERR_CHECK_ALLOC_ADD(&index_len, sizeof(struct git_delta_index), entries_len);
- GITERR_CHECK_ALLOC_ADD(&index_len, index_len, hash_len);
+ GIT_ERROR_CHECK_ALLOC_ADD(&index_len, sizeof(struct git_delta_index), entries_len);
+ GIT_ERROR_CHECK_ALLOC_ADD(&index_len, index_len, hash_len);
if (!git__is_ulong(index_len)) {
- giterr_set(GITERR_NOMEMORY, "overly large delta");
+ git_error_set(GIT_ERROR_NOMEMORY, "overly large delta");
return -1;
}
*out = git__malloc(index_len);
- GITERR_CHECK_ALLOC(*out);
+ GIT_ERROR_CHECK_ALLOC(*out);
- *out_len = index_len;
+ *out_len = (unsigned long)index_len;
return 0;
}
if (!trg_buf || !trg_size)
return 0;
+ if (index->src_size > UINT_MAX ||
+ trg_size > UINT_MAX ||
+ max_size > (UINT_MAX - MAX_OP_SIZE - 1)) {
+ git_error_set(GIT_ERROR_INVALID, "buffer sizes too large for delta processing");
+ return -1;
+ }
+
bufpos = 0;
bufsize = 8192;
if (max_size && bufsize >= max_size)
bufsize = (unsigned int)(max_size + MAX_OP_SIZE + 1);
buf = git__malloc(bufsize);
- GITERR_CHECK_ALLOC(buf);
+ GIT_ERROR_CHECK_ALLOC(buf);
/* store reference buffer size */
- i = index->src_size;
+ i = (unsigned int)index->src_size;
while (i >= 0x80) {
buf[bufpos++] = i | 0x80;
i >>= 7;
buf[bufpos++] = i;
/* store target buffer size */
- i = trg_size;
+ i = (unsigned int)trg_size;
while (i >= 0x80) {
buf[bufpos++] = i | 0x80;
i >>= 7;
void *tmp = buf;
bufsize = bufsize * 3 / 2;
if (max_size && bufsize >= max_size)
- bufsize = max_size + MAX_OP_SIZE + 1;
+ bufsize = (unsigned int)(max_size + MAX_OP_SIZE + 1);
if (max_size && bufpos > max_size)
break;
buf = git__realloc(buf, bufsize);
buf[bufpos - inscnt - 1] = inscnt;
if (max_size && bufpos > max_size) {
- giterr_set(GITERR_NOMEMORY, "delta would be larger than maximum size");
+ git_error_set(GIT_ERROR_NOMEMORY, "delta would be larger than maximum size");
git__free(buf);
return GIT_EBUFS;
}
do {
if (d == end) {
- giterr_set(GITERR_INVALID, "truncated delta");
+ git_error_set(GIT_ERROR_INVALID, "truncated delta");
return -1;
}
* base object, resulting in data corruption or segfault.
*/
if ((hdr_sz(&base_sz, &delta, delta_end) < 0) || (base_sz != base_len)) {
- giterr_set(GITERR_INVALID, "failed to apply delta: base size does not match given data");
+ git_error_set(GIT_ERROR_INVALID, "failed to apply delta: base size does not match given data");
return -1;
}
if (hdr_sz(&res_sz, &delta, delta_end) < 0) {
- giterr_set(GITERR_INVALID, "failed to apply delta: base size does not match given data");
+ git_error_set(GIT_ERROR_INVALID, "failed to apply delta: base size does not match given data");
return -1;
}
- GITERR_CHECK_ALLOC_ADD(&alloc_sz, res_sz, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_sz, res_sz, 1);
res_dp = git__malloc(alloc_sz);
- GITERR_CHECK_ALLOC(res_dp);
+ GIT_ERROR_CHECK_ALLOC(res_dp);
res_dp[res_sz] = '\0';
*out = res_dp;
*out = NULL;
*out_len = 0;
- giterr_set(GITERR_INVALID, "failed to apply delta");
+ git_error_set(GIT_ERROR_INVALID, "failed to apply delta");
return -1;
}
static void *oidmap_value_bykey(git_oidmap *map, const git_oid *key)
{
- khint_t pos = git_oidmap_lookup_index(map, key);
+ size_t pos = git_oidmap_lookup_index(map, key);
if (!git_oidmap_valid_index(map, pos))
return NULL;
if (replace_name(&tag, repo, e, prio, sha1)) {
if (!found) {
e = git__malloc(sizeof(struct commit_name));
- GITERR_CHECK_ALLOC(e);
+ GIT_ERROR_CHECK_ALLOC(e);
e->path = NULL;
e->tag = NULL;
if ((error = git_reference_lookup_resolved(&ref, repo, refname, -1)) < 0)
return error;
- if ((error = git_reference_peel(&peeled, ref, GIT_OBJ_ANY)) < 0)
+ if ((error = git_reference_peel(&peeled, ref, GIT_OBJECT_ANY)) < 0)
goto cleanup;
git_oid_cpy(ref_target_out, git_reference_target(ref));
struct commit_name *name;
name = git__malloc(sizeof(struct commit_name));
- GITERR_CHECK_ALLOC(name);
+ GIT_ERROR_CHECK_ALLOC(name);
memcpy(name, in, sizeof(struct commit_name));
name->tag = NULL;
return -1;
name->path = git__strdup(in->path);
- GITERR_CHECK_ALLOC(name->path);
+ GIT_ERROR_CHECK_ALLOC(name->path);
*out = name;
return 0;
int error;
tag = git__malloc(sizeof(struct possible_tag));
- GITERR_CHECK_ALLOC(tag);
+ GIT_ERROR_CHECK_ALLOC(tag);
memcpy(tag, in, sizeof(struct possible_tag));
tag->name = NULL;
{
if (n->prio == 2 && !n->tag) {
if (git_tag_lookup(&n->tag, repo, &n->sha1) < 0) {
- giterr_set(GITERR_TAG, "annotated tag '%s' not available", n->path);
+ git_error_set(GIT_ERROR_TAG, "annotated tag '%s' not available", n->path);
return -1;
}
}
if (n->tag && !n->name_checked) {
if (!git_tag_name(n->tag)) {
- giterr_set(GITERR_TAG, "annotated tag '%s' has no embedded name", n->path);
+ git_error_set(GIT_ERROR_TAG, "annotated tag '%s' has no embedded name", n->path);
return -1;
}
int *out,
git_repository *repo,
const git_oid *oid_in,
- int abbreviated_size)
+ unsigned int abbreviated_size)
{
size_t size = abbreviated_size;
git_odb *odb;
/* If we didn't find any shorter prefix, we have to do the whole thing */
*out = GIT_OID_HEXSZ;
-
+
return 0;
}
int depth,
git_repository *repo,
const git_oid* id,
- size_t abbrev_size)
+ unsigned int abbrev_size)
{
int error, size = 0;
char oid_str[GIT_OID_HEXSZ + 1];
git_oid_tostr(oid_str, sizeof(oid_str), oid);
- giterr_set(GITERR_DESCRIBE, message_format, oid_str);
+ git_error_set(GIT_ERROR_DESCRIBE, message_format, oid_str);
return GIT_ENOTFOUND;
}
unannotated_cnt++;
} else if (match_cnt < data->opts->max_candidates_tags) {
struct possible_tag *t = git__malloc(sizeof(struct commit_name));
- GITERR_CHECK_ALLOC(t);
+ GIT_ERROR_CHECK_ALLOC(t);
if ((error = git_vector_insert(&all_matches, t)) < 0)
goto cleanup;
goto cleanup;
}
if (unannotated_cnt) {
- error = describe_not_found(git_commit_id(commit),
+ error = describe_not_found(git_commit_id(commit),
"cannot describe - "
"no annotated tags can describe '%s'; "
"however, there were unannotated tags.");
goto cleanup;
}
else {
- error = describe_not_found(git_commit_id(commit),
+ error = describe_not_found(git_commit_id(commit),
"cannot describe - "
"no tags can describe '%s'.");
goto cleanup;
assert(committish);
data.result = git__calloc(1, sizeof(git_describe_result));
- GITERR_CHECK_ALLOC(data.result);
+ GIT_ERROR_CHECK_ALLOC(data.result);
data.result->repo = git_object_owner(committish);
data.repo = git_object_owner(committish);
if ((error = normalize_options(&normalized, opts)) < 0)
return error;
- GITERR_CHECK_VERSION(
+ GIT_ERROR_CHECK_VERSION(
&normalized,
GIT_DESCRIBE_OPTIONS_VERSION,
"git_describe_options");
data.opts = &normalized;
data.names = git_oidmap_alloc();
- GITERR_CHECK_ALLOC(data.names);
+ GIT_ERROR_CHECK_ALLOC(data.names);
/** TODO: contains to be implemented */
- if ((error = git_object_peel((git_object **)(&commit), committish, GIT_OBJ_COMMIT)) < 0)
+ if ((error = git_object_peel((git_object **)(&commit), committish, GIT_OBJECT_COMMIT)) < 0)
goto cleanup;
if ((error = git_reference_foreach_name(
goto cleanup;
if (git_oidmap_size(data.names) == 0 && !opts->show_commit_oid_as_fallback) {
- giterr_set(GITERR_DESCRIBE, "cannot describe - "
+ git_error_set(GIT_ERROR_DESCRIBE, "cannot describe - "
"no reference found, cannot describe anything.");
error = -1;
goto cleanup;
if ((error = git_reference_name_to_id(¤t_id, repo, GIT_HEAD_FILE)) < 0)
return error;
- if ((error = git_object_lookup(&commit, repo, ¤t_id, GIT_OBJ_COMMIT)) < 0)
+ if ((error = git_object_lookup(&commit, repo, ¤t_id, GIT_OBJECT_COMMIT)) < 0)
return error;
/* The first step is to perform a describe of HEAD, so we can leverage this */
assert(out && result);
- GITERR_CHECK_VERSION(given, GIT_DESCRIBE_FORMAT_OPTIONS_VERSION, "git_describe_format_options");
+ GIT_ERROR_CHECK_VERSION(given, GIT_DESCRIBE_FORMAT_OPTIONS_VERSION, "git_describe_format_options");
normalize_format_options(&opts, given);
git_buf_sanitize(out);
if (opts.always_use_long_format && opts.abbreviated_size == 0) {
- giterr_set(GITERR_DESCRIBE, "cannot describe - "
+ git_error_set(GIT_ERROR_DESCRIBE, "cannot describe - "
"'always_use_long_format' is incompatible with a zero"
"'abbreviated_size'");
return -1;
int git_diff_get_perfdata(git_diff_perfdata *out, const git_diff *diff)
{
assert(out);
- GITERR_CHECK_VERSION(out, GIT_DIFF_PERFDATA_VERSION, "git_diff_perfdata");
+ GIT_ERROR_CHECK_VERSION(out, GIT_DIFF_PERFDATA_VERSION, "git_diff_perfdata");
out->stat_calls = diff->perf.stat_calls;
out->oid_calculations = diff->perf.oid_calculations;
return 0;
assert(out && diff && opts);
assert(opts->summary && opts->id && opts->author);
- GITERR_CHECK_VERSION(opts,
+ GIT_ERROR_CHECK_VERSION(opts,
GIT_DIFF_FORMAT_EMAIL_OPTIONS_VERSION,
"git_format_email_options");
if (!ignore_marker) {
if (opts->patch_no > opts->total_patches) {
- giterr_set(GITERR_INVALID,
+ git_error_set(GIT_ERROR_INVALID,
"patch %"PRIuZ" out of range. max %"PRIuZ,
opts->patch_no, opts->total_patches);
return -1;
}
if (opts->patch_no == 0) {
- giterr_set(GITERR_INVALID,
+ git_error_set(GIT_ERROR_INVALID,
"invalid patch no %"PRIuZ". should be >0", opts->patch_no);
return -1;
}
size_t offset = 0;
if ((offset = (loc - opts->summary)) == 0) {
- giterr_set(GITERR_INVALID, "summary is empty");
+ git_error_set(GIT_ERROR_INVALID, "summary is empty");
error = -1;
goto on_error;
}
- GITERR_CHECK_ALLOC_ADD(&allocsize, offset, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&allocsize, offset, 1);
summary = git__calloc(allocsize, sizeof(char));
- GITERR_CHECK_ALLOC(summary);
+ GIT_ERROR_CHECK_ALLOC(summary);
strncpy(summary, opts->summary, offset);
}
for (i = 0; i < GIT_OID_RAWSZ; i++) {
carry += result->id[i] + hash.id[i];
- result->id[i] = carry;
+ result->id[i] = (unsigned char)carry;
carry >>= 8;
}
goto out;
out:
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return error;
}
case GIT_DIFF_LINE_CONTEXT:
break;
default:
- giterr_set(GITERR_PATCH, "invalid line origin for patch");
+ git_error_set(GIT_ERROR_PATCH, "invalid line origin for patch");
return -1;
}
goto out;
out:
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return error;
}
struct patch_id_args args;
int error;
- GITERR_CHECK_VERSION(
+ GIT_ERROR_CHECK_VERSION(
opts, GIT_DIFF_PATCHID_OPTIONS_VERSION, "git_diff_patchid_options");
memset(&args, 0, sizeof(args));
if (error && pat != NULL)
(void)git_array_pop(drv->fn_patterns); /* release last item */
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
/* We want to ignore bad patterns, so return success regardless */
return 0;
}
if (!repo->diff_drivers)
- giterr_set(GITERR_REPOSITORY, "unable to create diff driver registry");
+ git_error_set(GIT_ERROR_REPOSITORY, "unable to create diff driver registry");
return repo->diff_drivers;
}
namelen = strlen(name),
alloclen;
- GITERR_CHECK_ALLOC_ADD(&alloclen, driverlen, namelen);
- GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, driverlen, namelen);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1);
driver = git__calloc(1, alloclen);
- GITERR_CHECK_ALLOC(driver);
+ GIT_ERROR_CHECK_ALLOC(driver);
memcpy(driver->name, name, namelen);
(error = p_regcomp(
&drv->word_pattern, ddef->words, ddef->flags | REG_EXTENDED)))
{
- error = giterr_set_regex(&drv->word_pattern, error);
+ error = git_error_set_regex(&drv->word_pattern, error);
goto done;
}
int error = 0;
git_diff_driver_registry *reg;
git_diff_driver *drv = NULL;
- size_t namelen;
- khiter_t pos;
+ size_t namelen, pos;
git_config *cfg = NULL;
git_buf name = GIT_BUF_INIT;
git_config_entry *ce = NULL;
/* if you can't read config for repo, just use default driver */
if (git_repository_config_snapshot(&cfg, repo) < 0) {
- giterr_clear();
+ git_error_clear();
goto done;
}
cfg, name.ptr, NULL, diff_driver_xfuncname, drv)) < 0) {
if (error != GIT_ENOTFOUND)
goto done;
- giterr_clear(); /* no diff.<driver>.xfuncname, so just continue */
+ git_error_clear(); /* no diff.<driver>.xfuncname, so just continue */
}
git_buf_truncate(&name, namelen + strlen("diff.."));
cfg, name.ptr, NULL, diff_driver_funcname, drv)) < 0) {
if (error != GIT_ENOTFOUND)
goto done;
- giterr_clear(); /* no diff.<driver>.funcname, so just continue */
+ git_error_clear(); /* no diff.<driver>.funcname, so just continue */
}
/* if we found any patterns, set driver type to use correct callback */
found_driver = true;
else {
/* TODO: warn about bad regex instead of failure */
- error = giterr_set_regex(&drv->word_pattern, error);
+ error = git_error_set_regex(&drv->word_pattern, error);
goto done;
}
done:
git_config_entry_free(ce);
- git_buf_free(&name);
+ git_buf_dispose(&name);
git_config_free(cfg);
if (!*out) {
else if ((error = git_diff_driver_load(out, repo, values[0])) < 0) {
if (error == GIT_ENOTFOUND) {
error = 0;
- giterr_clear();
+ git_error_clear();
}
}
void git_diff_find_context_clear(git_diff_find_context_payload *payload)
{
if (payload) {
- git_buf_free(&payload->line);
+ git_buf_dispose(&payload->line);
payload->driver = NULL;
}
}
fc->flags |= GIT_DIFF_FLAG__FREE_BLOB;
} else {
fc->file->size = src->buflen;
- git_odb_hash(&fc->file->id, src->buf, src->buflen, GIT_OBJ_BLOB);
+ git_odb_hash(&fc->file->id, src->buf, src->buflen, GIT_OBJECT_BLOB);
fc->file->id_abbrev = GIT_OID_HEXSZ;
fc->map.len = src->buflen;
if ((error = git_submodule_lookup(&sm, fc->repo, fc->file->path)) < 0) {
/* GIT_EEXISTS means a "submodule" that has not been git added */
if (error == GIT_EEXISTS) {
- giterr_clear();
+ git_error_clear();
error = 0;
}
return error;
if (odb_obj != NULL) {
error = git_object__from_odb_object(
- (git_object **)&fc->blob, fc->repo, odb_obj, GIT_OBJ_BLOB);
+ (git_object **)&fc->blob, fc->repo, odb_obj, GIT_OBJECT_BLOB);
git_odb_object_free(odb_obj);
} else {
error = git_blob_lookup(
fc->map.data = git_buf_detach(&target);
fc->flags |= GIT_DIFF_FLAG__FREE_DATA;
- git_buf_free(&target);
+ git_buf_dispose(&target);
return error;
}
alloc_len = (ssize_t)(fc->file->size * 2) + 1;
fc->map.data = git__calloc(alloc_len, sizeof(char));
- GITERR_CHECK_ALLOC(fc->map.data);
+ GIT_ERROR_CHECK_ALLOC(fc->map.data);
fc->flags |= GIT_DIFF_FLAG__FREE_DATA;
read_len = p_readlink(git_buf_cstr(path), fc->map.data, alloc_len);
if (read_len < 0) {
- giterr_set(GITERR_OS, "failed to read symlink '%s'", fc->file->path);
+ git_error_set(GIT_ERROR_OS, "failed to read symlink '%s'", fc->file->path);
return -1;
}
}
/* if mmap failed, fall through to try readbuffer below */
- giterr_clear();
+ git_error_clear();
}
if (!(error = git_futils_readbuffer_fd(&raw, fd, (size_t)fc->file->size))) {
error = git_filter_list_apply_to_data(&out, fl, &raw);
if (out.ptr != raw.ptr)
- git_buf_free(&raw);
+ git_buf_dispose(&raw);
if (!error) {
fc->map.len = out.size;
/* once data is loaded, update OID if we didn't have it previously */
if (!error && (fc->file->flags & GIT_DIFF_FLAG_VALID_ID) == 0) {
error = git_odb_hash(
- &fc->file->id, fc->map.data, fc->map.len, GIT_OBJ_BLOB);
+ &fc->file->id, fc->map.data, fc->map.len, GIT_OBJECT_BLOB);
fc->file->flags |= GIT_DIFF_FLAG_VALID_ID;
}
- git_buf_free(&path);
+ git_buf_dispose(&path);
return error;
}
if (error > 0) /* positive value means to skip this delta */
return 0;
else /* negative value means to cancel diff */
- return giterr_set_after_callback_function(error, "git_diff");
+ return git_error_set_after_callback_function(error, "git_diff");
}
}
if (DIFF_FLAG_IS_SET(diff, GIT_DIFF_REVERSE))
has_old = !has_old;
- if ((entry->flags & GIT_IDXENTRY_VALID) != 0)
+ if ((entry->flags & GIT_INDEX_ENTRY_VALID) != 0)
return 0;
if (status == GIT_DELTA_IGNORED &&
return 0;
delta = diff_delta__alloc(diff, status, entry->path);
- GITERR_CHECK_ALLOC(delta);
+ GIT_ERROR_CHECK_ALLOC(delta);
/* This fn is just for single-sided diffs */
assert(status != GIT_DELTA_MODIFIED);
}
delta = diff_delta__alloc(diff, status, canonical_path);
- GITERR_CHECK_ALLOC(delta);
+ GIT_ERROR_CHECK_ALLOC(delta);
delta->nfiles = 2;
if (!git_index_entry_is_conflict(old_entry)) {
break;
case GIT_DELTA_MODIFIED:
if (git_oid__cmp(&delta->old_file.id, &item->id) == 0 ||
- git_oid__cmp(&delta->new_file.id, &item->id) == 0)
+ (delta->new_file.mode == item->mode &&
+ git_oid__cmp(&delta->new_file.id, &item->id) == 0))
return delta;
break;
default:
if (entry && git_submodule_parse_ignore(
&diff->base.opts.ignore_submodules, entry->value) < 0)
- giterr_clear();
+ git_error_clear();
git_config_entry_free(entry);
}
{
git_index_entry entry;
+ if (size < 0 || size > UINT32_MAX) {
+ git_error_set(GIT_ERROR_NOMEMORY, "file size overflow (for 32-bits) on '%s'", path);
+ return -1;
+ }
+
memset(&entry, 0, sizeof(entry));
entry.mode = mode;
- entry.file_size = size;
+ entry.file_size = (uint32_t)size;
entry.path = (char *)path;
return git_diff__oid_for_entry(out, diff, &entry, mode, NULL);
if (p_stat(full_path.ptr, &st) < 0) {
error = git_path_set_error(errno, entry.path, "stat");
- git_buf_free(&full_path);
+ git_buf_dispose(&full_path);
return error;
}
/* if submodule lookup failed probably just in an intermediate
* state where some init hasn't happened, so ignore the error
*/
- giterr_clear();
+ git_error_clear();
}
} else if (S_ISLNK(mode)) {
error = git_odb__hashlink(out, full_path.ptr);
diff->base.perf.oid_calculations++;
} else if (!git__is_sizet(entry.file_size)) {
- giterr_set(GITERR_OS, "file size overflow (for 32-bits) on '%s'",
+ git_error_set(GIT_ERROR_NOMEMORY, "file size overflow (for 32-bits) on '%s'",
entry.path);
error = -1;
} else if (!(error = git_filter_list_load(&fl,
error = fd;
else {
error = git_odb__hashfd_filtered(
- out, fd, (size_t)entry.file_size, GIT_OBJ_BLOB, fl);
+ out, fd, (size_t)entry.file_size, GIT_OBJECT_BLOB, fl);
p_close(fd);
diff->base.perf.oid_calculations++;
}
}
}
- git_buf_free(&full_path);
+ git_buf_dispose(&full_path);
return error;
}
/* GIT_EEXISTS means dir with .git in it was found - ignore it */
if (error == GIT_EEXISTS) {
- giterr_clear();
+ git_error_clear();
error = 0;
}
return error;
status = GIT_DELTA_CONFLICTED;
/* support "assume unchanged" (poorly, b/c we still stat everything) */
- } else if ((oitem->flags & GIT_IDXENTRY_VALID) != 0) {
+ } else if ((oitem->flags & GIT_INDEX_ENTRY_VALID) != 0) {
status = GIT_DELTA_UNMODIFIED;
/* support "skip worktree" index bit */
- } else if ((oitem->flags_extended & GIT_IDXENTRY_SKIP_WORKTREE) != 0) {
+ } else if ((oitem->flags_extended & GIT_INDEX_ENTRY_SKIP_WORKTREE) != 0) {
status = GIT_DELTA_UNMODIFIED;
/* if basic type of file changed, then split into delete and add */
/* if directory is empty, can't advance into it, so skip it */
if (error == GIT_ENOTFOUND) {
- giterr_clear();
+ git_error_clear();
error = iterator_advance(&info->nitem, info->new_iter);
}
else if (nitem->mode == GIT_FILEMODE_COMMIT) {
/* ignore things that are not actual submodules */
if (git_submodule_lookup(NULL, info->repo, nitem->path) != 0) {
- giterr_clear();
+ git_error_clear();
delta_type = GIT_DELTA_IGNORED;
/* if this contains a tracked item, treat as normal TREE */
if (error != GIT_ENOTFOUND)
return error;
- giterr_clear();
+ git_error_clear();
return iterator_advance(&info->nitem, info->new_iter);
}
}
*out = NULL;
diff = diff_generated_alloc(repo, old_iter, new_iter);
- GITERR_CHECK_ALLOC(diff);
+ GIT_ERROR_CHECK_ALLOC(diff);
info.repo = repo;
info.old_iter = old_iter;
b_opts.flags = FLAGS_SECOND; \
b_opts.start = pfx; \
b_opts.end = pfx; \
- GITERR_CHECK_VERSION(opts, GIT_DIFF_OPTIONS_VERSION, "git_diff_options"); \
+ GIT_ERROR_CHECK_VERSION(opts, GIT_DIFF_OPTIONS_VERSION, "git_diff_options"); \
if (opts && (opts->flags & GIT_DIFF_DISABLE_PATHSPEC_MATCH)) { \
a_opts.pathlist.strings = opts->pathspec.strings; \
a_opts.pathlist.count = opts->pathspec.count; \
/* reload the repository index when user did not pass one in */
if (!error && git_index_read(*index, false) < 0)
- giterr_clear();
+ git_error_clear();
return error;
}
}
if ((error = cb(h2i, i2w, payload)) != 0) {
- giterr_set_after_callback(error);
+ git_error_set_after_callback(error);
break;
}
}
char commit_oidstr[GIT_OID_HEXSZ + 1];
error = -1;
- giterr_set(GITERR_INVALID, "commit %s is a merge commit",
+ git_error_set(GIT_ERROR_INVALID, "commit %s is a merge commit",
git_oid_tostr(commit_oidstr, GIT_OID_HEXSZ + 1, git_commit_id(commit)));
goto on_error;
}
int error;
git_odb *odb;
size_t len;
- git_otype type;
+ git_object_t type;
if ((error = git_repository_odb(&odb, repo)) < 0)
return error;
*out = NULL;
diff = diff_parsed_alloc();
- GITERR_CHECK_ALLOC(diff);
+ GIT_ERROR_CHECK_ALLOC(diff);
ctx = git_patch_parse_ctx_init(content, content_len, NULL);
- GITERR_CHECK_ALLOC(ctx);
+ GIT_ERROR_CHECK_ALLOC(ctx);
while (ctx->parse_ctx.remain_len) {
if ((error = git_patch_parse(&patch, ctx)) < 0)
}
if (error == GIT_ENOTFOUND && git_vector_length(&diff->patches) > 0) {
- giterr_clear();
+ git_error_clear();
error = 0;
}
delta->new_file.id_abbrev;
if (pi->id_strlen > id_abbrev) {
- giterr_set(GITERR_PATCH,
+ git_error_set(GIT_ERROR_PATCH,
"the patch input contains %d id characters (cannot print %d)",
id_abbrev, pi->id_strlen);
return -1;
if (delta->old_file.mode &&
id_strlen > delta->old_file.id_abbrev) {
- giterr_set(GITERR_PATCH,
+ git_error_set(GIT_ERROR_PATCH,
"the patch input contains %d id characters (cannot print %d)",
delta->old_file.id_abbrev, id_strlen);
return -1;
if ((delta->new_file.mode &&
id_strlen > delta->new_file.id_abbrev)) {
- giterr_set(GITERR_PATCH,
+ git_error_set(GIT_ERROR_PATCH,
"the patch input contains %d id characters (cannot print %d)",
delta->new_file.id_abbrev, id_strlen);
return -1;
int error = 0;
if (delta->similarity > 100) {
- giterr_set(GITERR_PATCH, "invalid similarity %d", delta->similarity);
+ git_error_set(GIT_ERROR_PATCH, "invalid similarity %d", delta->similarity);
error = -1;
goto done;
}
error = -1;
done:
- git_buf_free(&old_path);
- git_buf_free(&new_path);
+ git_buf_dispose(&old_path);
+ git_buf_dispose(&new_path);
return error;
}
error = -1;
done:
- git_buf_free(&old_path);
- git_buf_free(&new_path);
+ git_buf_dispose(&old_path);
+ git_buf_dispose(&new_path);
return error;
}
old_path.ptr, new_path.ptr);
done:
- git_buf_free(&old_path);
- git_buf_free(&new_path);
+ git_buf_dispose(&old_path);
+ git_buf_dispose(&new_path);
return error;
}
binary->old_file.datalen, binary->old_file.inflatedlen)) < 0) {
if (error == GIT_EBUFS) {
- giterr_clear();
+ git_error_clear();
git_buf_truncate(pi->buf, pre_binary_size);
return diff_print_patch_file_binary_noshow(
print_file = diff_print_one_name_status;
break;
default:
- giterr_set(GITERR_INVALID, "unknown diff output format (%d)", format);
+ git_error_set(GIT_ERROR_INVALID, "unknown diff output format (%d)", format);
return -1;
}
diff, print_file, print_binary, print_hunk, print_line, &pi);
if (error) /* make sure error message is set */
- giterr_set_after_callback_function(error, "git_diff_print");
+ git_error_set_after_callback_function(error, "git_diff_print");
}
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return error;
}
GIT_UNUSED(delta); GIT_UNUSED(hunk);
if (!output) {
- giterr_set(GITERR_INVALID, "buffer pointer must be provided");
+ git_error_set(GIT_ERROR_INVALID, "buffer pointer must be provided");
return -1;
}
&pi);
if (error) /* make sure error message is set */
- giterr_set_after_callback_function(error, "git_patch_print");
+ git_error_set_after_callback_function(error, "git_patch_print");
}
- git_buf_free(&temp);
+ git_buf_dispose(&temp);
return error;
}
size_t width)
{
const char *old_path = NULL, *new_path = NULL;
- size_t padding, old_size, new_size;
+ size_t padding;
+ git_off_t old_size, new_size;
old_path = delta->old_file.path;
new_path = delta->new_file.path;
old_size = delta->old_file.size;
new_size = delta->new_file.size;
- if (git_buf_printf(out, " %s", old_path) < 0)
- goto on_error;
-
if (strcmp(old_path, new_path) != 0) {
+ size_t common_dirlen;
+ int error;
+
padding = stats->max_name - strlen(old_path) - strlen(new_path);
- if (git_buf_printf(out, DIFF_RENAME_FILE_SEPARATOR "%s", new_path) < 0)
+ if ((common_dirlen = git_path_common_dirlen(old_path, new_path)) &&
+ common_dirlen <= INT_MAX) {
+ error = git_buf_printf(out, " %.*s{%s"DIFF_RENAME_FILE_SEPARATOR"%s}",
+ (int) common_dirlen, old_path,
+ old_path + common_dirlen,
+ new_path + common_dirlen);
+ } else {
+ error = git_buf_printf(out, " %s" DIFF_RENAME_FILE_SEPARATOR "%s",
+ old_path, new_path);
+ }
+
+ if (error < 0)
goto on_error;
} else {
+ if (git_buf_printf(out, " %s", old_path) < 0)
+ goto on_error;
+
padding = stats->max_name - strlen(old_path);
if (stats->renames > 0)
if (delta->flags & GIT_DIFF_FLAG_BINARY) {
if (git_buf_printf(out,
- "Bin %" PRIuZ " -> %" PRIuZ " bytes", old_size, new_size) < 0)
+ "Bin %" PRId64 " -> %" PRId64 " bytes", old_size, new_size) < 0)
goto on_error;
}
else {
assert(out && diff);
stats = git__calloc(1, sizeof(git_diff_stats));
- GITERR_CHECK_ALLOC(stats);
+ GIT_ERROR_CHECK_ALLOC(stats);
deltas = git_diff_num_deltas(diff);
if (ignore_case != ((from->opts.flags & GIT_DIFF_IGNORE_CASE) != 0) ||
reversed != ((from->opts.flags & GIT_DIFF_REVERSE) != 0)) {
- giterr_set(GITERR_INVALID,
+ git_error_set(GIT_ERROR_INVALID,
"attempt to merge diffs created with conflicting options");
return -1;
}
git_config *cfg = NULL;
git_hashsig_option_t hashsig_opts;
- GITERR_CHECK_VERSION(given, GIT_DIFF_FIND_OPTIONS_VERSION, "git_diff_find_options");
+ GIT_ERROR_CHECK_VERSION(given, GIT_DIFF_FIND_OPTIONS_VERSION, "git_diff_find_options");
if (diff->repo != NULL &&
git_repository_config__weakptr(&cfg, diff->repo) < 0)
/* assign the internal metric with whitespace flag as payload */
if (!opts->metric) {
opts->metric = git__malloc(sizeof(git_diff_similarity_metric));
- GITERR_CHECK_ALLOC(opts->metric);
+ GIT_ERROR_CHECK_ALLOC(opts->metric);
opts->metric->file_signature = git_diff_find_similar__hashsig_for_file;
opts->metric->buffer_signature = git_diff_find_similar__hashsig_for_buf;
{
/* make new record for DELETED side of split */
git_diff_delta *deleted = git_diff__delta_dup(delta, &diff->pool);
- GITERR_CHECK_ALLOC(deleted);
+ GIT_ERROR_CHECK_ALLOC(deleted);
deleted->status = GIT_DELTA_DELETED;
deleted->nfiles = 1;
if (info->odb_obj != NULL)
error = git_object__from_odb_object(
(git_object **)&info->blob, info->repo,
- info->odb_obj, GIT_OBJ_BLOB);
+ info->odb_obj, GIT_OBJECT_BLOB);
else
error = git_blob_lookup(&info->blob, info->repo, &file->id);
if (error < 0) {
/* if lookup fails, just skip this item in similarity calc */
- giterr_clear();
+ git_error_clear();
} else {
size_t sz;
if (info->blob)
git_blob_free(info->blob);
else
- git_buf_free(&info->data);
+ git_buf_dispose(&info->data);
}
#define FLAG_SET(opts,flag_name) (((opts)->flags & flag_name) != 0)
diff_find_match *best_match;
git_diff_file swap;
+ assert(diff);
+
if ((error = normalize_find_opts(diff, &opts, given_opts)) < 0)
return error;
if ((opts.flags & GIT_DIFF_FIND_ALL) == 0)
goto cleanup;
- GITERR_CHECK_ALLOC_MULTIPLY(&sigcache_size, num_deltas, 2);
+ GIT_ERROR_CHECK_ALLOC_MULTIPLY(&sigcache_size, num_deltas, 2);
sigcache = git__calloc(sigcache_size, sizeof(void *));
- GITERR_CHECK_ALLOC(sigcache);
+ GIT_ERROR_CHECK_ALLOC(sigcache);
/* Label rename sources and targets
*
goto cleanup;
src2tgt = git__calloc(num_deltas, sizeof(diff_find_match));
- GITERR_CHECK_ALLOC(src2tgt);
+ GIT_ERROR_CHECK_ALLOC(src2tgt);
tgt2src = git__calloc(num_deltas, sizeof(diff_find_match));
- GITERR_CHECK_ALLOC(tgt2src);
+ GIT_ERROR_CHECK_ALLOC(tgt2src);
if (FLAG_SET(&opts, GIT_DIFF_FIND_COPIES)) {
tgt2src_copy = git__calloc(num_deltas, sizeof(diff_find_match));
- GITERR_CHECK_ALLOC(tgt2src_copy);
+ GIT_ERROR_CHECK_ALLOC(tgt2src_copy);
}
/*
*/
#include "diff_xdiff.h"
+#include "util.h"
#include "git2/errors.h"
#include "diff.h"
return 0;
fail:
- giterr_set(GITERR_INVALID, "malformed hunk header from xdiff");
+ git_error_set(GIT_ERROR_INVALID, "malformed hunk header from xdiff");
return -1;
}
info->new_lineno += (int)line->num_lines;
break;
default:
- giterr_set(GITERR_INVALID, "unknown diff line origin %02x",
+ git_error_set(GIT_ERROR_INVALID, "unknown diff line origin %02x",
(unsigned int)line->origin);
return -1;
}
const git_diff_delta *delta = patch->base.delta;
git_patch_generated_output *output = &info->xo->output;
git_diff_line line;
+ size_t buffer_len;
if (len == 1) {
output->error = git_xdiff_parse_hunk(&info->hunk, bufs[0].ptr);
info->hunk.header_len = bufs[0].size;
if (info->hunk.header_len >= sizeof(info->hunk.header))
info->hunk.header_len = sizeof(info->hunk.header) - 1;
+
+ /* Sanitize the hunk header in case there is invalid Unicode */
+ buffer_len = git__utf8_valid_buf_length((const uint8_t *) bufs[0].ptr, info->hunk.header_len);
+ /* Sanitizing the hunk header may delete the newline, so add it back again if there is room */
+ if (buffer_len < info->hunk.header_len) {
+ bufs[0].ptr[buffer_len] = '\n';
+ buffer_len += 1;
+ info->hunk.header_len = buffer_len;
+ }
+
memcpy(info->hunk.header, bufs[0].ptr, info->hunk.header_len);
info->hunk.header[info->hunk.header_len] = '\0';
if (info.xd_old_data.size > GIT_XDIFF_MAX_SIZE ||
info.xd_new_data.size > GIT_XDIFF_MAX_SIZE) {
- giterr_set(GITERR_INVALID, "files too large for diff");
+ git_error_set(GIT_ERROR_INVALID, "files too large for diff");
return -1;
}
static git_error g_git_oom_error = {
"Out of memory",
- GITERR_NOMEMORY
+ GIT_ERROR_NOMEMORY
};
static void set_error_from_buffer(int error_class)
set_error_from_buffer(error_class);
}
-void giterr_set_oom(void)
+void git_error_set_oom(void)
{
GIT_GLOBAL->last_error = &g_git_oom_error;
}
-void giterr_set(int error_class, const char *string, ...)
+void git_error_set(int error_class, const char *string, ...)
{
va_list arglist;
#ifdef GIT_WIN32
- DWORD win32_error_code = (error_class == GITERR_OS) ? GetLastError() : 0;
+ DWORD win32_error_code = (error_class == GIT_ERROR_OS) ? GetLastError() : 0;
#endif
- int error_code = (error_class == GITERR_OS) ? errno : 0;
+ int error_code = (error_class == GIT_ERROR_OS) ? errno : 0;
git_buf *buf = &GIT_GLOBAL->error_buf;
git_buf_clear(buf);
git_buf_vprintf(buf, string, arglist);
va_end(arglist);
- if (error_class == GITERR_OS)
+ if (error_class == GIT_ERROR_OS)
git_buf_PUTS(buf, ": ");
}
- if (error_class == GITERR_OS) {
+ if (error_class == GIT_ERROR_OS) {
#ifdef GIT_WIN32
char * win32_error = git_win32_get_error_message(win32_error_code);
if (win32_error) {
set_error_from_buffer(error_class);
}
-void giterr_set_str(int error_class, const char *string)
+void git_error_set_str(int error_class, const char *string)
{
git_buf *buf = &GIT_GLOBAL->error_buf;
set_error_from_buffer(error_class);
}
-int giterr_set_regex(const regex_t *regex, int error_code)
+int git_error_set_regex(const regex_t *regex, int error_code)
{
char error_buf[1024];
assert(error_code);
regerror(error_code, regex, error_buf, sizeof(error_buf));
- giterr_set_str(GITERR_REGEX, error_buf);
+ git_error_set_str(GIT_ERROR_REGEX, error_buf);
if (error_code == REG_NOMATCH)
return GIT_ENOTFOUND;
return GIT_EINVALIDSPEC;
}
-void giterr_clear(void)
+void git_error_clear(void)
{
if (GIT_GLOBAL->last_error != NULL) {
set_error(0, NULL);
#endif
}
-const git_error *giterr_last(void)
+const git_error *git_error_last(void)
{
return GIT_GLOBAL->last_error;
}
-int giterr_state_capture(git_error_state *state, int error_code)
+int git_error_state_capture(git_error_state *state, int error_code)
{
git_error *error = GIT_GLOBAL->last_error;
git_buf *error_buf = &GIT_GLOBAL->error_buf;
state->error_msg.message = git_buf_detach(error_buf);
}
- giterr_clear();
+ git_error_clear();
return error_code;
}
-int giterr_state_restore(git_error_state *state)
+int git_error_state_restore(git_error_state *state)
{
int ret = 0;
- giterr_clear();
+ git_error_clear();
if (state && state->error_msg.message) {
if (state->oom)
- giterr_set_oom();
+ git_error_set_oom();
else
set_error(state->error_msg.klass, state->error_msg.message);
return ret;
}
-void giterr_state_free(git_error_state *state)
+void git_error_state_free(git_error_state *state)
{
if (!state)
return;
memset(state, 0, sizeof(git_error_state));
}
-int giterr_system_last(void)
+int git_error_system_last(void)
{
#ifdef GIT_WIN32
return GetLastError();
#endif
}
-void giterr_system_set(int code)
+void git_error_system_set(int code)
{
#ifdef GIT_WIN32
SetLastError(code);
errno = code;
#endif
}
+
+/* Deprecated error values and functions */
+
+const git_error *giterr_last(void)
+{
+ return git_error_last();
+}
+
+void giterr_clear(void)
+{
+ git_error_clear();
+}
+
+void giterr_set_str(int error_class, const char *string)
+{
+ git_error_set_str(error_class, string);
+}
+
+void giterr_set_oom(void)
+{
+ git_error_set_oom();
+}
#cmakedefine GIT_GSSAPI 1
#cmakedefine GIT_WINHTTP 1
-#cmakedefine GIT_CURL 1
#cmakedefine GIT_HTTPS 1
#cmakedefine GIT_OPENSSL 1
#cmakedefine GIT_SECURE_TRANSPORT 1
+#cmakedefine GIT_MBEDTLS 1
#cmakedefine GIT_SHA1_COLLISIONDETECT 1
#cmakedefine GIT_SHA1_WIN32 1
#cmakedefine GIT_SHA1_COMMON_CRYPTO 1
#cmakedefine GIT_SHA1_OPENSSL 1
+#cmakedefine GIT_SHA1_MBEDTLS 1
#endif
goto cleanup;
error = git_refspec__dwim_one(&remote->active_refspecs, &head, &remote->refs);
- git_refspec__free(&head);
+ git_refspec__dispose(&head);
if (error < 0)
goto cleanup;
}
cleanup:
- git_refspec__free(&tagspec);
+ git_refspec__dispose(&tagspec);
return error;
}
remote->need_pack = 0;
if (filter_wants(remote, opts) < 0) {
- giterr_set(GITERR_NET, "failed to filter the reference list for wants");
+ git_error_set(GIT_ERROR_NET, "failed to filter the reference list for wants");
return -1;
}
*out = NULL;
fetchhead_ref = git__malloc(sizeof(git_fetchhead_ref));
- GITERR_CHECK_ALLOC(fetchhead_ref);
+ GIT_ERROR_CHECK_ALLOC(fetchhead_ref);
memset(fetchhead_ref, 0x0, sizeof(git_fetchhead_ref));
return -1;
if (git_filebuf_open(&file, path.ptr, GIT_FILEBUF_APPEND, GIT_REFS_FILE_MODE) < 0) {
- git_buf_free(&path);
+ git_buf_dispose(&path);
return -1;
}
- git_buf_free(&path);
+ git_buf_dispose(&path);
git_vector_sort(fetchhead_refs);
*remote_url = NULL;
if (!*line) {
- giterr_set(GITERR_FETCHHEAD,
+ git_error_set(GIT_ERROR_FETCHHEAD,
"empty line in FETCH_HEAD line %"PRIuZ, line_num);
return -1;
}
}
if (strlen(oid_str) != GIT_OID_HEXSZ) {
- giterr_set(GITERR_FETCHHEAD,
+ git_error_set(GIT_ERROR_FETCHHEAD,
"invalid object ID in FETCH_HEAD line %"PRIuZ, line_num);
return -1;
}
if (git_oid_fromstr(oid, oid_str) < 0) {
- const git_error *oid_err = giterr_last();
+ const git_error *oid_err = git_error_last();
const char *err_msg = oid_err ? oid_err->message : "invalid object ID";
- giterr_set(GITERR_FETCHHEAD, "%s in FETCH_HEAD line %"PRIuZ,
+ git_error_set(GIT_ERROR_FETCHHEAD, "%s in FETCH_HEAD line %"PRIuZ,
err_msg, line_num);
return -1;
}
/* Parse new data from newer git clients */
if (*line) {
if ((is_merge_str = git__strsep(&line, "\t")) == NULL) {
- giterr_set(GITERR_FETCHHEAD,
+ git_error_set(GIT_ERROR_FETCHHEAD,
"invalid description data in FETCH_HEAD line %"PRIuZ, line_num);
return -1;
}
else if (strcmp(is_merge_str, "not-for-merge") == 0)
*is_merge = 0;
else {
- giterr_set(GITERR_FETCHHEAD,
+ git_error_set(GIT_ERROR_FETCHHEAD,
"invalid for-merge entry in FETCH_HEAD line %"PRIuZ, line_num);
return -1;
}
if ((desc = line) == NULL) {
- giterr_set(GITERR_FETCHHEAD,
+ git_error_set(GIT_ERROR_FETCHHEAD,
"invalid description in FETCH_HEAD line %"PRIuZ, line_num);
return -1;
}
if (name) {
if ((desc = strstr(name, "' ")) == NULL ||
git__prefixcmp(desc, "' of ") != 0) {
- giterr_set(GITERR_FETCHHEAD,
+ git_error_set(GIT_ERROR_FETCHHEAD,
"invalid description in FETCH_HEAD line %"PRIuZ, line_num);
return -1;
}
error = cb(ref_name, remote_url, &oid, is_merge, payload);
if (error) {
- giterr_set_after_callback(error);
+ git_error_set_after_callback(error);
goto done;
}
}
if (*buffer) {
- giterr_set(GITERR_FETCHHEAD, "no EOL at line %"PRIuZ, line_num+1);
+ git_error_set(GIT_ERROR_FETCHHEAD, "no EOL at line %"PRIuZ, line_num+1);
error = -1;
goto done;
}
done:
- git_buf_free(&file);
- git_buf_free(&path);
- git_buf_free(&name);
+ git_buf_dispose(&file);
+ git_buf_dispose(&path);
+ git_buf_dispose(&name);
return error;
}
{
switch (file->last_error) {
case BUFERR_WRITE:
- giterr_set(GITERR_OS, "failed to write out file");
+ git_error_set(GIT_ERROR_OS, "failed to write out file");
return -1;
case BUFERR_MEM:
- giterr_set_oom();
+ git_error_set_oom();
return -1;
case BUFERR_ZLIB:
- giterr_set(GITERR_ZLIB,
+ git_error_set(GIT_ERROR_ZLIB,
"Buffer error when writing out ZLib data");
return -1;
if (flags & GIT_FILEBUF_FORCE)
p_unlink(file->path_lock);
else {
- giterr_clear(); /* actual OS error code just confuses */
- giterr_set(GITERR_OS,
+ git_error_clear(); /* actual OS error code just confuses */
+ git_error_set(GIT_ERROR_OS,
"failed to lock file '%s' for writing", file->path_lock);
return GIT_ELOCKED;
}
source = p_open(file->path_original, O_RDONLY);
if (source < 0) {
- giterr_set(GITERR_OS,
+ git_error_set(GIT_ERROR_OS,
"failed to open file '%s' for reading",
file->path_original);
return -1;
p_close(source);
if (read_bytes < 0) {
- giterr_set(GITERR_OS, "failed to read file '%s'", file->path_original);
+ git_error_set(GIT_ERROR_OS, "failed to read file '%s'", file->path_original);
return -1;
} else if (error < 0) {
- giterr_set(GITERR_OS, "failed to write file '%s'", file->path_lock);
+ git_error_set(GIT_ERROR_OS, "failed to write file '%s'", file->path_lock);
return -1;
}
}
}
if (error < 0) {
- giterr_set(GITERR_OS, "failed to stat '%s'", curpath.ptr);
+ git_error_set(GIT_ERROR_OS, "failed to stat '%s'", curpath.ptr);
error = -1;
goto cleanup;
}
ret = p_readlink(curpath.ptr, target.ptr, GIT_PATH_MAX);
if (ret < 0) {
- giterr_set(GITERR_OS, "failed to read symlink '%s'", curpath.ptr);
+ git_error_set(GIT_ERROR_OS, "failed to read symlink '%s'", curpath.ptr);
error = -1;
goto cleanup;
}
if (ret == GIT_PATH_MAX) {
- giterr_set(GITERR_INVALID, "symlink target too long");
+ git_error_set(GIT_ERROR_INVALID, "symlink target too long");
error = -1;
goto cleanup;
}
goto cleanup;
git_buf_swap(&curpath, &dir);
- git_buf_free(&dir);
+ git_buf_dispose(&dir);
if ((error = git_path_apply_relative(&curpath, target.ptr)) < 0)
goto cleanup;
}
}
- giterr_set(GITERR_INVALID, "maximum symlink depth reached");
+ git_error_set(GIT_ERROR_INVALID, "maximum symlink depth reached");
error = -1;
cleanup:
- git_buf_free(&curpath);
- git_buf_free(&target);
+ git_buf_dispose(&curpath);
+ git_buf_dispose(&target);
return error;
}
/* Allocate the main cache buffer */
if (!file->do_not_buffer) {
file->buffer = git__malloc(file->buf_size);
- GITERR_CHECK_ALLOC(file->buffer);
+ GIT_ERROR_CHECK_ALLOC(file->buffer);
}
/* If we are hashing on-write, allocate a new hash context */
if (compression != 0) {
/* Initialize the ZLib stream */
if (deflateInit(&file->zs, compression) != Z_OK) {
- giterr_set(GITERR_ZLIB, "failed to initialize zlib");
+ git_error_set(GIT_ERROR_ZLIB, "failed to initialize zlib");
goto cleanup;
}
/* Allocate the Zlib cache buffer */
file->z_buf = git__malloc(file->buf_size);
- GITERR_CHECK_ALLOC(file->z_buf);
+ GIT_ERROR_CHECK_ALLOC(file->z_buf);
/* Never flush */
file->flush_mode = Z_NO_FLUSH;
file->fd = git_futils_mktmp(&tmp_path, path, mode);
if (file->fd < 0) {
- git_buf_free(&tmp_path);
+ git_buf_dispose(&tmp_path);
goto cleanup;
}
file->fd_is_open = true;
/* No original path */
file->path_original = NULL;
file->path_lock = git_buf_detach(&tmp_path);
- GITERR_CHECK_ALLOC(file->path_lock);
+ GIT_ERROR_CHECK_ALLOC(file->path_lock);
} else {
git_buf resolved_path = GIT_BUF_INIT;
file->path_original = git_buf_detach(&resolved_path);
/* create the locking path by appending ".lock" to the original */
- GITERR_CHECK_ALLOC_ADD(&alloc_len, path_len, GIT_FILELOCK_EXTLENGTH);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, path_len, GIT_FILELOCK_EXTLENGTH);
file->path_lock = git__malloc(alloc_len);
- GITERR_CHECK_ALLOC(file->path_lock);
+ GIT_ERROR_CHECK_ALLOC(file->path_lock);
memcpy(file->path_lock, file->path_original, path_len);
memcpy(file->path_lock + path_len, GIT_FILELOCK_EXTENSION, GIT_FILELOCK_EXTLENGTH);
if (git_path_isdir(file->path_original)) {
- giterr_set(GITERR_FILESYSTEM, "path '%s' is a directory", file->path_original);
+ git_error_set(GIT_ERROR_FILESYSTEM, "path '%s' is a directory", file->path_original);
error = GIT_EDIRECTORY;
goto cleanup;
}
{
git__free(file->path_original);
file->path_original = git__strdup(path);
- GITERR_CHECK_ALLOC(file->path_original);
+ GIT_ERROR_CHECK_ALLOC(file->path_original);
return git_filebuf_commit(file);
}
file->fd_is_open = false;
if (file->do_fsync && p_fsync(file->fd) < 0) {
- giterr_set(GITERR_OS, "failed to fsync '%s'", file->path_lock);
+ git_error_set(GIT_ERROR_OS, "failed to fsync '%s'", file->path_lock);
goto on_error;
}
if (p_close(file->fd) < 0) {
- giterr_set(GITERR_OS, "failed to close file at '%s'", file->path_lock);
+ git_error_set(GIT_ERROR_OS, "failed to close file at '%s'", file->path_lock);
goto on_error;
}
file->fd = -1;
if (p_rename(file->path_lock, file->path_original) < 0) {
- giterr_set(GITERR_OS, "failed to rename lockfile to '%s'", file->path_original);
+ git_error_set(GIT_ERROR_OS, "failed to rename lockfile to '%s'", file->path_original);
goto on_error;
}
res = p_stat(file->path_original, &st);
if (res < 0) {
- giterr_set(GITERR_OS, "could not get stat info for '%s'",
+ git_error_set(GIT_ERROR_OS, "could not get stat info for '%s'",
file->path_original);
return res;
}
return -1;
if ((fd = p_mkstemp(path_out->ptr)) < 0) {
- giterr_set(GITERR_OS,
+ git_error_set(GIT_ERROR_OS,
"failed to create temporary file '%s'", path_out->ptr);
return -1;
}
if (p_chmod(path_out->ptr, (mode & ~mask))) {
- giterr_set(GITERR_OS,
+ git_error_set(GIT_ERROR_OS,
"failed to set permissions on file '%s'", path_out->ptr);
return -1;
}
fd = p_creat(path, mode);
if (fd < 0) {
- giterr_set(GITERR_OS, "failed to create file '%s'", path);
+ git_error_set(GIT_ERROR_OS, "failed to create file '%s'", path);
return -1;
}
if (fd < 0) {
int error = errno;
- giterr_set(GITERR_OS, "failed to create locked file '%s'", path);
+ git_error_set(GIT_ERROR_OS, "failed to create locked file '%s'", path);
switch (error) {
case EEXIST:
return GIT_ELOCKED;
struct stat sb;
if (p_fstat(fd, &sb)) {
- giterr_set(GITERR_OS, "failed to stat file descriptor");
+ git_error_set(GIT_ERROR_OS, "failed to stat file descriptor");
return -1;
}
git_buf_clear(buf);
if (!git__is_ssizet(len)) {
- giterr_set(GITERR_INVALID, "read too large");
+ git_error_set(GIT_ERROR_INVALID, "read too large");
return -1;
}
- GITERR_CHECK_ALLOC_ADD(&alloc_len, len, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, len, 1);
if (git_buf_grow(buf, alloc_len) < 0)
return -1;
read_size = p_read(fd, buf->ptr, len);
if (read_size != (ssize_t)len) {
- giterr_set(GITERR_OS, "failed to read descriptor");
- git_buf_free(buf);
+ git_error_set(GIT_ERROR_OS, "failed to read descriptor");
+ git_buf_dispose(buf);
return -1;
}
if (S_ISDIR(st.st_mode)) {
- giterr_set(GITERR_INVALID, "requested file is a directory");
+ git_error_set(GIT_ERROR_INVALID, "requested file is a directory");
return GIT_ENOTFOUND;
}
if (!git__is_sizet(st.st_size+1)) {
- giterr_set(GITERR_OS, "invalid regular file stat for '%s'", path);
+ git_error_set(GIT_ERROR_OS, "invalid regular file stat for '%s'", path);
return -1;
}
if (checksum) {
if ((error = git_hash_buf(&checksum_new, buf.ptr, buf.size)) < 0) {
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return error;
}
* If we were given a checksum, we only want to use it if it's different
*/
if (!git_oid__cmp(checksum, &checksum_new)) {
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
if (updated)
*updated = 0;
*updated = 1;
git_buf_swap(out, &buf);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return 0;
}
mode = GIT_FILEMODE_BLOB;
if ((fd = p_open(path, flags, mode)) < 0) {
- giterr_set(GITERR_OS, "could not open '%s' for writing", path);
+ git_error_set(GIT_ERROR_OS, "could not open '%s' for writing", path);
return fd;
}
if ((error = p_write(fd, git_buf_cstr(buf), git_buf_len(buf))) < 0) {
- giterr_set(GITERR_OS, "could not write to '%s'", path);
+ git_error_set(GIT_ERROR_OS, "could not write to '%s'", path);
(void)p_close(fd);
return error;
}
if (do_fsync && (error = p_fsync(fd)) < 0) {
- giterr_set(GITERR_OS, "could not fsync '%s'", path);
+ git_error_set(GIT_ERROR_OS, "could not fsync '%s'", path);
p_close(fd);
return error;
}
if ((error = p_close(fd)) < 0) {
- giterr_set(GITERR_OS, "error while closing '%s'", path);
+ git_error_set(GIT_ERROR_OS, "error while closing '%s'", path);
return error;
}
return -1;
if (p_rename(from, to) < 0) {
- giterr_set(GITERR_OS, "failed to rename '%s' to '%s'", from, to);
+ git_error_set(GIT_ERROR_OS, "failed to rename '%s' to '%s'", from, to);
return -1;
}
}
if (!git__is_sizet(len)) {
- giterr_set(GITERR_OS, "file `%s` too large to mmap", path);
+ git_error_set(GIT_ERROR_OS, "file `%s` too large to mmap", path);
result = -1;
goto out;
}
{
/* with exclusive create, existing dir is an error */
if ((flags & GIT_MKDIR_EXCL) != 0) {
- giterr_set(GITERR_FILESYSTEM,
+ git_error_set(GIT_ERROR_FILESYSTEM,
"failed to make directory '%s': directory exists", path);
return GIT_EEXISTS;
}
if ((S_ISREG(st->st_mode) && (flags & GIT_MKDIR_REMOVE_FILES)) ||
(S_ISLNK(st->st_mode) && (flags & GIT_MKDIR_REMOVE_SYMLINKS))) {
if (p_unlink(path) < 0) {
- giterr_set(GITERR_OS, "failed to remove %s '%s'",
+ git_error_set(GIT_ERROR_OS, "failed to remove %s '%s'",
S_ISLNK(st->st_mode) ? "symlink" : "file", path);
return GIT_EEXISTS;
}
opts->perfdata.mkdir_calls++;
if (p_mkdir(path, mode) < 0) {
- giterr_set(GITERR_OS, "failed to make directory '%s'", path);
+ git_error_set(GIT_ERROR_OS, "failed to make directory '%s'", path);
return GIT_EEXISTS;
}
}
opts->perfdata.stat_calls++;
if (p_stat(path, st) < 0) {
- giterr_set(GITERR_OS, "failed to make directory '%s'", path);
+ git_error_set(GIT_ERROR_OS, "failed to make directory '%s'", path);
return GIT_EEXISTS;
}
}
else if (!S_ISDIR(st->st_mode)) {
- giterr_set(GITERR_FILESYSTEM,
+ git_error_set(GIT_ERROR_FILESYSTEM,
"failed to make directory '%s': directory exists", path);
return GIT_EEXISTS;
}
opts->perfdata.chmod_calls++;
if (p_chmod(path, mode) < 0) {
- giterr_set(GITERR_OS, "failed to set permissions on '%s'", path);
+ git_error_set(GIT_ERROR_OS, "failed to set permissions on '%s'", path);
return -1;
}
}
ssize_t root_len;
if (path->size == 0) {
- giterr_set(GITERR_OS, "attempt to create empty path");
+ git_error_set(GIT_ERROR_OS, "attempt to create empty path");
return -1;
}
if (error == 0) {
break;
} else if (errno != ENOENT) {
- giterr_set(GITERR_OS, "failed to stat '%s'", parent_path.ptr);
+ git_error_set(GIT_ERROR_OS, "failed to stat '%s'", parent_path.ptr);
goto done;
}
parent_path.size ? parent_path.ptr : NULL, mode, flags, &opts);
done:
- git_buf_free(&make_path);
- git_buf_free(&parent_path);
+ git_buf_dispose(&make_path);
+ git_buf_dispose(&parent_path);
return error;
}
retry_lstat:
if (p_lstat(make_path.ptr, &st) < 0) {
if (mkdir_attempted || errno != ENOENT) {
- giterr_set(GITERR_OS, "cannot access component in path '%s'", make_path.ptr);
+ git_error_set(GIT_ERROR_OS, "cannot access component in path '%s'", make_path.ptr);
error = -1;
goto done;
}
- giterr_clear();
+ git_error_clear();
opts->perfdata.mkdir_calls++;
mkdir_attempted = true;
if (p_mkdir(make_path.ptr, mode) < 0) {
if (errno == EEXIST)
goto retry_lstat;
- giterr_set(GITERR_OS, "failed to make directory '%s'", make_path.ptr);
+ git_error_set(GIT_ERROR_OS, "failed to make directory '%s'", make_path.ptr);
error = -1;
goto done;
}
char *cache_path;
size_t alloc_size;
- GITERR_CHECK_ALLOC_ADD(&alloc_size, make_path.size, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_size, make_path.size, 1);
if (!git__is_uint32(alloc_size))
return -1;
cache_path = git_pool_malloc(opts->pool, (uint32_t)alloc_size);
- GITERR_CHECK_ALLOC(cache_path);
+ GIT_ERROR_CHECK_ALLOC(cache_path);
memcpy(cache_path, make_path.ptr, make_path.size + 1);
opts->perfdata.stat_calls++;
if (p_stat(make_path.ptr, &st) < 0 || !S_ISDIR(st.st_mode)) {
- giterr_set(GITERR_OS, "path is not a directory '%s'",
+ git_error_set(GIT_ERROR_OS, "path is not a directory '%s'",
make_path.ptr);
error = GIT_ENOTFOUND;
}
}
done:
- git_buf_free(&make_path);
+ git_buf_dispose(&make_path);
return error;
}
static int futils__error_cannot_rmdir(const char *path, const char *filemsg)
{
if (filemsg)
- giterr_set(GITERR_OS, "could not remove directory '%s': %s",
+ git_error_set(GIT_ERROR_OS, "could not remove directory '%s': %s",
path, filemsg);
else
- giterr_set(GITERR_OS, "could not remove directory '%s'", path);
+ git_error_set(GIT_ERROR_OS, "could not remove directory '%s'", path);
return -1;
}
&fullpath, base, futils__rmdir_empty_parent, &data);
if (error == GIT_ITEROVER) {
- giterr_clear();
+ git_error_clear();
error = 0;
}
- git_buf_free(&fullpath);
+ git_buf_dispose(&fullpath);
return error;
}
error = p_write(ofd, buffer, len);
if (len < 0) {
- giterr_set(GITERR_OS, "read error while copying file");
+ git_error_set(GIT_ERROR_OS, "read error while copying file");
error = (int)len;
}
if (error < 0)
- giterr_set(GITERR_OS, "write error while copying file");
+ git_error_set(GIT_ERROR_OS, "write error while copying file");
if (close_fd_when_done) {
p_close(ifd);
char *link_data;
size_t alloc_size;
- GITERR_CHECK_ALLOC_ADD(&alloc_size, link_size, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_size, link_size, 1);
link_data = git__malloc(alloc_size);
- GITERR_CHECK_ALLOC(link_data);
+ GIT_ERROR_CHECK_ALLOC(link_data);
read_len = p_readlink(from, link_data, link_size);
if (read_len != (ssize_t)link_size) {
- giterr_set(GITERR_OS, "failed to read symlink data for '%s'", from);
+ git_error_set(GIT_ERROR_OS, "failed to read symlink data for '%s'", from);
error = -1;
}
else {
link_data[read_len] = '\0';
if (p_symlink(link_data, to) < 0) {
- giterr_set(GITERR_OS, "could not symlink '%s' as '%s'",
+ git_error_set(GIT_ERROR_OS, "could not symlink '%s' as '%s'",
link_data, to);
error = -1;
}
else if (error != GIT_ENOTFOUND)
return error;
else {
- giterr_clear();
+ git_error_clear();
error = 0;
}
return 0;
if (p_unlink(info->to.ptr) < 0) {
- giterr_set(GITERR_OS, "cannot overwrite existing file '%s'",
+ git_error_set(GIT_ERROR_OS, "cannot overwrite existing file '%s'",
info->to.ptr);
return GIT_EEXISTS;
}
/* make symlink or regular file */
if (info->flags & GIT_CPDIR_LINK_FILES) {
if ((error = p_link(from->ptr, info->to.ptr)) < 0)
- giterr_set(GITERR_OS, "failed to link '%s'", from->ptr);
+ git_error_set(GIT_ERROR_OS, "failed to link '%s'", from->ptr);
} else if (S_ISLNK(from_st.st_mode)) {
error = cp_link(from->ptr, info->to.ptr, (size_t)from_st.st_size);
} else {
error = _cp_r_callback(&info, &path);
- git_buf_free(&path);
- git_buf_free(&info.to);
+ git_buf_dispose(&path);
+ git_buf_dispose(&info.to);
return error;
}
int fd, error = -1;
if ((fd = p_open(path, O_RDONLY)) < 0) {
- giterr_set(GITERR_OS, "failed to open directory '%s' for fsync", path);
+ git_error_set(GIT_ERROR_OS, "failed to open directory '%s' for fsync", path);
return -1;
}
if ((error = p_fsync(fd)) < 0)
- giterr_set(GITERR_OS, "failed to fsync directory '%s'", path);
+ git_error_set(GIT_ERROR_OS, "failed to fsync directory '%s'", path);
p_close(fd);
return error;
* This function updates the file stamp to current data for the given path
* and returns 0 if the file is up-to-date relative to the prior setting,
* 1 if the file has been changed, or GIT_ENOTFOUND if the file doesn't
- * exist. This will not call giterr_set, so you must set the error if you
+ * exist. This will not call git_error_set, so you must set the error if you
* plan to return an error.
*
* @param stamp File stamp to be checked
if (filter_def_scan_attrs(&attrs, &nattr, &nmatch, filter->attributes) < 0)
return -1;
- GITERR_CHECK_ALLOC_MULTIPLY(&alloc_len, nattr, 2);
- GITERR_CHECK_ALLOC_MULTIPLY(&alloc_len, alloc_len, sizeof(char *));
- GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, sizeof(git_filter_def));
+ GIT_ERROR_CHECK_ALLOC_MULTIPLY(&alloc_len, nattr, 2);
+ GIT_ERROR_CHECK_ALLOC_MULTIPLY(&alloc_len, alloc_len, sizeof(char *));
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, sizeof(git_filter_def));
fdef = git__calloc(1, alloc_len);
- GITERR_CHECK_ALLOC(fdef);
+ GIT_ERROR_CHECK_ALLOC(fdef);
fdef->filter_name = git__strdup(name);
- GITERR_CHECK_ALLOC(fdef->filter_name);
+ GIT_ERROR_CHECK_ALLOC(fdef->filter_name);
fdef->filter = filter;
fdef->priority = priority;
assert(name && filter);
if (git_rwlock_wrlock(&filter_registry.lock) < 0) {
- giterr_set(GITERR_OS, "failed to lock filter registry");
+ git_error_set(GIT_ERROR_OS, "failed to lock filter registry");
return -1;
}
if (!filter_registry_find(NULL, name)) {
- giterr_set(
- GITERR_FILTER, "attempt to reregister existing filter '%s'", name);
+ git_error_set(
+ GIT_ERROR_FILTER, "attempt to reregister existing filter '%s'", name);
error = GIT_EEXISTS;
goto done;
}
/* cannot unregister default filters */
if (!strcmp(GIT_FILTER_CRLF, name) || !strcmp(GIT_FILTER_IDENT, name)) {
- giterr_set(GITERR_FILTER, "cannot unregister filter '%s'", name);
+ git_error_set(GIT_ERROR_FILTER, "cannot unregister filter '%s'", name);
return -1;
}
if (git_rwlock_wrlock(&filter_registry.lock) < 0) {
- giterr_set(GITERR_OS, "failed to lock filter registry");
+ git_error_set(GIT_ERROR_OS, "failed to lock filter registry");
return -1;
}
if ((fdef = filter_registry_lookup(&pos, name)) == NULL) {
- giterr_set(GITERR_FILTER, "cannot find filter '%s' to unregister", name);
+ git_error_set(GIT_ERROR_FILTER, "cannot find filter '%s' to unregister", name);
error = GIT_ENOTFOUND;
goto done;
}
git_filter *filter = NULL;
if (git_rwlock_rdlock(&filter_registry.lock) < 0) {
- giterr_set(GITERR_OS, "failed to lock filter registry");
+ git_error_set(GIT_ERROR_OS, "failed to lock filter registry");
return NULL;
}
git_filter_list *fl = NULL;
size_t pathlen = src->path ? strlen(src->path) : 0, alloclen;
- GITERR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_filter_list), pathlen);
- GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_filter_list), pathlen);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1);
fl = git__calloc(1, alloclen);
- GITERR_CHECK_ALLOC(fl);
+ GIT_ERROR_CHECK_ALLOC(fl);
if (src->path)
memcpy(fl->path, src->path, pathlen);
int error;
size_t i;
const char **strs = git__calloc(fdef->nattrs, sizeof(const char *));
- GITERR_CHECK_ALLOC(strs);
+ GIT_ERROR_CHECK_ALLOC(strs);
error = git_attr_get_many_with_session(
strs, repo, attr_session, 0, src->path, fdef->nattrs, fdef->attrs);
/* if no values were found but no matches are needed, it's okay! */
if (error == GIT_ENOTFOUND && !fdef->nmatches) {
- giterr_clear();
+ git_error_clear();
git__free((void *)strs);
return 0;
}
git_filter_def *fdef;
if (git_rwlock_rdlock(&filter_registry.lock) < 0) {
- giterr_set(GITERR_OS, "failed to lock filter registry");
+ git_error_set(GIT_ERROR_OS, "failed to lock filter registry");
return -1;
}
}
fe = git_array_alloc(fl->filters);
- GITERR_CHECK_ALLOC(fe);
+ GIT_ERROR_CHECK_ALLOC(fe);
fe->filter = fdef->filter;
fe->filter_name = fdef->filter_name;
assert(fl && filter);
if (git_rwlock_rdlock(&filter_registry.lock) < 0) {
- giterr_set(GITERR_OS, "failed to lock filter registry");
+ git_error_set(GIT_ERROR_OS, "failed to lock filter registry");
return -1;
}
git_rwlock_rdunlock(&filter_registry.lock);
if (fdef == NULL) {
- giterr_set(GITERR_FILTER, "cannot use an unregistered filter");
+ git_error_set(GIT_ERROR_FILTER, "cannot use an unregistered filter");
return -1;
}
return error;
fe = git_array_alloc(fl->filters);
- GITERR_CHECK_ALLOC(fe);
+ GIT_ERROR_CHECK_ALLOC(fe);
fe->filter = filter;
fe->payload = payload;
git_off_t rawsize = git_blob_rawsize(blob);
if (!git__is_sizet(rawsize)) {
- giterr_set(GITERR_OS, "blob is too large to filter");
+ git_error_set(GIT_ERROR_OS, "blob is too large to filter");
return -1;
}
{
struct proxy_stream *proxy_stream = (struct proxy_stream *)s;
git_buf *writebuf;
+ git_error_state error_state = {0};
int error;
assert(proxy_stream);
git_buf_sanitize(proxy_stream->output);
writebuf = proxy_stream->output;
} else {
+ /* close stream before erroring out taking care
+ * to preserve the original error */
+ git_error_state_capture(&error_state, error);
+ proxy_stream->target->close(proxy_stream->target);
+ git_error_state_restore(&error_state);
return error;
}
struct proxy_stream *proxy_stream = (struct proxy_stream *)s;
assert(proxy_stream);
- git_buf_free(&proxy_stream->input);
- git_buf_free(&proxy_stream->temp_buf);
+ git_buf_dispose(&proxy_stream->input);
+ git_buf_dispose(&proxy_stream->temp_buf);
git__free(proxy_stream);
}
git_writestream *target)
{
struct proxy_stream *proxy_stream = git__calloc(1, sizeof(struct proxy_stream));
- GITERR_CHECK_ALLOC(proxy_stream);
+ GIT_ERROR_CHECK_ALLOC(proxy_stream);
proxy_stream->parent.write = proxy_stream_write;
proxy_stream->parent.close = proxy_stream_close;
}
if (readlen < 0)
- error = readlen;
+ error = -1;
done:
if (initialized)
if (fd >= 0)
p_close(fd);
stream_list_free(&filter_streams);
- git_buf_free(&abspath);
+ git_buf_dispose(&abspath);
return error;
}
/* Amount of file to examine for NUL byte when checking binary-ness */
#define GIT_FILTER_BYTES_TO_CHECK_NUL 8000
-/* Possible CRLF values */
-typedef enum {
- GIT_CRLF_GUESS = -1,
- GIT_CRLF_BINARY = 0,
- GIT_CRLF_TEXT,
- GIT_CRLF_INPUT,
- GIT_CRLF_CRLF,
- GIT_CRLF_AUTO,
-} git_crlf_t;
-
typedef struct {
git_attr_session *attr_session;
git_buf *temp_buf;
#include "global.h"
+#include "alloc.h"
#include "hash.h"
#include "sysdir.h"
#include "filter.h"
#include "merge_driver.h"
-#include "streams/curl.h"
+#include "streams/registry.h"
+#include "streams/mbedtls.h"
#include "streams/openssl.h"
#include "thread-utils.h"
#include "git2/global.h"
git_mutex git__mwindow_mutex;
-#define MAX_SHUTDOWN_CB 10
+typedef int (*git_global_init_fn)(void);
+
+static git_global_init_fn git__init_callbacks[] = {
+ git_allocator_global_init,
+ git_hash_global_init,
+ git_sysdir_global_init,
+ git_filter_global_init,
+ git_merge_driver_global_init,
+ git_transport_ssh_global_init,
+ git_stream_registry_global_init,
+ git_openssl_stream_global_init,
+ git_mbedtls_stream_global_init,
+ git_mwindow_global_init
+};
+
+static git_global_shutdown_fn git__shutdown_callbacks[ARRAY_SIZE(git__init_callbacks)];
-static git_global_shutdown_fn git__shutdown_callbacks[MAX_SHUTDOWN_CB];
static git_atomic git__n_shutdown_callbacks;
static git_atomic git__n_inits;
char *git__user_agent;
void git__on_shutdown(git_global_shutdown_fn callback)
{
int count = git_atomic_inc(&git__n_shutdown_callbacks);
- assert(count <= MAX_SHUTDOWN_CB && count > 0);
+ assert(count <= (int) ARRAY_SIZE(git__shutdown_callbacks) && count > 0);
git__shutdown_callbacks[count - 1] = callback;
}
static int init_common(void)
{
+ size_t i;
int ret;
/* Initialize the CRT debug allocator first, before our first malloc */
git_win32__stack_init();
#endif
- /* Initialize any other subsystems that have global state */
- if ((ret = git_hash_global_init()) == 0 &&
- (ret = git_sysdir_global_init()) == 0 &&
- (ret = git_filter_global_init()) == 0 &&
- (ret = git_merge_driver_global_init()) == 0 &&
- (ret = git_transport_ssh_global_init()) == 0 &&
- (ret = git_openssl_stream_global_init()) == 0 &&
- (ret = git_curl_stream_global_init()) == 0)
- ret = git_mwindow_global_init();
+ /* Initialize subsystems that have global state */
+ for (i = 0; i < ARRAY_SIZE(git__init_callbacks); i++)
+ if ((ret = git__init_callbacks[i]()) != 0)
+ break;
GIT_MEMORY_BARRIER;
{
int ret, err;
- ret = git_atomic_inc(&git__n_inits);
-
if ((err = pthread_mutex_lock(&_init_mutex)) != 0)
return err;
+
+ ret = git_atomic_inc(&git__n_inits);
err = pthread_once(&_once_init, init_once);
err |= pthread_mutex_unlock(&_init_mutex);
{
void *ptr = NULL;
pthread_once_t new_once = PTHREAD_ONCE_INIT;
- int ret;
+ int error, ret;
- if ((ret = git_atomic_dec(&git__n_inits)) != 0)
- return ret;
+ if ((error = pthread_mutex_lock(&_init_mutex)) != 0)
+ return error;
- if ((ret = pthread_mutex_lock(&_init_mutex)) != 0)
- return ret;
+ if ((ret = git_atomic_dec(&git__n_inits)) != 0)
+ goto out;
/* Shut down any subsystems that have global state */
shutdown_common();
git_mutex_free(&git__mwindow_mutex);
_once_init = new_once;
- if ((ret = pthread_mutex_unlock(&_init_mutex)) != 0)
- return ret;
+out:
+ if ((error = pthread_mutex_unlock(&_init_mutex)) != 0)
+ return error;
- return 0;
+ return ret;
}
git_global_st *git__global_state(void)
typedef struct git_hash_prov git_hash_prov;
typedef struct git_hash_ctx git_hash_ctx;
-int git_hash_global_init(void);
int git_hash_ctx_init(git_hash_ctx *ctx);
void git_hash_ctx_cleanup(git_hash_ctx *ctx);
# include "hash/hash_openssl.h"
#elif defined(GIT_SHA1_WIN32)
# include "hash/hash_win32.h"
+#elif defined(GIT_SHA1_MBEDTLS)
+# include "hash/hash_mbedtls.h"
#else
# include "hash/hash_generic.h"
#endif
+int git_hash_global_init(void);
+
typedef struct {
void *data;
size_t len;
SHA1_CTX c;
};
-#define git_hash_global_init() 0
#define git_hash_ctx_init(ctx) git_hash_init(ctx)
#define git_hash_ctx_cleanup(ctx)
+GIT_INLINE(int) git_hash_global_init(void)
+{
+ return 0;
+}
+
GIT_INLINE(int) git_hash_init(git_hash_ctx *ctx)
{
assert(ctx);
{
assert(ctx);
if (SHA1DCFinal(out->id, &ctx->c)) {
- giterr_set(GITERR_SHA1, "SHA1 collision attack detected");
+ git_error_set(GIT_ERROR_SHA1, "SHA1 collision attack detected");
return -1;
}
#define CC_LONG_MAX ((CC_LONG)-1)
-#define git_hash_global_init() 0
#define git_hash_ctx_init(ctx) git_hash_init(ctx)
#define git_hash_ctx_cleanup(ctx)
+GIT_INLINE(int) git_hash_global_init(void)
+{
+ return 0;
+}
+
GIT_INLINE(int) git_hash_init(git_hash_ctx *ctx)
{
assert(ctx);
unsigned int W[16];
};
-#define git_hash_global_init() 0
#define git_hash_ctx_init(ctx) git_hash_init(ctx)
#define git_hash_ctx_cleanup(ctx)
+GIT_INLINE(int) git_hash_global_init(void)
+{
+ return 0;
+}
+
#endif
--- /dev/null
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#include "common.h"
+#include "hash.h"
+#include "hash/hash_mbedtls.h"
+
+void git_hash_ctx_cleanup(git_hash_ctx *ctx)
+{
+ assert(ctx);
+ mbedtls_sha1_free(&ctx->c);
+}
+
+int git_hash_init(git_hash_ctx *ctx)
+{
+ assert(ctx);
+ mbedtls_sha1_init(&ctx->c);
+ mbedtls_sha1_starts(&ctx->c);
+ return 0;
+}
+
+int git_hash_update(git_hash_ctx *ctx, const void *data, size_t len)
+{
+ assert(ctx);
+ mbedtls_sha1_update(&ctx->c, data, len);
+ return 0;
+}
+
+int git_hash_final(git_oid *out, git_hash_ctx *ctx)
+{
+ assert(ctx);
+ mbedtls_sha1_finish(&ctx->c, out->id);
+ return 0;
+}
--- /dev/null
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#ifndef INCLUDE_hash_mbedtld_h__
+#define INCLUDE_hash_mbedtld_h__
+
+#include <mbedtls/sha1.h>
+
+struct git_hash_ctx {
+ mbedtls_sha1_context c;
+};
+
+#define git_hash_ctx_init(ctx) git_hash_init(ctx)
+
+GIT_INLINE(int) git_hash_global_init(void)
+{
+ return 0;
+}
+
+#endif /* INCLUDE_hash_mbedtld_h__ */
SHA_CTX c;
};
-#define git_hash_global_init() 0
#define git_hash_ctx_init(ctx) git_hash_init(ctx)
#define git_hash_ctx_cleanup(ctx)
+GIT_INLINE(int) git_hash_global_init(void)
+{
+ return 0;
+}
+
GIT_INLINE(int) git_hash_init(git_hash_ctx *ctx)
{
assert(ctx);
if (SHA1_Init(&ctx->c) != 1) {
- giterr_set(GITERR_SHA1, "hash_openssl: failed to initialize hash context");
+ git_error_set(GIT_ERROR_SHA1, "hash_openssl: failed to initialize hash context");
return -1;
}
assert(ctx);
if (SHA1_Update(&ctx->c, data, len) != 1) {
- giterr_set(GITERR_SHA1, "hash_openssl: failed to update hash");
+ git_error_set(GIT_ERROR_SHA1, "hash_openssl: failed to update hash");
return -1;
}
assert(ctx);
if (SHA1_Final(out->id, &ctx->c) != 1) {
- giterr_set(GITERR_SHA1, "hash_openssl: failed to finalize hash");
+ git_error_set(GIT_ERROR_SHA1, "hash_openssl: failed to finalize hash");
return -1;
}
/* Only use CNG on Windows 2008 / Vista SP1 or better (Windows 6.0 SP1) */
if (!git_has_win32_version(6, 0, 1)) {
- giterr_set(GITERR_SHA1, "CryptoNG is not supported on this platform");
+ git_error_set(GIT_ERROR_SHA1, "CryptoNG is not supported on this platform");
return -1;
}
StringCchCat(dll_path, MAX_PATH, "\\") < 0 ||
StringCchCat(dll_path, MAX_PATH, GIT_HASH_CNG_DLL_NAME) < 0 ||
(hash_prov.prov.cng.dll = LoadLibrary(dll_path)) == NULL) {
- giterr_set(GITERR_SHA1, "CryptoNG library could not be loaded");
+ git_error_set(GIT_ERROR_SHA1, "CryptoNG library could not be loaded");
return -1;
}
(hash_prov.prov.cng.close_algorithm_provider = (hash_win32_cng_close_algorithm_provider_fn)GetProcAddress(hash_prov.prov.cng.dll, "BCryptCloseAlgorithmProvider")) == NULL) {
FreeLibrary(hash_prov.prov.cng.dll);
- giterr_set(GITERR_OS, "CryptoNG functions could not be loaded");
+ git_error_set(GIT_ERROR_OS, "CryptoNG functions could not be loaded");
return -1;
}
if (hash_prov.prov.cng.open_algorithm_provider(&hash_prov.prov.cng.handle, GIT_HASH_CNG_HASH_TYPE, NULL, GIT_HASH_CNG_HASH_REUSABLE) < 0) {
FreeLibrary(hash_prov.prov.cng.dll);
- giterr_set(GITERR_OS, "algorithm provider could not be initialized");
+ git_error_set(GIT_ERROR_OS, "algorithm provider could not be initialized");
return -1;
}
hash_prov.prov.cng.close_algorithm_provider(hash_prov.prov.cng.handle, 0);
FreeLibrary(hash_prov.prov.cng.dll);
- giterr_set(GITERR_OS, "algorithm handle could not be found");
+ git_error_set(GIT_ERROR_OS, "algorithm handle could not be found");
return -1;
}
GIT_INLINE(int) hash_cryptoapi_prov_init()
{
if (!CryptAcquireContext(&hash_prov.prov.cryptoapi.handle, NULL, 0, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) {
- giterr_set(GITERR_OS, "legacy hash context could not be started");
+ git_error_set(GIT_ERROR_OS, "legacy hash context could not be started");
return -1;
}
if (!CryptCreateHash(ctx->prov->prov.cryptoapi.handle, CALG_SHA1, 0, 0, &ctx->ctx.cryptoapi.hash_handle)) {
ctx->ctx.cryptoapi.valid = 0;
- giterr_set(GITERR_OS, "legacy hash implementation could not be created");
+ git_error_set(GIT_ERROR_OS, "legacy hash implementation could not be created");
return -1;
}
DWORD chunk = (len > MAXDWORD) ? MAXDWORD : (DWORD)len;
if (!CryptHashData(ctx->ctx.cryptoapi.hash_handle, data, chunk, 0)) {
- giterr_set(GITERR_OS, "legacy hash data could not be updated");
+ git_error_set(GIT_ERROR_OS, "legacy hash data could not be updated");
return -1;
}
assert(ctx->ctx.cryptoapi.valid);
if (!CryptGetHashParam(ctx->ctx.cryptoapi.hash_handle, HP_HASHVAL, out->id, &len, 0)) {
- giterr_set(GITERR_OS, "legacy hash data could not be finished");
+ git_error_set(GIT_ERROR_OS, "legacy hash data could not be finished");
error = -1;
}
if (hash_prov.prov.cng.create_hash(hash_prov.prov.cng.handle, &ctx->ctx.cng.hash_handle, ctx->ctx.cng.hash_object, hash_prov.prov.cng.hash_object_size, NULL, 0, 0) < 0) {
git__free(ctx->ctx.cng.hash_object);
- giterr_set(GITERR_OS, "hash implementation could not be created");
+ git_error_set(GIT_ERROR_OS, "hash implementation could not be created");
return -1;
}
/* CNG needs to be finished to restart */
if (ctx->prov->prov.cng.finish_hash(ctx->ctx.cng.hash_handle, hash, GIT_OID_RAWSZ, 0) < 0) {
- giterr_set(GITERR_OS, "hash implementation could not be finished");
+ git_error_set(GIT_ERROR_OS, "hash implementation could not be finished");
return -1;
}
ULONG chunk = (len > ULONG_MAX) ? ULONG_MAX : (ULONG)len;
if (ctx->prov->prov.cng.hash_data(ctx->ctx.cng.hash_handle, data, chunk, 0) < 0) {
- giterr_set(GITERR_OS, "hash could not be updated");
+ git_error_set(GIT_ERROR_OS, "hash could not be updated");
return -1;
}
GIT_INLINE(int) hash_cng_final(git_oid *out, git_hash_ctx *ctx)
{
if (ctx->prov->prov.cng.finish_hash(ctx->ctx.cng.hash_handle, out->id, GIT_OID_RAWSZ, 0) < 0) {
- giterr_set(GITERR_OS, "hash could not be finished");
+ git_error_set(GIT_ERROR_OS, "hash could not be finished");
return -1;
}
{
if (sig->mins.size < HASHSIG_HEAP_MIN_SIZE &&
!(sig->opt & GIT_HASHSIG_ALLOW_SMALL_FILES)) {
- giterr_set(GITERR_INVALID,
+ git_error_set(GIT_ERROR_INVALID,
"file too small for similarity signature calculation");
return GIT_EBUFS;
}
int error;
hashsig_in_progress prog;
git_hashsig *sig = hashsig_alloc(opts);
- GITERR_CHECK_ALLOC(sig);
+ GIT_ERROR_CHECK_ALLOC(sig);
hashsig_in_progress_init(&prog, sig);
int error = 0, fd;
hashsig_in_progress prog;
git_hashsig *sig = hashsig_alloc(opts);
- GITERR_CHECK_ALLOC(sig);
+ GIT_ERROR_CHECK_ALLOC(sig);
if ((fd = git_futils_open_ro(path)) < 0) {
git__free(sig);
while (!error) {
if ((buflen = p_read(fd, buf, sizeof(buf))) <= 0) {
if ((error = (int)buflen) < 0)
- giterr_set(GITERR_OS,
+ git_error_set(GIT_ERROR_OS,
"read error on '%s' calculating similarity hashes", path);
break;
}
#include "idxmap.h"
+#define kmalloc git__malloc
+#define kcalloc git__calloc
+#define krealloc git__realloc
+#define kreallocarray git__reallocarray
+#define kfree git__free
+#include "khash.h"
+
+__KHASH_TYPE(idx, const git_index_entry *, git_index_entry *)
+__KHASH_TYPE(idxicase, const git_index_entry *, git_index_entry *)
+
/* This is __ac_X31_hash_string but with tolower and it takes the entry's stage into account */
static kh_inline khint_t idxentry_hash(const git_index_entry *e)
{
const char *s = e->path;
khint_t h = (khint_t)git__tolower(*s);
if (h) for (++s ; *s; ++s) h = (h << 5) - h + (khint_t)git__tolower(*s);
- return h + GIT_IDXENTRY_STAGE(e);
+ return h + GIT_INDEX_ENTRY_STAGE(e);
}
-#define idxentry_equal(a, b) (GIT_IDXENTRY_STAGE(a) == GIT_IDXENTRY_STAGE(b) && strcmp(a->path, b->path) == 0)
-#define idxentry_icase_equal(a, b) (GIT_IDXENTRY_STAGE(a) == GIT_IDXENTRY_STAGE(b) && strcasecmp(a->path, b->path) == 0)
+#define idxentry_equal(a, b) (GIT_INDEX_ENTRY_STAGE(a) == GIT_INDEX_ENTRY_STAGE(b) && strcmp(a->path, b->path) == 0)
+#define idxentry_icase_equal(a, b) (GIT_INDEX_ENTRY_STAGE(a) == GIT_INDEX_ENTRY_STAGE(b) && strcasecmp(a->path, b->path) == 0)
__KHASH_IMPL(idx, static kh_inline, const git_index_entry *, git_index_entry *, 1, idxentry_hash, idxentry_equal)
__KHASH_IMPL(idxicase, static kh_inline, const git_index_entry *, git_index_entry *, 1, idxentry_hash, idxentry_icase_equal)
int git_idxmap_alloc(git_idxmap **map)
{
if ((*map = kh_init(idx)) == NULL) {
- giterr_set_oom();
+ git_error_set_oom();
return -1;
}
int git_idxmap_icase_alloc(git_idxmap_icase **map)
{
if ((*map = kh_init(idxicase)) == NULL) {
- giterr_set_oom();
+ git_error_set_oom();
return -1;
}
kh_destroy(idx, map);
}
+void git_idxmap_icase_free(git_idxmap_icase *map)
+{
+ kh_destroy(idxicase, map);
+}
+
void git_idxmap_clear(git_idxmap *map)
{
kh_clear(idx, map);
}
+void git_idxmap_icase_clear(git_idxmap_icase *map)
+{
+ kh_clear(idxicase, map);
+}
+
void git_idxmap_delete_at(git_idxmap *map, size_t idx)
{
kh_del(idx, map, idx);
#include "common.h"
-#include <ctype.h>
#include "git2/index.h"
-#define kmalloc git__malloc
-#define kcalloc git__calloc
-#define krealloc git__realloc
-#define kreallocarray git__reallocarray
-#define kfree git__free
-#include "khash.h"
-
-__KHASH_TYPE(idx, const git_index_entry *, git_index_entry *)
-__KHASH_TYPE(idxicase, const git_index_entry *, git_index_entry *)
-
-typedef khash_t(idx) git_idxmap;
-typedef khash_t(idxicase) git_idxmap_icase;
-
-typedef khiter_t git_idxmap_iter;
+typedef struct kh_idx_s git_idxmap;
+typedef struct kh_idxicase_s git_idxmap_icase;
int git_idxmap_alloc(git_idxmap **map);
int git_idxmap_icase_alloc(git_idxmap_icase **map);
void git_idxmap_resize(git_idxmap *map, size_t size);
void git_idxmap_icase_resize(git_idxmap_icase *map, size_t size);
void git_idxmap_free(git_idxmap *map);
+void git_idxmap_icase_free(git_idxmap_icase *map);
void git_idxmap_clear(git_idxmap *map);
+void git_idxmap_icase_clear(git_idxmap_icase *map);
void git_idxmap_delete_at(git_idxmap *map, size_t idx);
void git_idxmap_icase_delete_at(git_idxmap_icase *map, size_t idx);
void git_idxmap_delete(git_idxmap *map, const git_index_entry *key);
void git_idxmap_icase_delete(git_idxmap_icase *map, const git_index_entry *key);
-#define git_idxmap_begin kh_begin
-#define git_idxmap_end kh_end
-
#endif
continue;
}
- /*
- * When dealing with a directory, we add '/<star>' so
- * p_fnmatch() honours FNM_PATHNAME. Checking for LEADINGDIR
- * alone isn't enough as that's also set for nagations, so we
- * need to check that NEGATIVE is off.
- */
git_buf_clear(&buf);
- if (rule->containing_dir) {
+ if (rule->containing_dir)
git_buf_puts(&buf, rule->containing_dir);
- }
-
- error = git_buf_puts(&buf, rule->pattern);
+ git_buf_puts(&buf, rule->pattern);
- if ((rule->flags & (GIT_ATTR_FNMATCH_LEADINGDIR | GIT_ATTR_FNMATCH_NEGATIVE)) == GIT_ATTR_FNMATCH_LEADINGDIR)
- error = git_buf_PUTS(&buf, "/*");
-
- if (error < 0)
+ if (git_buf_oom(&buf))
goto out;
if ((error = p_fnmatch(git_buf_cstr(&buf), path, fnflags)) < 0) {
- giterr_set(GITERR_INVALID, "error matching pattern");
+ git_error_set(GIT_ERROR_INVALID, "error matching pattern");
goto out;
}
out:
git__free(path);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return error;
}
git_attr_fnmatch *match = NULL;
if (git_repository__cvar(&ignore_case, repo, GIT_CVAR_IGNORECASE) < 0)
- giterr_clear();
+ git_error_clear();
/* if subdir file path, convert context for file paths */
if (attrs->entry &&
context = attrs->entry->path;
if (git_mutex_lock(&attrs->lock) < 0) {
- giterr_set(GITERR_OS, "failed to lock ignore file");
+ git_error_set(GIT_ERROR_OS, "failed to lock ignore file");
return -1;
}
break;
}
- match->flags = GIT_ATTR_FNMATCH_ALLOWSPACE | GIT_ATTR_FNMATCH_ALLOWNEG;
+ match->flags =
+ GIT_ATTR_FNMATCH_ALLOWSPACE |
+ GIT_ATTR_FNMATCH_ALLOWNEG |
+ GIT_ATTR_FNMATCH_NOLEADINGDIR;
if (!(error = git_attr_fnmatch__parse(
match, &attrs->pool, context, &scan)))
(error = git_path_to_dir(&local)) < 0 ||
(error = git_buf_joinpath(&ignores->dir, workdir, local.ptr)) < 0)
{;} /* Nothing, we just want to stop on the first error */
- git_buf_free(&local);
+ git_buf_dispose(&local);
} else {
error = git_buf_joinpath(&ignores->dir, path, "");
}
git_repository_attr_cache(repo)->cfg_excl_file);
cleanup:
- git_buf_free(&infopath);
+ git_buf_dispose(&infopath);
if (error < 0)
git_ignore__free(ignores);
}
git_vector_free(&ignores->ign_global);
- git_buf_free(&ignores->dir);
+ git_buf_dispose(&ignores->dir);
}
static bool ignore_lookup_in_rules(
git_attr_fnmatch *match;
git_vector_rforeach(&file->rules, j, match) {
+ if (match->flags & GIT_ATTR_FNMATCH_DIRECTORY &&
+ path->is_dir == GIT_DIR_FLAG_FALSE)
+ continue;
if (git_attr_fnmatch__match(match, path)) {
*ignored = ((match->flags & GIT_ATTR_FNMATCH_NEGATIVE) == 0) ?
GIT_IGNORE_TRUE : GIT_IGNORE_FALSE;
break;
if (ignored) {
- giterr_set(GITERR_INVALID, "pathspec contains ignored file '%s'",
+ git_error_set(GIT_ERROR_INVALID, "pathspec contains ignored file '%s'",
filename);
error = GIT_EINVALIDSPEC;
break;
}
git_index_free(idx);
- git_buf_free(&path);
+ git_buf_dispose(&path);
return error;
}
#define INSERT_IN_MAP_EX(idx, map, e, err) do { \
if ((idx)->ignore_case) \
- git_idxmap_icase_insert((khash_t(idxicase) *) (map), (e), (e), (err)); \
+ git_idxmap_icase_insert((git_idxmap_icase *) (map), (e), (e), (err)); \
else \
git_idxmap_insert((map), (e), (e), (err)); \
} while (0)
#define LOOKUP_IN_MAP(p, idx, k) do { \
if ((idx)->ignore_case) \
- (p) = git_idxmap_icase_lookup_index((khash_t(idxicase) *) index->entries_map, (k)); \
+ (p) = git_idxmap_icase_lookup_index((git_idxmap_icase *) index->entries_map, (k)); \
else \
(p) = git_idxmap_lookup_index(index->entries_map, (k)); \
} while (0)
#define DELETE_IN_MAP(idx, e) do { \
if ((idx)->ignore_case) \
- git_idxmap_icase_delete((khash_t(idxicase) *) (idx)->entries_map, (e)); \
+ git_idxmap_icase_delete((git_idxmap_icase *) (idx)->entries_map, (e)); \
else \
git_idxmap_delete((idx)->entries_map, (e)); \
} while (0)
char path[GIT_FLEX_ARRAY];
};
+bool git_index__enforce_unsaved_safety = false;
+
/* local declarations */
-static size_t read_extension(git_index *index, const char *buffer, size_t buffer_size);
+static int read_extension(size_t *read_len, git_index *index, const char *buffer, size_t buffer_size);
static int read_header(struct index_header *dest, const void *buffer);
static int parse_index(git_index *index, const char *buffer, size_t buffer_size);
return 1;
if (srch_key->stage != GIT_INDEX_STAGE_ANY)
- return srch_key->stage - GIT_IDXENTRY_STAGE(&entry->entry);
+ return srch_key->stage - GIT_INDEX_ENTRY_STAGE(&entry->entry);
return 0;
}
return 1;
if (srch_key->stage != GIT_INDEX_STAGE_ANY)
- return srch_key->stage - GIT_IDXENTRY_STAGE(&entry->entry);
+ return srch_key->stage - GIT_INDEX_ENTRY_STAGE(&entry->entry);
return 0;
}
diff = strcmp(entry_a->path, entry_b->path);
if (diff == 0)
- diff = (GIT_IDXENTRY_STAGE(entry_a) - GIT_IDXENTRY_STAGE(entry_b));
+ diff = (GIT_INDEX_ENTRY_STAGE(entry_a) - GIT_INDEX_ENTRY_STAGE(entry_b));
return diff;
}
diff = strcasecmp(entry_a->path, entry_b->path);
if (diff == 0)
- diff = (GIT_IDXENTRY_STAGE(entry_a) - GIT_IDXENTRY_STAGE(entry_b));
+ diff = (GIT_INDEX_ENTRY_STAGE(entry_a) - GIT_INDEX_ENTRY_STAGE(entry_b));
return diff;
}
assert(index_out);
index = git__calloc(1, sizeof(git_index));
- GITERR_CHECK_ALLOC(index);
+ GIT_ERROR_CHECK_ALLOC(index);
git_pool_init(&index->tree_pool, 1);
} else {
index_entry_free(entry);
}
+
+ index->dirty = 1;
}
return error;
assert(index);
+ index->dirty = 1;
index->tree = NULL;
git_pool_clear(&index->tree_pool);
static int create_index_error(int error, const char *msg)
{
- giterr_set_str(GITERR_INDEX, msg);
+ git_error_set_str(GIT_ERROR_INDEX, msg);
return error;
}
old_ignore_case = index->ignore_case;
- if (caps == GIT_INDEXCAP_FROM_OWNER) {
+ if (caps == GIT_INDEX_CAPABILITY_FROM_OWNER) {
git_repository *repo = INDEX_OWNER(index);
int val;
index->no_symlinks = (val == 0);
}
else {
- index->ignore_case = ((caps & GIT_INDEXCAP_IGNORE_CASE) != 0);
- index->distrust_filemode = ((caps & GIT_INDEXCAP_NO_FILEMODE) != 0);
- index->no_symlinks = ((caps & GIT_INDEXCAP_NO_SYMLINKS) != 0);
+ index->ignore_case = ((caps & GIT_INDEX_CAPABILITY_IGNORE_CASE) != 0);
+ index->distrust_filemode = ((caps & GIT_INDEX_CAPABILITY_NO_FILEMODE) != 0);
+ index->no_symlinks = ((caps & GIT_INDEX_CAPABILITY_NO_SYMLINKS) != 0);
}
if (old_ignore_case != index->ignore_case) {
int git_index_caps(const git_index *index)
{
- return ((index->ignore_case ? GIT_INDEXCAP_IGNORE_CASE : 0) |
- (index->distrust_filemode ? GIT_INDEXCAP_NO_FILEMODE : 0) |
- (index->no_symlinks ? GIT_INDEXCAP_NO_SYMLINKS : 0));
+ return ((index->ignore_case ? GIT_INDEX_CAPABILITY_IGNORE_CASE : 0) |
+ (index->distrust_filemode ? GIT_INDEX_CAPABILITY_NO_FILEMODE : 0) |
+ (index->no_symlinks ? GIT_INDEX_CAPABILITY_NO_SYMLINKS : 0));
}
const git_oid *git_index_checksum(git_index *index)
if (p_lseek(fd, -20, SEEK_END) < 0) {
p_close(fd);
- giterr_set(GITERR_OS, "failed to seek to end of file");
+ git_error_set(GIT_ERROR_OS, "failed to seek to end of file");
return -1;
}
index->on_disk = git_path_exists(index->index_file_path);
if (!index->on_disk) {
- if (force)
- return git_index_clear(index);
+ if (force && (error = git_index_clear(index)) < 0)
+ return error;
+
+ index->dirty = 0;
return 0;
}
if ((updated = git_futils_filestamp_check(&stamp, index->index_file_path) < 0) ||
((updated = compare_checksum(index)) < 0)) {
- giterr_set(
- GITERR_INDEX,
+ git_error_set(
+ GIT_ERROR_INDEX,
"failed to read index: '%s' no longer exists",
index->index_file_path);
return updated;
}
+
if (!updated && !force)
return 0;
if (!error)
error = parse_index(index, buffer.ptr, buffer.size);
- if (!error)
+ if (!error) {
git_futils_filestamp_set(&index->stamp, &stamp);
+ index->dirty = 0;
+ }
- git_buf_free(&buffer);
+ git_buf_dispose(&buffer);
return error;
}
+int git_index_read_safely(git_index *index)
+{
+ if (git_index__enforce_unsaved_safety && index->dirty) {
+ git_error_set(GIT_ERROR_INDEX,
+ "the index has unsaved changes that would be overwritten by this operation");
+ return GIT_EINDEXDIRTY;
+ }
+
+ return git_index_read(index, false);
+}
+
int git_index__changed_relative_to(
git_index *index, const git_oid *checksum)
{
/* attempt to update index (ignoring errors) */
if (git_index_read(index, false) < 0)
- giterr_clear();
+ git_error_clear();
return !!git_oid_cmp(&index->checksum, checksum);
}
diff_opts.flags |= GIT_DIFF_INCLUDE_TYPECHANGE | GIT_DIFF_IGNORE_SUBMODULES | GIT_DIFF_DISABLE_PATHSPEC_MATCH;
git_vector_foreach(&index->entries, i, entry) {
- if ((entry->flags_extended & GIT_IDXENTRY_UPTODATE) == 0 &&
+ if ((entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE) == 0 &&
is_racy_entry(index, entry))
git_vector_insert(&paths, (char *)entry->path);
}
/* Ensure that we have a stage 0 for this file (ie, it's not a
* conflict), otherwise smudging it is quite pointless.
*/
- if (entry)
+ if (entry) {
entry->file_size = 0;
+ index->dirty = 1;
+ }
}
done:
if (version < INDEX_VERSION_NUMBER_LB ||
version > INDEX_VERSION_NUMBER_UB) {
- giterr_set(GITERR_INDEX, "invalid version number");
+ git_error_set(GIT_ERROR_INDEX, "invalid version number");
return -1;
}
truncate_racily_clean(index);
- if ((error = git_indexwriter_init(&writer, index)) == 0)
- error = git_indexwriter_commit(&writer);
+ if ((error = git_indexwriter_init(&writer, index)) == 0 &&
+ (error = git_indexwriter_commit(&writer)) == 0)
+ index->dirty = 0;
git_indexwriter_cleanup(&writer);
const git_index_entry *git_index_get_bypath(
git_index *index, const char *path, int stage)
{
- khiter_t pos;
git_index_entry key = {{ 0 }};
+ size_t pos;
assert(index);
key.path = path;
- GIT_IDXENTRY_STAGE_SET(&key, stage);
+ GIT_INDEX_ENTRY_STAGE_SET(&key, stage);
LOOKUP_IN_MAP(pos, index, &key);
if (git_idxmap_valid_index(index->entries_map, pos))
return git_idxmap_value_at(index->entries_map, pos);
- giterr_set(GITERR_INDEX, "index does not contain '%s'", path);
+ git_error_set(GIT_ERROR_INDEX, "index does not contain '%s'", path);
return NULL;
}
git_index_entry *entry,
size_t path_length)
{
- entry->flags &= ~GIT_IDXENTRY_NAMEMASK;
+ entry->flags &= ~GIT_INDEX_ENTRY_NAMEMASK;
- if (path_length < GIT_IDXENTRY_NAMEMASK)
- entry->flags |= path_length & GIT_IDXENTRY_NAMEMASK;
+ if (path_length < GIT_INDEX_ENTRY_NAMEMASK)
+ entry->flags |= path_length & GIT_INDEX_ENTRY_NAMEMASK;
else
- entry->flags |= GIT_IDXENTRY_NAMEMASK;
+ entry->flags |= GIT_INDEX_ENTRY_NAMEMASK;
}
/* When `from_workdir` is true, we will validate the paths to avoid placing
mode = st->st_mode;
if (!git_path_isvalid(repo, path, mode, path_valid_flags)) {
- giterr_set(GITERR_INDEX, "invalid path: '%s'", path);
+ git_error_set(GIT_ERROR_INDEX, "invalid path: '%s'", path);
return -1;
}
- GITERR_CHECK_ALLOC_ADD(&alloclen, sizeof(struct entry_internal), pathlen);
- GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, sizeof(struct entry_internal), pathlen);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1);
entry = git__calloc(1, alloclen);
- GITERR_CHECK_ALLOC(entry);
+ GIT_ERROR_CHECK_ALLOC(entry);
entry->pathlen = pathlen;
memcpy(entry->path, path, pathlen);
return -1;
error = git_path_lstat(path.ptr, &st);
- git_buf_free(&path);
+ git_buf_dispose(&path);
if (error < 0)
return error;
assert(reuc_out && path);
*reuc_out = reuc = reuc_entry_alloc(path);
- GITERR_CHECK_ALLOC(reuc);
+ GIT_ERROR_CHECK_ALLOC(reuc);
if ((reuc->mode[0] = ancestor_mode) > 0) {
assert(ancestor_oid);
git_oid_cpy(&tgt->id, &src->id);
tgt->mode = src->mode;
tgt->flags = src->flags;
- tgt->flags_extended = (src->flags_extended & GIT_IDXENTRY_EXTENDED_FLAGS);
+ tgt->flags_extended = (src->flags_extended & GIT_INDEX_ENTRY_EXTENDED_FLAGS);
}
static int index_entry_dup_nocache(
static int has_file_name(git_index *index,
const git_index_entry *entry, size_t pos, int ok_to_replace)
{
- int retval = 0;
size_t len = strlen(entry->path);
- int stage = GIT_IDXENTRY_STAGE(entry);
+ int stage = GIT_INDEX_ENTRY_STAGE(entry);
const char *name = entry->path;
while (pos < index->entries.length) {
break;
if (memcmp(name, p->path, len))
break;
- if (GIT_IDXENTRY_STAGE(&p->entry) != stage)
+ if (GIT_INDEX_ENTRY_STAGE(&p->entry) != stage)
continue;
if (p->path[len] != '/')
continue;
- retval = -1;
if (!ok_to_replace)
- break;
+ return -1;
if (index_remove_entry(index, --pos) < 0)
break;
}
- return retval;
+ return 0;
}
/*
static int has_dir_name(git_index *index,
const git_index_entry *entry, int ok_to_replace)
{
- int retval = 0;
- int stage = GIT_IDXENTRY_STAGE(entry);
+ int stage = GIT_INDEX_ENTRY_STAGE(entry);
const char *name = entry->path;
const char *slash = name + strlen(name);
if (*--slash == '/')
break;
if (slash <= entry->path)
- return retval;
+ return 0;
}
len = slash - name;
if (!index_find(&pos, index, name, len, stage)) {
- retval = -1;
if (!ok_to_replace)
- break;
+ return -1;
if (index_remove_entry(index, pos) < 0)
break;
memcmp(p->path, name, len))
break; /* not our subdirectory */
- if (GIT_IDXENTRY_STAGE(&p->entry) == stage)
- return retval;
+ if (GIT_INDEX_ENTRY_STAGE(&p->entry) == stage)
+ return 0;
}
}
- return retval;
+ return 0;
}
static int check_file_directory_collision(git_index *index,
git_index_entry *entry, size_t pos, int ok_to_replace)
{
- int retval = has_file_name(index, entry, pos, ok_to_replace);
- retval = retval + has_dir_name(index, entry, ok_to_replace);
-
- if (retval) {
- giterr_set(GITERR_INDEX,
+ if (has_file_name(index, entry, pos, ok_to_replace) < 0 ||
+ has_dir_name(index, entry, ok_to_replace) < 0) {
+ git_error_set(GIT_ERROR_INDEX,
"'%s' appears as both a file and a directory", entry->path);
return -1;
}
&pos, &index->entries, index->entries_search_path, search);
while ((match = git_vector_get(&index->entries, pos))) {
- if (GIT_IDXENTRY_STAGE(match) != 0) {
+ if (GIT_INDEX_ENTRY_STAGE(match) != 0) {
/* conflicts do not contribute to canonical paths */
} else if (strncmp(search, match->path, search_len) == 0) {
/* prefer an exact match to the input filename */
{
const git_index_entry *entry = new;
GIT_UNUSED(old);
- giterr_set(GITERR_INDEX, "'%s' appears multiple times at stage %d",
- entry->path, GIT_IDXENTRY_STAGE(entry));
+ git_error_set(GIT_ERROR_INDEX, "'%s' appears multiple times at stage %d",
+ entry->path, GIT_INDEX_ENTRY_STAGE(entry));
return GIT_EEXISTS;
}
int error;
error = index_find(&pos,
- index, entry->path, 0, GIT_IDXENTRY_STAGE(entry));
+ index, entry->path, 0, GIT_INDEX_ENTRY_STAGE(entry));
if (error == 0) {
*existing = index->entries.contents[pos];
*existing_position = 0;
*best = NULL;
- if (GIT_IDXENTRY_STAGE(entry) == 0) {
+ if (GIT_INDEX_ENTRY_STAGE(entry) == 0) {
for (; pos < index->entries.length; pos++) {
int (*strcomp)(const char *a, const char *b) =
index->ignore_case ? git__strcasecmp : git__strcmp;
if (strcomp(entry->path, e->path) != 0)
break;
- if (GIT_IDXENTRY_STAGE(e) == GIT_INDEX_STAGE_ANCESTOR) {
+ if (GIT_INDEX_ENTRY_STAGE(e) == GIT_INDEX_STAGE_ANCESTOR) {
*best = e;
continue;
} else {
bool trust_mode,
bool trust_id)
{
- int error = 0;
- size_t path_length, position;
git_index_entry *existing, *best, *entry;
+ size_t path_length, position;
+ int error;
assert(index && entry_ptr);
entry = *entry_ptr;
- /* make sure that the path length flag is correct */
+ /* Make sure that the path length flag is correct */
path_length = ((struct entry_internal *)entry)->pathlen;
index_entry_adjust_namemask(entry, path_length);
- /* this entry is now up-to-date and should not be checked for raciness */
- entry->flags_extended |= GIT_IDXENTRY_UPTODATE;
+ /* This entry is now up-to-date and should not be checked for raciness */
+ entry->flags_extended |= GIT_INDEX_ENTRY_UPTODATE;
git_vector_sort(&index->entries);
- /* look if an entry with this path already exists, either staged, or (if
+ /*
+ * Look if an entry with this path already exists, either staged, or (if
* this entry is a regular staged item) as the "ours" side of a conflict.
*/
index_existing_and_best(&existing, &position, &best, index, entry);
- /* update the file mode */
+ /* Update the file mode */
entry->mode = trust_mode ?
git_index__create_mode(entry->mode) :
index_merge_mode(index, best, entry->mode);
- /* canonicalize the directory name */
- if (!trust_path)
- error = canonicalize_directory_path(index, entry, best);
+ /* Canonicalize the directory name */
+ if (!trust_path && (error = canonicalize_directory_path(index, entry, best)) < 0)
+ goto out;
- /* ensure that the given id exists (unless it's a submodule) */
- if (!error && !trust_id && INDEX_OWNER(index) &&
- (entry->mode & GIT_FILEMODE_COMMIT) != GIT_FILEMODE_COMMIT) {
+ /* Ensure that the given id exists (unless it's a submodule) */
+ if (!trust_id && INDEX_OWNER(index) &&
+ (entry->mode & GIT_FILEMODE_COMMIT) != GIT_FILEMODE_COMMIT) {
if (!git_object__is_valid(INDEX_OWNER(index), &entry->id,
- git_object__type_from_filemode(entry->mode)))
+ git_object__type_from_filemode(entry->mode))) {
error = -1;
+ goto out;
+ }
}
- /* look for tree / blob name collisions, removing conflicts if requested */
- if (!error)
- error = check_file_directory_collision(index, entry, position, replace);
+ /* Look for tree / blob name collisions, removing conflicts if requested */
+ if ((error = check_file_directory_collision(index, entry, position, replace)) < 0)
+ goto out;
- if (error < 0)
- /* skip changes */;
-
- /* if we are replacing an existing item, overwrite the existing entry
+ /*
+ * If we are replacing an existing item, overwrite the existing entry
* and return it in place of the passed in one.
*/
- else if (existing) {
+ if (existing) {
if (replace) {
index_entry_cpy(existing, entry);
}
index_entry_free(entry);
- *entry_ptr = entry = existing;
- }
- else {
- /* if replace is not requested or no existing entry exists, insert
+ *entry_ptr = existing;
+ } else {
+ /*
+ * If replace is not requested or no existing entry exists, insert
* at the sorted position. (Since we re-sort after each insert to
* check for dups, this is actually cheaper in the long run.)
*/
- error = git_vector_insert_sorted(&index->entries, entry, index_no_dups);
+ if ((error = git_vector_insert_sorted(&index->entries, entry, index_no_dups)) < 0)
+ goto out;
- if (error == 0) {
- INSERT_IN_MAP(index, entry, &error);
- }
+ INSERT_IN_MAP(index, entry, &error);
}
+ index->dirty = 1;
+
+out:
if (error < 0) {
index_entry_free(*entry_ptr);
*entry_ptr = NULL;
"Index is not backed up by an existing repository.");
if (!is_file_or_link(source_entry->mode)) {
- giterr_set(GITERR_INDEX, "invalid filemode");
+ git_error_set(GIT_ERROR_INDEX, "invalid filemode");
return -1;
}
return error;
if ((error = p_stat(abspath.ptr, &st)) < 0) {
- giterr_set(GITERR_OS, "failed to stat repository dir");
+ git_error_set(GIT_ERROR_OS, "failed to stat repository dir");
return -1;
}
git_reference_free(head);
git_repository_free(sub);
- git_buf_free(&abspath);
+ git_buf_dispose(&abspath);
*out = entry;
return 0;
git_submodule *sm;
git_error_state err;
- giterr_state_capture(&err, ret);
+ git_error_state_capture(&err, ret);
ret = git_submodule_lookup(&sm, INDEX_OWNER(index), path);
if (ret == GIT_ENOTFOUND)
- return giterr_state_restore(&err);
+ return git_error_state_restore(&err);
- giterr_state_free(&err);
+ git_error_state_free(&err);
/*
* EEXISTS means that there is a repository at that path, but it's not known
return ret;
if (ret == GIT_ENOTFOUND)
- giterr_clear();
+ git_error_clear();
return 0;
}
return 0;
git_vector_size_hint(&index->entries, source_entries->length);
- git_idxmap_resize(index->entries_map, (khint_t)(source_entries->length * 1.3));
+ git_idxmap_resize(index->entries_map, (size_t)(source_entries->length * 1.3));
git_vector_foreach(source_entries, i, source_entry) {
git_index_entry *entry = NULL;
break;
index_entry_adjust_namemask(entry, ((struct entry_internal *)entry)->pathlen);
- entry->flags_extended |= GIT_IDXENTRY_UPTODATE;
+ entry->flags_extended |= GIT_INDEX_ENTRY_UPTODATE;
entry->mode = git_index__create_mode(entry->mode);
if ((ret = git_vector_insert(&index->entries, entry)) < 0)
INSERT_IN_MAP(index, entry, &ret);
if (ret < 0)
break;
+
+ index->dirty = 1;
}
if (!ret)
assert(index && source_entry && source_entry->path);
if (!valid_filemode(source_entry->mode)) {
- giterr_set(GITERR_INDEX, "invalid entry mode");
+ git_error_set(GIT_ERROR_INDEX, "invalid entry mode");
return -1;
}
git_index_entry remove_key = {{ 0 }};
remove_key.path = path;
- GIT_IDXENTRY_STAGE_SET(&remove_key, stage);
+ GIT_INDEX_ENTRY_STAGE_SET(&remove_key, stage);
DELETE_IN_MAP(index, &remove_key);
if (index_find(&position, index, path, 0, stage) < 0) {
- giterr_set(
- GITERR_INDEX, "index does not contain %s at stage %d", path, stage);
+ git_error_set(
+ GIT_ERROR_INDEX, "index does not contain %s at stage %d", path, stage);
error = GIT_ENOTFOUND;
} else {
error = index_remove_entry(index, position);
if (!entry || git__prefixcmp(entry->path, pfx.ptr) != 0)
break;
- if (GIT_IDXENTRY_STAGE(entry) != stage) {
+ if (GIT_INDEX_ENTRY_STAGE(entry) != stage) {
++pos;
continue;
}
/* removed entry at 'pos' so we don't need to increment */
}
- git_buf_free(&pfx);
+ git_buf_dispose(&pfx);
return error;
}
if (git_vector_bsearch2(
&pos, &index->entries, index->entries_search_path, path) < 0) {
- giterr_set(GITERR_INDEX, "index does not contain %s", path);
+ git_error_set(GIT_ERROR_INDEX, "index does not contain %s", path);
return GIT_ENOTFOUND;
}
/* Validate entries */
for (i = 0; i < 3; i++) {
if (entries[i] && !valid_filemode(entries[i]->mode)) {
- giterr_set(GITERR_INDEX, "invalid filemode for stage %d entry",
+ git_error_set(GIT_ERROR_INDEX, "invalid filemode for stage %d entry",
i + 1);
ret = -1;
goto on_error;
if (ret != GIT_ENOTFOUND)
goto on_error;
- giterr_clear();
+ git_error_clear();
ret = 0;
}
}
continue;
/* Make sure stage is correct */
- GIT_IDXENTRY_STAGE_SET(entries[i], i + 1);
+ GIT_INDEX_ENTRY_STAGE_SET(entries[i], i + 1);
if ((ret = index_insert(index, &entries[i], 1, true, true, false)) < 0)
goto on_error;
if (path && index->entries_cmp_path(conflict_entry->path, path) != 0)
break;
- stage = GIT_IDXENTRY_STAGE(conflict_entry);
+ stage = GIT_INDEX_ENTRY_STAGE(conflict_entry);
path = conflict_entry->path;
switch (stage) {
index->entries_cmp_path(conflict_entry->path, path) != 0)
break;
- if (GIT_IDXENTRY_STAGE(conflict_entry) == 0) {
+ if (GIT_INDEX_ENTRY_STAGE(conflict_entry) == 0) {
pos++;
continue;
}
assert(index);
git_vector_foreach(&index->entries, i, entry) {
- if (GIT_IDXENTRY_STAGE(entry) > 0)
+ if (GIT_INDEX_ENTRY_STAGE(entry) > 0)
return 1;
}
return 0;
}
+int git_index_iterator_new(
+ git_index_iterator **iterator_out,
+ git_index *index)
+{
+ git_index_iterator *it;
+ int error;
+
+ assert(iterator_out && index);
+
+ it = git__calloc(1, sizeof(git_index_iterator));
+ GIT_ERROR_CHECK_ALLOC(it);
+
+ if ((error = git_index_snapshot_new(&it->snap, index)) < 0) {
+ git__free(it);
+ return error;
+ }
+
+ it->index = index;
+
+ *iterator_out = it;
+ return 0;
+}
+
+int git_index_iterator_next(
+ const git_index_entry **out,
+ git_index_iterator *it)
+{
+ assert(out && it);
+
+ if (it->cur >= git_vector_length(&it->snap))
+ return GIT_ITEROVER;
+
+ *out = (git_index_entry *)git_vector_get(&it->snap, it->cur++);
+ return 0;
+}
+
+void git_index_iterator_free(git_index_iterator *it)
+{
+ if (it == NULL)
+ return;
+
+ git_index_snapshot_release(&it->snap, it->index);
+ git__free(it);
+}
+
int git_index_conflict_iterator_new(
git_index_conflict_iterator **iterator_out,
git_index *index)
assert(iterator_out && index);
it = git__calloc(1, sizeof(git_index_conflict_iterator));
- GITERR_CHECK_ALLOC(it);
+ GIT_ERROR_CHECK_ALLOC(it);
it->index = index;
assert((ancestor && ours) || (ancestor && theirs) || (ours && theirs));
conflict_name = git__calloc(1, sizeof(git_index_name_entry));
- GITERR_CHECK_ALLOC(conflict_name);
+ GIT_ERROR_CHECK_ALLOC(conflict_name);
if ((ancestor && !(conflict_name->ancestor = git__strdup(ancestor))) ||
(ours && !(conflict_name->ours = git__strdup(ours))) ||
return -1;
}
+ index->dirty = 1;
return 0;
}
index_name_entry_free(conflict_name);
git_vector_clear(&index->names);
+
+ index->dirty = 1;
}
size_t git_index_reuc_entrycount(git_index *index)
assert(git_vector_is_sorted(&index->reuc));
res = git_vector_insert_sorted(&index->reuc, reuc, &index_reuc_on_dup);
+ index->dirty = 1;
+
return res == GIT_EEXISTS ? 0 : res;
}
if (!error)
index_entry_reuc_free(reuc);
+ index->dirty = 1;
return error;
}
index_entry_reuc_free(git__swap(index->reuc.contents[i], NULL));
git_vector_clear(&index->reuc);
+
+ index->dirty = 1;
}
static int index_error_invalid(const char *message)
{
- giterr_set(GITERR_INDEX, "invalid data in index - %s", message);
+ git_error_set(GIT_ERROR_INDEX, "invalid data in index - %s", message);
return -1;
}
return index_error_invalid("reading reuc entries");
lost = reuc_entry_alloc(buffer);
- GITERR_CHECK_ALLOC(lost);
+ GIT_ERROR_CHECK_ALLOC(lost);
size -= len;
buffer += len;
ptr = NULL; \
else { \
ptr = git__malloc(len); \
- GITERR_CHECK_ALLOC(ptr); \
+ GIT_ERROR_CHECK_ALLOC(ptr); \
memcpy(ptr, buffer, len); \
} \
\
while (size) {
git_index_name_entry *conflict_name = git__calloc(1, sizeof(git_index_name_entry));
- GITERR_CHECK_ALLOC(conflict_name);
+ GIT_ERROR_CHECK_ALLOC(conflict_name);
read_conflict_name(conflict_name->ancestor);
read_conflict_name(conflict_name->ours);
static size_t index_entry_size(size_t path_len, size_t varint_len, uint32_t flags)
{
if (varint_len) {
- if (flags & GIT_IDXENTRY_EXTENDED)
+ if (flags & GIT_INDEX_ENTRY_EXTENDED)
return offsetof(struct entry_long, path) + path_len + 1 + varint_len;
else
return offsetof(struct entry_short, path) + path_len + 1 + varint_len;
} else {
#define entry_size(type,len) ((offsetof(type, path) + (len) + 8) & ~7)
- if (flags & GIT_IDXENTRY_EXTENDED)
+ if (flags & GIT_INDEX_ENTRY_EXTENDED)
return entry_size(struct entry_long, path_len);
else
return entry_size(struct entry_short, path_len);
git_oid_cpy(&entry.id, &source.oid);
entry.flags = ntohs(source.flags);
- if (entry.flags & GIT_IDXENTRY_EXTENDED) {
+ if (entry.flags & GIT_INDEX_ENTRY_EXTENDED) {
uint16_t flags_raw;
size_t flags_offset;
path_ptr = (const char *) buffer + offsetof(struct entry_short, path);
if (!compressed) {
- path_length = entry.flags & GIT_IDXENTRY_NAMEMASK;
+ path_length = entry.flags & GIT_INDEX_ENTRY_NAMEMASK;
/* if this is a very long string, we must find its
* real length without overflowing */
if (varint_len == 0 || last_len < strip_len)
return index_error_invalid("incorrect prefix length");
- prefix_len = last_len - strip_len;
+ prefix_len = last_len - (size_t)strip_len;
suffix_len = strlen(path_ptr + varint_len);
- GITERR_CHECK_ALLOC_ADD(&path_len, prefix_len, suffix_len);
- GITERR_CHECK_ALLOC_ADD(&path_len, path_len, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&path_len, prefix_len, suffix_len);
+ GIT_ERROR_CHECK_ALLOC_ADD(&path_len, path_len, 1);
if (path_len > GIT_PATH_MAX)
return index_error_invalid("unreasonable path length");
tmp_path = git__malloc(path_len);
- GITERR_CHECK_ALLOC(tmp_path);
+ GIT_ERROR_CHECK_ALLOC(tmp_path);
memcpy(tmp_path, last, prefix_len);
memcpy(tmp_path + prefix_len, path_ptr + varint_len, suffix_len + 1);
return 0;
}
-static size_t read_extension(git_index *index, const char *buffer, size_t buffer_size)
+static int read_extension(size_t *read_len, git_index *index, const char *buffer, size_t buffer_size)
{
struct index_extension dest;
size_t total_size;
if (dest.extension_size > total_size ||
buffer_size < total_size ||
- buffer_size - total_size < INDEX_FOOTER_SIZE)
- return 0;
+ buffer_size - total_size < INDEX_FOOTER_SIZE) {
+ index_error_invalid("extension is truncated");
+ return -1;
+ }
/* optional extension */
if (dest.signature[0] >= 'A' && dest.signature[0] <= 'Z') {
/* tree cache */
if (memcmp(dest.signature, INDEX_EXT_TREECACHE_SIG, 4) == 0) {
if (git_tree_cache_read(&index->tree, buffer + 8, dest.extension_size, &index->tree_pool) < 0)
- return 0;
+ return -1;
} else if (memcmp(dest.signature, INDEX_EXT_UNMERGED_SIG, 4) == 0) {
if (read_reuc(index, buffer + 8, dest.extension_size) < 0)
- return 0;
+ return -1;
} else if (memcmp(dest.signature, INDEX_EXT_CONFLICT_NAME_SIG, 4) == 0) {
if (read_conflict_names(index, buffer + 8, dest.extension_size) < 0)
- return 0;
+ return -1;
}
/* else, unsupported extension. We cannot parse this, but we can skip
* it by returning `total_size */
} else {
/* we cannot handle non-ignorable extensions;
* in fact they aren't even defined in the standard */
- return 0;
+ git_error_set(GIT_ERROR_INDEX, "unsupported mandatory extension: '%.4s'", dest.signature);
+ return -1;
}
- return total_size;
+ *read_len = total_size;
+
+ return 0;
}
static int parse_index(git_index *index, const char *buffer, size_t buffer_size)
assert(!index->entries.length);
if (index->ignore_case)
- git_idxmap_icase_resize((khash_t(idxicase) *) index->entries_map, header.entry_count);
+ git_idxmap_icase_resize((git_idxmap_icase *) index->entries_map, header.entry_count);
else
git_idxmap_resize(index->entries_map, header.entry_count);
while (buffer_size > INDEX_FOOTER_SIZE) {
size_t extension_size;
- extension_size = read_extension(index, buffer, buffer_size);
-
- /* see if we have read any bytes from the extension */
- if (extension_size == 0) {
- error = index_error_invalid("extension is truncated");
+ if ((error = read_extension(&extension_size, index, buffer, buffer_size)) < 0) {
goto done;
}
git_vector_set_sorted(&index->entries, !index->ignore_case);
git_vector_sort(&index->entries);
+ index->dirty = 0;
done:
return error;
}
extended = 0;
git_vector_foreach(&index->entries, i, entry) {
- entry->flags &= ~GIT_IDXENTRY_EXTENDED;
- if (entry->flags_extended & GIT_IDXENTRY_EXTENDED_FLAGS) {
+ entry->flags &= ~GIT_INDEX_ENTRY_EXTENDED;
+ if (entry->flags_extended & GIT_INDEX_ENTRY_EXTENDED_FLAGS) {
extended++;
- entry->flags |= GIT_IDXENTRY_EXTENDED;
+ entry->flags |= GIT_INDEX_ENTRY_EXTENDED;
}
}
static int write_disk_entry(git_filebuf *file, git_index_entry *entry, const char *last)
{
void *mem = NULL;
- struct entry_short *ondisk;
+ struct entry_short ondisk;
size_t path_len, disk_size;
int varint_len = 0;
char *path;
if (git_filebuf_reserve(file, &mem, disk_size) < 0)
return -1;
- ondisk = (struct entry_short *)mem;
-
- memset(ondisk, 0x0, disk_size);
+ memset(mem, 0x0, disk_size);
/**
* Yes, we have to truncate.
*
* In 2038 I will be either too dead or too rich to care about this
*/
- ondisk->ctime.seconds = htonl((uint32_t)entry->ctime.seconds);
- ondisk->mtime.seconds = htonl((uint32_t)entry->mtime.seconds);
- ondisk->ctime.nanoseconds = htonl(entry->ctime.nanoseconds);
- ondisk->mtime.nanoseconds = htonl(entry->mtime.nanoseconds);
- ondisk->dev = htonl(entry->dev);
- ondisk->ino = htonl(entry->ino);
- ondisk->mode = htonl(entry->mode);
- ondisk->uid = htonl(entry->uid);
- ondisk->gid = htonl(entry->gid);
- ondisk->file_size = htonl((uint32_t)entry->file_size);
-
- git_oid_cpy(&ondisk->oid, &entry->id);
-
- ondisk->flags = htons(entry->flags);
-
- if (entry->flags & GIT_IDXENTRY_EXTENDED) {
- struct entry_long *ondisk_ext;
- ondisk_ext = (struct entry_long *)ondisk;
- ondisk_ext->flags_extended = htons(entry->flags_extended &
- GIT_IDXENTRY_EXTENDED_FLAGS);
- path = ondisk_ext->path;
+ ondisk.ctime.seconds = htonl((uint32_t)entry->ctime.seconds);
+ ondisk.mtime.seconds = htonl((uint32_t)entry->mtime.seconds);
+ ondisk.ctime.nanoseconds = htonl(entry->ctime.nanoseconds);
+ ondisk.mtime.nanoseconds = htonl(entry->mtime.nanoseconds);
+ ondisk.dev = htonl(entry->dev);
+ ondisk.ino = htonl(entry->ino);
+ ondisk.mode = htonl(entry->mode);
+ ondisk.uid = htonl(entry->uid);
+ ondisk.gid = htonl(entry->gid);
+ ondisk.file_size = htonl((uint32_t)entry->file_size);
+
+ git_oid_cpy(&ondisk.oid, &entry->id);
+
+ ondisk.flags = htons(entry->flags);
+
+ if (entry->flags & GIT_INDEX_ENTRY_EXTENDED) {
+ struct entry_long ondisk_ext;
+ memcpy(&ondisk_ext, &ondisk, sizeof(struct entry_short));
+ ondisk_ext.flags_extended = htons(entry->flags_extended &
+ GIT_INDEX_ENTRY_EXTENDED_FLAGS);
+ memcpy(mem, &ondisk_ext, offsetof(struct entry_long, path));
+ path = ((struct entry_long*)mem)->path;
disk_size -= offsetof(struct entry_long, path);
} else {
- path = ondisk->path;
+ memcpy(mem, &ondisk, offsetof(struct entry_short, path));
+ path = ((struct entry_short*)mem)->path;
disk_size -= offsetof(struct entry_short, path);
}
error = write_extension(file, &extension, &name_buf);
- git_buf_free(&name_buf);
+ git_buf_dispose(&name_buf);
done:
return error;
error = write_extension(file, &extension, &reuc_buf);
- git_buf_free(&reuc_buf);
+ git_buf_dispose(&reuc_buf);
done:
return error;
error = write_extension(file, &extension, &buf);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return error;
}
size_t i;
git_vector_foreach(&index->entries, i, entry)
- entry->flags_extended &= ~GIT_IDXENTRY_UPTODATE;
+ entry->flags_extended &= ~GIT_INDEX_ENTRY_UPTODATE;
}
static int write_index(git_oid *checksum, git_index *index, git_filebuf *file)
int git_index_entry_stage(const git_index_entry *entry)
{
- return GIT_IDXENTRY_STAGE(entry);
+ return GIT_INDEX_ENTRY_STAGE(entry);
}
int git_index_entry_is_conflict(const git_index_entry *entry)
{
- return (GIT_IDXENTRY_STAGE(entry) > 0);
+ return (GIT_INDEX_ENTRY_STAGE(entry) > 0);
}
typedef struct read_tree_data {
}
index_entry_adjust_namemask(entry, path.size);
- git_buf_free(&path);
+ git_buf_dispose(&path);
if (git_vector_insert(data->new_entries, entry) < 0) {
index_entry_free(entry);
goto cleanup;
if (index->ignore_case)
- git_idxmap_icase_resize((khash_t(idxicase) *) entries_map, entries.length);
+ git_idxmap_icase_resize((git_idxmap_icase *) entries_map, entries.length);
else
git_idxmap_resize(entries_map, entries.length);
INSERT_IN_MAP_EX(index, entries_map, e, &error);
if (error < 0) {
- giterr_set(GITERR_INDEX, "failed to insert entry into map");
+ git_error_set(GIT_ERROR_INDEX, "failed to insert entry into map");
return error;
}
}
entries_map = git__swap(index->entries_map, entries_map);
}
+ index->dirty = 1;
+
cleanup:
git_vector_free(&entries);
git_idxmap_free(entries_map);
goto done;
if (index->ignore_case && new_length_hint)
- git_idxmap_icase_resize((khash_t(idxicase) *) new_entries_map, new_length_hint);
+ git_idxmap_icase_resize((git_idxmap_icase *) new_entries_map, new_length_hint);
else if (new_length_hint)
git_idxmap_resize(new_entries_map, new_length_hint);
error = git_vector_insert(&remove_entries, remove_entry);
if (error < 0) {
- giterr_set(GITERR_INDEX, "failed to insert entry");
+ git_error_set(GIT_ERROR_INDEX, "failed to insert entry");
goto done;
}
clear_uptodate(index);
+ index->dirty = 1;
error = 0;
done:
error = index_apply_to_wd_diff(index, INDEX_ACTION_ADDALL, paths, flags, cb, payload);
if (error)
- giterr_set_after_callback(error);
+ git_error_set_after_callback(error);
cleanup:
git_iterator_free(wditer);
git_diff_free(diff);
if (error) /* make sure error is set if callback stopped iteration */
- giterr_set_after_callback(error);
+ git_error_set_after_callback(error);
cleanup:
git_pathspec__clear(&ps);
error = git_index_add_bypath(index, path.ptr);
if (error == GIT_ENOTFOUND) {
- giterr_clear();
+ git_error_clear();
error = git_index_remove_bypath(index, path.ptr);
i--; /* back up foreach if we removed this */
break;
default:
- giterr_set(GITERR_INVALID, "unknown index action %d", action);
+ git_error_set(GIT_ERROR_INVALID, "unknown index action %d", action);
error = -1;
break;
}
}
- git_buf_free(&path);
+ git_buf_dispose(&path);
git_pathspec__clear(&ps);
return error;
index, INDEX_ACTION_REMOVE, pathspec, cb, payload);
if (error) /* make sure error is set if callback stopped iteration */
- giterr_set_after_callback(error);
+ git_error_set_after_callback(error);
return error;
}
{
int error = index_apply_to_wd_diff(index, INDEX_ACTION_UPDATE, pathspec, 0, cb, payload);
if (error) /* make sure error is set if callback stopped iteration */
- giterr_set_after_callback(error);
+ git_error_set_after_callback(error);
return error;
}
&writer->file, index->index_file_path, GIT_FILEBUF_HASH_CONTENTS, GIT_INDEX_FILE_MODE)) < 0) {
if (error == GIT_ELOCKED)
- giterr_set(GITERR_INDEX, "the index is locked; this might be due to a concurrent or crashed process");
+ git_error_set(GIT_ERROR_INDEX, "the index is locked; this might be due to a concurrent or crashed process");
return error;
}
if ((error = git_futils_filestamp_check(
&writer->index->stamp, writer->index->index_file_path)) < 0) {
- giterr_set(GITERR_OS, "could not read index timestamp");
+ git_error_set(GIT_ERROR_OS, "could not read index timestamp");
return -1;
}
+ writer->index->dirty = 0;
writer->index->on_disk = 1;
git_oid_cpy(&writer->index->checksum, &checksum);
#define GIT_INDEX_FILE "index"
#define GIT_INDEX_FILE_MODE 0666
+extern bool git_index__enforce_unsaved_safety;
+
struct git_index {
git_refcount rc;
unsigned int ignore_case:1;
unsigned int distrust_filemode:1;
unsigned int no_symlinks:1;
+ unsigned int dirty:1; /* whether we have unsaved changes */
git_tree_cache *tree;
git_pool tree_pool;
unsigned int version;
};
+struct git_index_iterator {
+ git_index *index;
+ git_vector snap;
+ size_t cur;
+};
+
struct git_index_conflict_iterator {
git_index *index;
size_t cur;
/* Replace an index with a new index */
int git_index_read_index(git_index *index, const git_index *new_index);
+GIT_INLINE(int) git_index_is_dirty(git_index *index)
+{
+ return index->dirty;
+}
+
+extern int git_index_read_safely(git_index *index);
+
typedef struct {
git_index *index;
git_filebuf file;
#include "git2/indexer.h"
#include "git2/object.h"
+#include "commit.h"
+#include "tree.h"
+#include "tag.h"
#include "pack.h"
#include "mwindow.h"
#include "posix.h"
extern git_mutex git__mwindow_mutex;
+size_t git_indexer__max_objects = UINT32_MAX;
+
#define UINT31_MAX (0x7FFFFFFF)
struct entry {
pack_committed :1,
have_stream :1,
have_delta :1,
- do_fsync :1;
+ do_fsync :1,
+ do_verify :1;
struct git_pack_header hdr;
struct git_pack_file *pack;
unsigned int mode;
git_off_t off;
git_off_t entry_start;
+ git_object_t entry_type;
+ git_buf entry_data;
git_packfile_stream stream;
size_t nr_objects;
git_vector objects;
void *progress_payload;
char objbuf[8*1024];
+ /* OIDs referenced from pack objects. Used for verification. */
+ git_oidmap *expected_oids;
+
/* Needed to look up objects which we want to inject to fix a thin pack */
git_odb *odb;
/* Verify we recognize this pack file format. */
if (hdr->hdr_signature != ntohl(PACK_SIGNATURE)) {
- giterr_set(GITERR_INDEXER, "wrong pack signature");
+ git_error_set(GIT_ERROR_INDEXER, "wrong pack signature");
return -1;
}
if (!pack_version_ok(hdr->hdr_version)) {
- giterr_set(GITERR_INDEXER, "wrong pack version");
+ git_error_set(GIT_ERROR_INDEXER, "wrong pack version");
return -1;
}
return git_oid__cmp(&entrya->oid, &entryb->oid);
}
+int git_indexer_init_options(git_indexer_options *opts, unsigned int version)
+{
+ GIT_INIT_STRUCTURE_FROM_TEMPLATE(
+ opts, version, git_indexer_options, GIT_INDEXER_OPTIONS_INIT);
+ return 0;
+}
+
int git_indexer_new(
git_indexer **out,
const char *prefix,
unsigned int mode,
git_odb *odb,
- git_transfer_progress_cb progress_cb,
- void *progress_payload)
+ git_indexer_options *in_opts)
{
+ git_indexer_options opts = GIT_INDEXER_OPTIONS_INIT;
git_indexer *idx;
git_buf path = GIT_BUF_INIT, tmp_path = GIT_BUF_INIT;
static const char suff[] = "/pack";
int error, fd = -1;
+ if (in_opts)
+ memcpy(&opts, in_opts, sizeof(opts));
+
idx = git__calloc(1, sizeof(git_indexer));
- GITERR_CHECK_ALLOC(idx);
+ GIT_ERROR_CHECK_ALLOC(idx);
idx->odb = odb;
- idx->progress_cb = progress_cb;
- idx->progress_payload = progress_payload;
+ idx->progress_cb = opts.progress_cb;
+ idx->progress_payload = opts.progress_cb_payload;
idx->mode = mode ? mode : GIT_PACK_FILE_MODE;
git_hash_ctx_init(&idx->hash_ctx);
git_hash_ctx_init(&idx->trailer);
+ git_buf_init(&idx->entry_data, 0);
+ idx->expected_oids = git_oidmap_alloc();
+ GIT_ERROR_CHECK_ALLOC(idx->expected_oids);
+
+ idx->do_verify = opts.verify;
if (git_repository__fsync_gitdir)
idx->do_fsync = 1;
goto cleanup;
fd = git_futils_mktmp(&tmp_path, git_buf_cstr(&path), idx->mode);
- git_buf_free(&path);
+ git_buf_dispose(&path);
if (fd < 0)
goto cleanup;
error = git_packfile_alloc(&idx->pack, git_buf_cstr(&tmp_path));
- git_buf_free(&tmp_path);
+ git_buf_dispose(&tmp_path);
if (error < 0)
goto cleanup;
if (idx->pack != NULL)
p_unlink(idx->pack->pack_name);
- git_buf_free(&path);
- git_buf_free(&tmp_path);
+ git_buf_dispose(&path);
+ git_buf_dispose(&tmp_path);
git__free(idx);
return -1;
}
struct delta_info *delta;
delta = git__calloc(1, sizeof(struct delta_info));
- GITERR_CHECK_ALLOC(delta);
+ GIT_ERROR_CHECK_ALLOC(delta);
delta->delta_off = idx->entry_start;
if (git_vector_insert(&idx->deltas, delta) < 0)
return 0;
}
-static int hash_header(git_hash_ctx *ctx, git_off_t len, git_otype type)
+static int hash_header(git_hash_ctx *ctx, git_off_t len, git_object_t type)
{
char buffer[64];
size_t hdrlen;
if ((read = git_packfile_stream_read(stream, idx->objbuf, sizeof(idx->objbuf))) < 0)
break;
+ if (idx->do_verify)
+ git_buf_put(&idx->entry_data, idx->objbuf, read);
+
git_hash_update(&idx->hash_ctx, idx->objbuf, read);
} while (read > 0);
}
/* In order to create the packfile stream, we need to skip over the delta base description */
-static int advance_delta_offset(git_indexer *idx, git_otype type)
+static int advance_delta_offset(git_indexer *idx, git_object_t type)
{
git_mwindow *w = NULL;
- assert(type == GIT_OBJ_REF_DELTA || type == GIT_OBJ_OFS_DELTA);
+ assert(type == GIT_OBJECT_REF_DELTA || type == GIT_OBJECT_OFS_DELTA);
- if (type == GIT_OBJ_REF_DELTA) {
+ if (type == GIT_OBJECT_REF_DELTA) {
idx->off += GIT_OID_RAWSZ;
} else {
git_off_t base_off = get_delta_base(idx->pack, &w, &idx->off, type, idx->entry_start);
return 0;
}
+static void add_expected_oid(git_indexer *idx, const git_oid *oid)
+{
+ int ret;
+
+ /*
+ * If we know about that object because it is stored in our ODB or
+ * because we have already processed it as part of our pack file, we do
+ * not have to expect it.
+ */
+ if ((!idx->odb || !git_odb_exists(idx->odb, oid)) &&
+ !git_oidmap_exists(idx->pack->idx_cache, oid) &&
+ !git_oidmap_exists(idx->expected_oids, oid)) {
+ git_oid *dup = git__malloc(sizeof(*oid));
+ git_oid_cpy(dup, oid);
+ git_oidmap_put(idx->expected_oids, dup, &ret);
+ }
+}
+
+static int check_object_connectivity(git_indexer *idx, const git_rawobj *obj)
+{
+ git_object *object;
+ size_t keyidx;
+ int error;
+
+ if (obj->type != GIT_OBJECT_BLOB &&
+ obj->type != GIT_OBJECT_TREE &&
+ obj->type != GIT_OBJECT_COMMIT &&
+ obj->type != GIT_OBJECT_TAG)
+ return 0;
+
+ if ((error = git_object__from_raw(&object, obj->data, obj->len, obj->type)) < 0)
+ goto out;
+
+ keyidx = git_oidmap_lookup_index(idx->expected_oids, &object->cached.oid);
+ if (git_oidmap_valid_index(idx->expected_oids, keyidx)) {
+ const git_oid *key = git_oidmap_key(idx->expected_oids, keyidx);
+ git__free((git_oid *) key);
+ git_oidmap_delete_at(idx->expected_oids, keyidx);
+ }
+
+ /*
+ * Check whether this is a known object. If so, we can just continue as
+ * we assume that the ODB has a complete graph.
+ */
+ if (idx->odb && git_odb_exists(idx->odb, &object->cached.oid))
+ return 0;
+
+ switch (obj->type) {
+ case GIT_OBJECT_TREE:
+ {
+ git_tree *tree = (git_tree *) object;
+ git_tree_entry *entry;
+ size_t i;
+
+ git_array_foreach(tree->entries, i, entry)
+ add_expected_oid(idx, entry->oid);
+
+ break;
+ }
+ case GIT_OBJECT_COMMIT:
+ {
+ git_commit *commit = (git_commit *) object;
+ git_oid *parent_oid;
+ size_t i;
+
+ git_array_foreach(commit->parent_ids, i, parent_oid)
+ add_expected_oid(idx, parent_oid);
+
+ add_expected_oid(idx, &commit->tree_id);
+
+ break;
+ }
+ case GIT_OBJECT_TAG:
+ {
+ git_tag *tag = (git_tag *) object;
+
+ add_expected_oid(idx, &tag->target);
+
+ break;
+ }
+ case GIT_OBJECT_BLOB:
+ default:
+ break;
+ }
+
+out:
+ git_object_free(object);
+
+ return error;
+}
+
static int store_object(git_indexer *idx)
{
int i, error;
- khiter_t k;
+ size_t k;
git_oid oid;
struct entry *entry;
git_off_t entry_size;
git_off_t entry_start = idx->entry_start;
entry = git__calloc(1, sizeof(*entry));
- GITERR_CHECK_ALLOC(entry);
+ GIT_ERROR_CHECK_ALLOC(entry);
pentry = git__calloc(1, sizeof(struct git_pack_entry));
- GITERR_CHECK_ALLOC(pentry);
+ GIT_ERROR_CHECK_ALLOC(pentry);
git_hash_final(&oid, &idx->hash_ctx);
entry_size = idx->off - entry_start;
entry->offset = (uint32_t)entry_start;
}
+ if (idx->do_verify) {
+ git_rawobj rawobj = {
+ idx->entry_data.ptr,
+ idx->entry_data.size,
+ idx->entry_type
+ };
+
+ if ((error = check_object_connectivity(idx, &rawobj)) < 0)
+ goto on_error;
+ }
+
git_oid_cpy(&pentry->sha1, &oid);
pentry->offset = entry_start;
k = git_oidmap_put(idx->pack->idx_cache, &pentry->sha1, &error);
if (error == -1) {
git__free(pentry);
- giterr_set_oom();
+ git_error_set_oom();
goto on_error;
}
if (error == 0) {
- giterr_set(GITERR_INDEXER, "duplicate object %s found in pack", git_oid_tostr_s(&pentry->sha1));
+ git_error_set(GIT_ERROR_INDEXER, "duplicate object %s found in pack", git_oid_tostr_s(&pentry->sha1));
git__free(pentry);
goto on_error;
}
static int save_entry(git_indexer *idx, struct entry *entry, struct git_pack_entry *pentry, git_off_t entry_start)
{
int i, error;
- khiter_t k;
+ size_t k;
if (entry_start > UINT31_MAX) {
entry->offset = UINT32_MAX;
k = git_oidmap_put(idx->pack->idx_cache, &pentry->sha1, &error);
if (error <= 0) {
- giterr_set(GITERR_INDEXER, "cannot insert object into pack");
+ git_error_set(GIT_ERROR_INDEXER, "cannot insert object into pack");
return -1;
}
struct git_pack_entry *pentry = NULL;
entry = git__calloc(1, sizeof(*entry));
- GITERR_CHECK_ALLOC(entry);
+ GIT_ERROR_CHECK_ALLOC(entry);
if (git_odb__hashobj(&oid, obj) < 0) {
- giterr_set(GITERR_INDEXER, "failed to hash object");
+ git_error_set(GIT_ERROR_INDEXER, "failed to hash object");
goto on_error;
}
pentry = git__calloc(1, sizeof(struct git_pack_entry));
- GITERR_CHECK_ALLOC(pentry);
+ GIT_ERROR_CHECK_ALLOC(pentry);
git_oid_cpy(&pentry->sha1, &oid);
git_oid_cpy(&entry->oid, &oid);
static int do_progress_callback(git_indexer *idx, git_transfer_progress *stats)
{
if (idx->progress_cb)
- return giterr_set_after_callback_function(
+ return git_error_set_after_callback_function(
idx->progress_cb(stats, idx->progress_payload),
"indexer progress");
return 0;
if (p_lseek(fd, page_start + mmap_alignment - 1, SEEK_SET) < 0 ||
p_write(idx->pack->mwf.fd, data, 1) < 0) {
- giterr_set(GITERR_OS, "cannot extend packfile '%s'", idx->pack->pack_name);
+ git_error_set(GIT_ERROR_OS, "cannot extend packfile '%s'", idx->pack->pack_name);
return -1;
}
return write_at(idx, data, idx->pack->mwf.size, size);
}
+static int read_stream_object(git_indexer *idx, git_transfer_progress *stats)
+{
+ git_packfile_stream *stream = &idx->stream;
+ git_off_t entry_start = idx->off;
+ size_t entry_size;
+ git_object_t type;
+ git_mwindow *w = NULL;
+ int error;
+
+ if (idx->pack->mwf.size <= idx->off + 20)
+ return GIT_EBUFS;
+
+ if (!idx->have_stream) {
+ error = git_packfile_unpack_header(&entry_size, &type, &idx->pack->mwf, &w, &idx->off);
+ if (error == GIT_EBUFS) {
+ idx->off = entry_start;
+ return error;
+ }
+ if (error < 0)
+ return error;
+
+ git_mwindow_close(&w);
+ idx->entry_start = entry_start;
+ git_hash_init(&idx->hash_ctx);
+ git_buf_clear(&idx->entry_data);
+
+ if (type == GIT_OBJECT_REF_DELTA || type == GIT_OBJECT_OFS_DELTA) {
+ error = advance_delta_offset(idx, type);
+ if (error == GIT_EBUFS) {
+ idx->off = entry_start;
+ return error;
+ }
+ if (error < 0)
+ return error;
+
+ idx->have_delta = 1;
+ } else {
+ idx->have_delta = 0;
+
+ error = hash_header(&idx->hash_ctx, entry_size, type);
+ if (error < 0)
+ return error;
+ }
+
+ idx->have_stream = 1;
+ idx->entry_type = type;
+
+ error = git_packfile_stream_open(stream, idx->pack, idx->off);
+ if (error < 0)
+ return error;
+ }
+
+ if (idx->have_delta) {
+ error = read_object_stream(idx, stream);
+ } else {
+ error = hash_object_stream(idx, stream);
+ }
+
+ idx->off = stream->curpos;
+ if (error == GIT_EBUFS)
+ return error;
+
+ /* We want to free the stream reasorces no matter what here */
+ idx->have_stream = 0;
+ git_packfile_stream_dispose(stream);
+
+ if (error < 0)
+ return error;
+
+ if (idx->have_delta) {
+ error = store_delta(idx);
+ } else {
+ error = store_object(idx);
+ }
+
+ if (error < 0)
+ return error;
+
+ if (!idx->have_delta) {
+ stats->indexed_objects++;
+ }
+ stats->received_objects++;
+
+ if ((error = do_progress_callback(idx, stats)) != 0)
+ return error;
+
+ return 0;
+}
+
int git_indexer_append(git_indexer *idx, const void *data, size_t size, git_transfer_progress *stats)
{
int error = -1;
- size_t processed;
struct git_pack_header *hdr = &idx->hdr;
git_mwindow_file *mwf = &idx->pack->mwf;
assert(idx && data && stats);
- processed = stats->indexed_objects;
-
if ((error = append_to_pack(idx, data, size)) < 0)
return error;
idx->nr_objects = ntohl(hdr->hdr_entries);
idx->off = sizeof(struct git_pack_header);
- /* for now, limit to 2^32 objects */
- assert(idx->nr_objects == (size_t)((unsigned int)idx->nr_objects));
- if (idx->nr_objects == (size_t)((unsigned int)idx->nr_objects))
+ if (idx->nr_objects <= git_indexer__max_objects) {
total_objects = (unsigned int)idx->nr_objects;
- else
- total_objects = UINT_MAX;
+ } else {
+ git_error_set(GIT_ERROR_INDEXER, "too many objects");
+ return -1;
+ }
idx->pack->idx_cache = git_oidmap_alloc();
- GITERR_CHECK_ALLOC(idx->pack->idx_cache);
+ GIT_ERROR_CHECK_ALLOC(idx->pack->idx_cache);
idx->pack->has_cache = 1;
if (git_vector_init(&idx->objects, total_objects, objects_cmp) < 0)
stats->local_objects = 0;
stats->total_deltas = 0;
stats->indexed_deltas = 0;
- processed = stats->indexed_objects = 0;
+ stats->indexed_objects = 0;
stats->total_objects = total_objects;
if ((error = do_progress_callback(idx, stats)) != 0)
/* As the file grows any windows we try to use will be out of date */
git_mwindow_free_all(mwf);
- while (processed < idx->nr_objects) {
- git_packfile_stream *stream = &idx->stream;
- git_off_t entry_start = idx->off;
- size_t entry_size;
- git_otype type;
- git_mwindow *w = NULL;
-
- if (idx->pack->mwf.size <= idx->off + 20)
- return 0;
-
- if (!idx->have_stream) {
- error = git_packfile_unpack_header(&entry_size, &type, mwf, &w, &idx->off);
- if (error == GIT_EBUFS) {
- idx->off = entry_start;
- return 0;
- }
- if (error < 0)
+ while (stats->indexed_objects < idx->nr_objects) {
+ if ((error = read_stream_object(idx, stats)) != 0) {
+ if (error == GIT_EBUFS)
+ break;
+ else
goto on_error;
-
- git_mwindow_close(&w);
- idx->entry_start = entry_start;
- git_hash_init(&idx->hash_ctx);
-
- if (type == GIT_OBJ_REF_DELTA || type == GIT_OBJ_OFS_DELTA) {
- error = advance_delta_offset(idx, type);
- if (error == GIT_EBUFS) {
- idx->off = entry_start;
- return 0;
- }
- if (error < 0)
- goto on_error;
-
- idx->have_delta = 1;
- } else {
- idx->have_delta = 0;
-
- error = hash_header(&idx->hash_ctx, entry_size, type);
- if (error < 0)
- goto on_error;
- }
-
- idx->have_stream = 1;
-
- error = git_packfile_stream_open(stream, idx->pack, idx->off);
- if (error < 0)
- goto on_error;
- }
-
- if (idx->have_delta) {
- error = read_object_stream(idx, stream);
- } else {
- error = hash_object_stream(idx, stream);
- }
-
- idx->off = stream->curpos;
- if (error == GIT_EBUFS)
- return 0;
-
- /* We want to free the stream reasorces no matter what here */
- idx->have_stream = 0;
- git_packfile_stream_free(stream);
-
- if (error < 0)
- goto on_error;
-
- if (idx->have_delta) {
- error = store_delta(idx);
- } else {
- error = store_object(idx);
}
-
- if (error < 0)
- goto on_error;
-
- if (!idx->have_delta) {
- stats->indexed_objects = (unsigned int)++processed;
- }
- stats->received_objects++;
-
- if ((error = do_progress_callback(idx, stats)) != 0)
- goto on_error;
}
return 0;
entry_start = idx->pack->mwf.size;
if (git_odb_read(&obj, idx->odb, id) < 0) {
- giterr_set(GITERR_INDEXER, "missing delta bases");
+ git_error_set(GIT_ERROR_INDEXER, "missing delta bases");
return -1;
}
len = git_odb_object_size(obj);
entry = git__calloc(1, sizeof(*entry));
- GITERR_CHECK_ALLOC(entry);
+ GIT_ERROR_CHECK_ALLOC(entry);
entry->crc = crc32(0L, Z_NULL, 0);
idx->pack->mwf.size += buf.size;
entry->crc = htonl(crc32(entry->crc, (unsigned char *)buf.ptr, (uInt)buf.size));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
/* Write a fake trailer so the pack functions play ball */
idx->pack->mwf.size += GIT_OID_RAWSZ;
pentry = git__calloc(1, sizeof(struct git_pack_entry));
- GITERR_CHECK_ALLOC(pentry);
+ GIT_ERROR_CHECK_ALLOC(pentry);
git_oid_cpy(&pentry->sha1, id);
git_oid_cpy(&entry->oid, id);
unsigned int i;
struct delta_info *delta;
size_t size;
- git_otype type;
+ git_object_t type;
git_mwindow *w = NULL;
git_off_t curpos = 0;
unsigned char *base_info;
assert(git_vector_length(&idx->deltas) > 0);
if (idx->odb == NULL) {
- giterr_set(GITERR_INDEXER, "cannot fix a thin pack without an ODB");
+ git_error_set(GIT_ERROR_INDEXER, "cannot fix a thin pack without an ODB");
return -1;
}
if (error < 0)
return error;
- if (type == GIT_OBJ_REF_DELTA) {
+ if (type == GIT_OBJECT_REF_DELTA) {
found_ref_delta = 1;
break;
}
}
if (!found_ref_delta) {
- giterr_set(GITERR_INDEXER, "no REF_DELTA found, cannot inject object");
+ git_error_set(GIT_ERROR_INDEXER, "no REF_DELTA found, cannot inject object");
return -1;
}
/* curpos now points to the base information, which is an OID */
base_info = git_mwindow_open(&idx->pack->mwf, &w, curpos, GIT_OID_RAWSZ, &left);
if (base_info == NULL) {
- giterr_set(GITERR_INDEXER, "failed to map delta information");
+ git_error_set(GIT_ERROR_INDEXER, "failed to map delta information");
return -1;
}
progressed = 0;
non_null = 0;
git_vector_foreach(&idx->deltas, i, delta) {
- git_rawobj obj = {NULL};
+ git_rawobj obj = {0};
if (!delta)
continue;
return -1;
}
+ if (idx->do_verify && check_object_connectivity(idx, &obj) < 0)
+ /* TODO: error? continue? */
+ continue;
+
if (hash_and_save(idx, &obj, delta->delta_off) < 0)
continue;
void *packfile_trailer;
if (!idx->parsed_header) {
- giterr_set(GITERR_INDEXER, "incomplete pack header");
+ git_error_set(GIT_ERROR_INDEXER, "incomplete pack header");
return -1;
}
/* Test for this before resolve_deltas(), as it plays with idx->off */
if (idx->off + 20 < idx->pack->mwf.size) {
- giterr_set(GITERR_INDEXER, "unexpected data at the end of the pack");
+ git_error_set(GIT_ERROR_INDEXER, "unexpected data at the end of the pack");
return -1;
}
if (idx->off + 20 > idx->pack->mwf.size) {
- giterr_set(GITERR_INDEXER, "missing trailer at the end of the pack");
+ git_error_set(GIT_ERROR_INDEXER, "missing trailer at the end of the pack");
return -1;
}
git_hash_final(&trailer_hash, &idx->trailer);
if (git_oid_cmp(&file_hash, &trailer_hash)) {
- giterr_set(GITERR_INDEXER, "packfile trailer mismatch");
+ git_error_set(GIT_ERROR_INDEXER, "packfile trailer mismatch");
return -1;
}
return error;
if (stats->indexed_objects != stats->total_objects) {
- giterr_set(GITERR_INDEXER, "early EOF");
+ git_error_set(GIT_ERROR_INDEXER, "early EOF");
return -1;
}
write_at(idx, &trailer_hash, idx->pack->mwf.size - GIT_OID_RAWSZ, GIT_OID_RAWSZ);
}
+ /*
+ * Is the resulting graph fully connected or are we still
+ * missing some objects? In the second case, we can
+ * bail out due to an incomplete and thus corrupt
+ * packfile.
+ */
+ if (git_oidmap_size(idx->expected_oids) > 0) {
+ git_error_set(GIT_ERROR_INDEXER, "packfile is missing %"PRIuZ" objects",
+ git_oidmap_size(idx->expected_oids));
+ return -1;
+ }
+
git_vector_sort(&idx->objects);
/* Use the trailer hash as the pack file name to ensure
/* Truncate file to undo rounding up to next page_size in append_to_pack */
if (p_ftruncate(idx->pack->mwf.fd, idx->pack->mwf.size) < 0) {
- giterr_set(GITERR_OS, "failed to truncate pack file '%s'", idx->pack->pack_name);
+ git_error_set(GIT_ERROR_OS, "failed to truncate pack file '%s'", idx->pack->pack_name);
return -1;
}
if (idx->do_fsync && p_fsync(idx->pack->mwf.fd) < 0) {
- giterr_set(GITERR_OS, "failed to fsync packfile");
+ git_error_set(GIT_ERROR_OS, "failed to fsync packfile");
goto on_error;
}
/* We need to close the descriptor here so Windows doesn't choke on commit_at */
if (p_close(idx->pack->mwf.fd) < 0) {
- giterr_set(GITERR_OS, "failed to close packfile");
+ git_error_set(GIT_ERROR_OS, "failed to close packfile");
goto on_error;
}
idx->pack_committed = 1;
- git_buf_free(&filename);
+ git_buf_dispose(&filename);
return 0;
on_error:
git_mwindow_free_all(&idx->pack->mwf);
git_filebuf_cleanup(&index_file);
- git_buf_free(&filename);
+ git_buf_dispose(&filename);
return -1;
}
void git_indexer_free(git_indexer *idx)
{
+ size_t pos;
+
if (idx == NULL)
return;
if (idx->have_stream)
- git_packfile_stream_free(&idx->stream);
+ git_packfile_stream_dispose(&idx->stream);
git_vector_free_deep(&idx->objects);
git_mutex_unlock(&git__mwindow_mutex);
}
+ for (pos = git_oidmap_begin(idx->expected_oids);
+ pos != git_oidmap_end(idx->expected_oids); pos++)
+ {
+ if (git_oidmap_has_data(idx->expected_oids, pos)) {
+ git__free((git_oid *) git_oidmap_key(idx->expected_oids, pos));
+ git_oidmap_delete_at(idx->expected_oids, pos);
+ }
+ }
+
git_hash_ctx_cleanup(&idx->trailer);
git_hash_ctx_cleanup(&idx->hash_ctx);
+ git_buf_dispose(&idx->entry_data);
+ git_oidmap_free(idx->expected_oids);
git__free(idx);
}
return p == (long long)r;
}
-/**
- * Sets `one + two` into `out`, unless the arithmetic would overflow.
- * @return true if the result fits in a `uint64_t`, false on overflow.
- */
-GIT_INLINE(bool) git__add_uint64_overflow(uint64_t *out, uint64_t one, uint64_t two)
-{
- if (UINT64_MAX - one < two)
- return true;
- *out = one + two;
- return false;
-}
-
/* Use clang/gcc compiler intrinsics whenever possible */
-#if (SIZE_MAX == ULONG_MAX) && __has_builtin(__builtin_uaddl_overflow)
-# define git__add_sizet_overflow(out, one, two) \
- __builtin_uaddl_overflow(one, two, out)
-# define git__multiply_sizet_overflow(out, one, two) \
- __builtin_umull_overflow(one, two, out)
-#elif (SIZE_MAX == UINT_MAX) && __has_builtin(__builtin_uadd_overflow)
+#if (__has_builtin(__builtin_add_overflow) || \
+ (defined(__GNUC__) && (__GNUC__ >= 5)))
+
+# if (SIZE_MAX == UINT_MAX)
+# define git__add_sizet_overflow(out, one, two) \
+ __builtin_uadd_overflow(one, two, out)
+# define git__multiply_sizet_overflow(out, one, two) \
+ __builtin_umul_overflow(one, two, out)
+# elif (SIZE_MAX == ULONG_MAX)
+# define git__add_sizet_overflow(out, one, two) \
+ __builtin_uaddl_overflow(one, two, out)
+# define git__multiply_sizet_overflow(out, one, two) \
+ __builtin_umull_overflow(one, two, out)
+# elif (SIZE_MAX == ULLONG_MAX)
+# define git__add_sizet_overflow(out, one, two) \
+ __builtin_uaddll_overflow(one, two, out)
+# define git__multiply_sizet_overflow(out, one, two) \
+ __builtin_umulll_overflow(one, two, out)
+# else
+# error compiler has add with overflow intrinsics but SIZE_MAX is unknown
+# endif
+
+/* Use Microsoft's safe integer handling functions where available */
+#elif defined(_MSC_VER)
+
+# include <intsafe.h>
+
# define git__add_sizet_overflow(out, one, two) \
- __builtin_uadd_overflow(one, two, out)
+ (SizeTAdd(one, two, out) != S_OK)
# define git__multiply_sizet_overflow(out, one, two) \
- __builtin_umul_overflow(one, two, out)
+ (SizeTMult(one, two, out) != S_OK)
+
#else
/**
* Sets `one + two` into `out`, unless the arithmetic would overflow.
- * @return true if the result fits in a `size_t`, false on overflow.
+ * @return false if the result fits in a `size_t`, true on overflow.
*/
GIT_INLINE(bool) git__add_sizet_overflow(size_t *out, size_t one, size_t two)
{
/**
* Sets `one * two` into `out`, unless the arithmetic would overflow.
- * @return true if the result fits in a `size_t`, false on overflow.
+ * @return false if the result fits in a `size_t`, true on overflow.
*/
GIT_INLINE(bool) git__multiply_sizet_overflow(size_t *out, size_t one, size_t two)
{
{
if (start && *start) {
iter->start = git__strdup(start);
- GITERR_CHECK_ALLOC(iter->start);
+ GIT_ERROR_CHECK_ALLOC(iter->start);
iter->start_len = strlen(iter->start);
}
if (end && *end) {
iter->end = git__strdup(end);
- GITERR_CHECK_ALLOC(iter->end);
+ GIT_ERROR_CHECK_ALLOC(iter->end);
iter->end_len = strlen(iter->end);
}
(iter->flags & GIT_ITERATOR_DONT_PRECOMPOSE_UNICODE) == 0) {
if (git_repository__cvar(&precompose, repo, GIT_CVAR_PRECOMPOSE) < 0)
- giterr_clear();
+ git_error_clear();
else if (precompose)
iter->flags |= GIT_ITERATOR_PRECOMPOSE_UNICODE;
}
*out = NULL;
iter = git__calloc(1, sizeof(empty_iterator));
- GITERR_CHECK_ALLOC(iter);
+ GIT_ERROR_CHECK_ALLOC(iter);
iter->base.type = GIT_ITERATOR_TYPE_EMPTY;
iter->base.cb = &callbacks;
icase ? git__strncasecmp : git__strncmp);
}
-GIT_INLINE(int) tree_iterator_entry_cmp(const void *ptr_a, const void *ptr_b)
-{
- const tree_iterator_entry *a = (const tree_iterator_entry *)ptr_a;
- const tree_iterator_entry *b = (const tree_iterator_entry *)ptr_b;
-
- return tree_entry_cmp(a->tree_entry, b->tree_entry, false);
-}
-
GIT_INLINE(int) tree_iterator_entry_cmp_icase(
const void *ptr_a, const void *ptr_b)
{
int error = 0;
new_frame = git_array_alloc(iter->frames);
- GITERR_CHECK_ALLOC(new_frame);
+ GIT_ERROR_CHECK_ALLOC(new_frame);
memset(new_frame, 0, sizeof(tree_iterator_frame));
git_array_foreach(dup->entries, i, tree_entry) {
new_entry = git_pool_malloc(&iter->entry_pool, 1);
- GITERR_CHECK_ALLOC(new_entry);
+ GIT_ERROR_CHECK_ALLOC(new_entry);
new_entry->tree_entry = tree_entry;
new_entry->parent_path = new_frame->path.ptr;
break;
path = git_array_alloc(parent_frame->similar_paths);
- GITERR_CHECK_ALLOC(path);
+ GIT_ERROR_CHECK_ALLOC(path);
memset(path, 0, sizeof(git_buf));
if ((error = tree_iterator_compute_path(path, entry)) < 0)
break;
- GITERR_CHECK_ALLOC_ADD(&new_size,
+ GIT_ERROR_CHECK_ALLOC_ADD(&new_size,
frame->entries.length, tree->entries.size);
git_vector_size_hint(&frame->entries, new_size);
git_array_foreach(tree->entries, i, tree_entry) {
new_entry = git_pool_malloc(&iter->entry_pool, 1);
- GITERR_CHECK_ALLOC(new_entry);
+ GIT_ERROR_CHECK_ALLOC(new_entry);
new_entry->tree_entry = tree_entry;
new_entry->parent_path = path->ptr;
do {
buf = git_array_pop(frame->similar_paths);
- git_buf_free(buf);
+ git_buf_dispose(buf);
} while (buf != NULL);
git_array_clear(frame->similar_paths);
git_vector_free(&frame->similar_trees);
- git_buf_free(&frame->path);
+ git_buf_dispose(&frame->path);
}
static int tree_iterator_current(
tree_iterator_clear(iter);
git_tree_free(iter->root);
- git_buf_free(&iter->entry_path);
+ git_buf_dispose(&iter->entry_path);
}
int git_iterator_for_tree(
return git_iterator_for_nothing(out, options);
iter = git__calloc(1, sizeof(tree_iterator));
- GITERR_CHECK_ALLOC(iter);
+ GIT_ERROR_CHECK_ALLOC(iter);
iter->base.type = GIT_ITERATOR_TYPE_TREE;
iter->base.cb = &callbacks;
struct stat st;
size_t path_len;
iterator_pathlist_search_t match;
+ git_oid id;
char path[GIT_FLEX_ARRAY];
} filesystem_iterator_entry;
if (git_ignore__lookup(&new_frame->is_ignored,
&iter->ignores, path, GIT_DIR_FLAG_TRUE) < 0) {
- giterr_clear();
+ git_error_clear();
new_frame->is_ignored = GIT_IGNORE_NOTFOUND;
}
return (len == 4 || path[len - 5] == '/');
}
-static filesystem_iterator_entry *filesystem_iterator_entry_init(
+static int filesystem_iterator_entry_hash(
+ filesystem_iterator *iter,
+ filesystem_iterator_entry *entry)
+{
+ git_buf fullpath = GIT_BUF_INIT;
+ int error;
+
+ if (S_ISDIR(entry->st.st_mode)) {
+ memset(&entry->id, 0, GIT_OID_RAWSZ);
+ return 0;
+ }
+
+ if (iter->base.type == GIT_ITERATOR_TYPE_WORKDIR)
+ return git_repository_hashfile(&entry->id,
+ iter->base.repo, entry->path, GIT_OBJECT_BLOB, NULL);
+
+ if (!(error = git_buf_joinpath(&fullpath, iter->root, entry->path)))
+ error = git_odb_hashfile(&entry->id, fullpath.ptr, GIT_OBJECT_BLOB);
+
+ git_buf_dispose(&fullpath);
+ return error;
+}
+
+static int filesystem_iterator_entry_init(
+ filesystem_iterator_entry **out,
+ filesystem_iterator *iter,
filesystem_iterator_frame *frame,
const char *path,
size_t path_len,
{
filesystem_iterator_entry *entry;
size_t entry_size;
+ int error = 0;
+
+ *out = NULL;
/* Make sure to append two bytes, one for the path's null
* termination, one for a possible trailing '/' for folders.
*/
- if (GIT_ADD_SIZET_OVERFLOW(&entry_size,
- sizeof(filesystem_iterator_entry), path_len) ||
- GIT_ADD_SIZET_OVERFLOW(&entry_size, entry_size, 2) ||
- (entry = git_pool_malloc(&frame->entry_pool, entry_size)) == NULL)
- return NULL;
+ GIT_ERROR_CHECK_ALLOC_ADD(&entry_size,
+ sizeof(filesystem_iterator_entry), path_len);
+ GIT_ERROR_CHECK_ALLOC_ADD(&entry_size, entry_size, 2);
+
+ entry = git_pool_malloc(&frame->entry_pool, entry_size);
+ GIT_ERROR_CHECK_ALLOC(entry);
entry->path_len = path_len;
entry->match = pathlist_match;
entry->path[entry->path_len] = '\0';
- return entry;
+ if (iter->base.flags & GIT_ITERATOR_INCLUDE_HASH)
+ error = filesystem_iterator_entry_hash(iter, entry);
+
+ if (!error)
+ *out = entry;
+
+ return error;
}
static int filesystem_iterator_frame_push(
int error;
if (iter->frames.size == FILESYSTEM_MAX_DEPTH) {
- giterr_set(GITERR_REPOSITORY,
+ git_error_set(GIT_ERROR_REPOSITORY,
"directory nesting too deep (%"PRIuZ")", iter->frames.size);
return -1;
}
new_frame = git_array_alloc(iter->frames);
- GITERR_CHECK_ALLOC(new_frame);
+ GIT_ERROR_CHECK_ALLOC(new_frame);
memset(new_frame, 0, sizeof(filesystem_iterator_frame));
else if (dir_expected)
continue;
- entry = filesystem_iterator_entry_init(new_frame,
- path, path_len, &statbuf, pathlist_match);
- GITERR_CHECK_ALLOC(entry);
+ if ((error = filesystem_iterator_entry_init(&entry,
+ iter, new_frame, path, path_len, &statbuf, pathlist_match)) < 0)
+ goto done;
git_vector_insert(&new_frame->entries, entry);
}
if (error < 0)
git_array_pop(iter->frames);
- git_buf_free(&root);
+ git_buf_dispose(&root);
git_path_diriter_free(&diriter);
return error;
}
filesystem_iterator *iter,
filesystem_iterator_entry *entry)
{
- iter->entry.ctime.seconds = entry->st.st_ctime;
- iter->entry.mtime.seconds = entry->st.st_mtime;
+ /*
+ * Index entries are limited to 32 bit timestamps. We can safely
+ * cast this since workdir times are only used in the cache; any
+ * mismatch will cause a hash recomputation which is unfortunate
+ * but affects only people who set their filetimes to 2038.
+ * (Same with the file size.)
+ */
+ iter->entry.ctime.seconds = (int32_t)entry->st.st_ctime;
+ iter->entry.mtime.seconds = (int32_t)entry->st.st_mtime;
-#if defined(GIT_USE_NSEC)
+#if defined(GIT_USE_NSEC)
iter->entry.ctime.nanoseconds = entry->st.st_ctime_nsec;
iter->entry.mtime.nanoseconds = entry->st.st_mtime_nsec;
#else
iter->entry.mode = git_futils_canonical_mode(entry->st.st_mode);
iter->entry.uid = entry->st.st_uid;
iter->entry.gid = entry->st.st_gid;
- iter->entry.file_size = entry->st.st_size;
+ iter->entry.file_size = (uint32_t)entry->st.st_size;
+
+ if (iter->base.flags & GIT_ITERATOR_INCLUDE_HASH)
+ git_oid_cpy(&iter->entry.id, &entry->id);
iter->entry.path = entry->path;
*is_dir = S_ISDIR(st.st_mode);
done:
- git_buf_free(&fullpath);
+ git_buf_dispose(&fullpath);
return error;
}
if (git_ignore__lookup(&iter->current_is_ignored,
&iter->ignores, iter->entry.path, dir_flag) < 0) {
- giterr_clear();
+ git_error_clear();
iter->current_is_ignored = GIT_IGNORE_NOTFOUND;
}
git_array_clear(iter->frames);
git_ignore__free(&iter->ignores);
- git_buf_free(&iter->tmp_buf);
+ git_buf_dispose(&iter->tmp_buf);
iterator_clear(&iter->base);
}
{
filesystem_iterator *iter = (filesystem_iterator *)i;
git__free(iter->root);
- git_buf_free(&iter->current_path);
+ git_buf_dispose(&iter->current_path);
git_tree_free(iter->tree);
if (iter->index)
git_index_snapshot_release(&iter->index_snapshot, iter->index);
return git_iterator_for_nothing(out, options);
iter = git__calloc(1, sizeof(filesystem_iterator));
- GITERR_CHECK_ALLOC(iter);
+ GIT_ERROR_CHECK_ALLOC(iter);
iter->base.type = type;
iter->base.cb = &callbacks;
root_len = strlen(root);
iter->root = git__malloc(root_len+2);
- GITERR_CHECK_ALLOC(iter->root);
+ GIT_ERROR_CHECK_ALLOC(iter->root);
memcpy(iter->root, root, root_len);
index_iterator *iter = (index_iterator *)i;
git_index_snapshot_release(&iter->entries, iter->base.index);
- git_buf_free(&iter->tree_buf);
+ git_buf_dispose(&iter->tree_buf);
}
int git_iterator_for_index(
return git_iterator_for_nothing(out, options);
iter = git__calloc(1, sizeof(index_iterator));
- GITERR_CHECK_ALLOC(iter);
+ GIT_ERROR_CHECK_ALLOC(iter);
iter->base.type = GIT_ITERATOR_TYPE_INDEX;
iter->base.cb = &callbacks;
git__free(iter);
}
+int git_iterator_foreach(
+ git_iterator *iterator,
+ git_iterator_foreach_cb cb,
+ void *data)
+{
+ const git_index_entry *iterator_item;
+ int error = 0;
+
+ if ((error = git_iterator_current(&iterator_item, iterator)) < 0)
+ goto done;
+
+ if ((error = cb(iterator_item, data)) != 0)
+ goto done;
+
+ while (true) {
+ if ((error = git_iterator_advance(&iterator_item, iterator)) < 0)
+ goto done;
+
+ if ((error = cb(iterator_item, data)) != 0)
+ goto done;
+ }
+
+done:
+ if (error == GIT_ITEROVER)
+ error = 0;
+
+ return error;
+}
+
int git_iterator_walk(
git_iterator **iterators,
size_t cnt,
iterator_item = git__calloc(cnt, sizeof(git_index_entry *));
cur_items = git__calloc(cnt, sizeof(git_index_entry *));
- GITERR_CHECK_ALLOC(iterator_item);
- GITERR_CHECK_ALLOC(cur_items);
+ GIT_ERROR_CHECK_ALLOC(iterator_item);
+ GIT_ERROR_CHECK_ALLOC(cur_items);
/* Set up the iterators */
for (i = 0; i < cnt; i++) {
GIT_ITERATOR_INCLUDE_CONFLICTS = (1u << 6),
/** descend into symlinked directories */
GIT_ITERATOR_DESCEND_SYMLINKS = (1u << 7),
+ /** hash files in workdir or filesystem iterators */
+ GIT_ITERATOR_INCLUDE_HASH = (1u << 8),
} git_iterator_flag_t;
typedef enum {
*/
extern git_index *git_iterator_index(git_iterator *iter);
+typedef int (*git_iterator_foreach_cb)(
+ const git_index_entry *entry,
+ void *data);
+
+/**
+ * Walk the given iterator and invoke the callback for each path
+ * contained in the iterator.
+ */
+extern int git_iterator_foreach(
+ git_iterator *iterator,
+ git_iterator_foreach_cb cb,
+ void *data);
+
typedef int (*git_iterator_walk_cb)(
const git_index_entry **entries,
void *data);
#ifndef kh_inline
#ifdef _MSC_VER
#define kh_inline __inline
+#elif defined(__GNUC__)
+#define kh_inline __inline__
#else
-#define kh_inline inline
+#define kh_inline
#endif
#endif /* kh_inline */
--- /dev/null
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#include "mailmap.h"
+
+#include "common.h"
+#include "path.h"
+#include "repository.h"
+#include "signature.h"
+#include "git2/config.h"
+#include "git2/revparse.h"
+#include "blob.h"
+#include "parse.h"
+
+#define MM_FILE ".mailmap"
+#define MM_FILE_CONFIG "mailmap.file"
+#define MM_BLOB_CONFIG "mailmap.blob"
+#define MM_BLOB_DEFAULT "HEAD:" MM_FILE
+
+static void mailmap_entry_free(git_mailmap_entry *entry)
+{
+ if (!entry)
+ return;
+
+ git__free(entry->real_name);
+ git__free(entry->real_email);
+ git__free(entry->replace_name);
+ git__free(entry->replace_email);
+ git__free(entry);
+}
+
+/*
+ * First we sort by replace_email, then replace_name (if present).
+ * Entries with names are greater than entries without.
+ */
+static int mailmap_entry_cmp(const void *a_raw, const void *b_raw)
+{
+ const git_mailmap_entry *a = (const git_mailmap_entry *)a_raw;
+ const git_mailmap_entry *b = (const git_mailmap_entry *)b_raw;
+ int cmp;
+
+ assert(a && b && a->replace_email && b->replace_email);
+
+ cmp = git__strcmp(a->replace_email, b->replace_email);
+ if (cmp)
+ return cmp;
+
+ /* NULL replace_names are less than not-NULL ones */
+ if (a->replace_name == NULL || b->replace_name == NULL)
+ return (int)(a->replace_name != NULL) - (int)(b->replace_name != NULL);
+
+ return git__strcmp(a->replace_name, b->replace_name);
+}
+
+/* Replace the old entry with the new on duplicate. */
+static int mailmap_entry_replace(void **old_raw, void *new_raw)
+{
+ mailmap_entry_free((git_mailmap_entry *)*old_raw);
+ *old_raw = new_raw;
+ return GIT_EEXISTS;
+}
+
+/* Check if we're at the end of line, w/ comments */
+static bool is_eol(git_parse_ctx *ctx)
+{
+ char c;
+ return git_parse_peek(&c, ctx, GIT_PARSE_PEEK_SKIP_WHITESPACE) < 0 || c == '#';
+}
+
+static int advance_until(
+ const char **start, size_t *len, git_parse_ctx *ctx, char needle)
+{
+ *start = ctx->line;
+ while (ctx->line_len > 0 && *ctx->line != '#' && *ctx->line != needle)
+ git_parse_advance_chars(ctx, 1);
+
+ if (ctx->line_len == 0 || *ctx->line == '#')
+ return -1; /* end of line */
+
+ *len = ctx->line - *start;
+ git_parse_advance_chars(ctx, 1); /* advance past needle */
+ return 0;
+}
+
+/*
+ * Parse a single entry from a mailmap file.
+ *
+ * The output git_bufs will be non-owning, and should be copied before being
+ * persisted.
+ */
+static int parse_mailmap_entry(
+ git_buf *real_name, git_buf *real_email,
+ git_buf *replace_name, git_buf *replace_email,
+ git_parse_ctx *ctx)
+{
+ const char *start;
+ size_t len;
+
+ git_buf_clear(real_name);
+ git_buf_clear(real_email);
+ git_buf_clear(replace_name);
+ git_buf_clear(replace_email);
+
+ git_parse_advance_ws(ctx);
+ if (is_eol(ctx))
+ return -1; /* blank line */
+
+ /* Parse the real name */
+ if (advance_until(&start, &len, ctx, '<') < 0)
+ return -1;
+
+ git_buf_attach_notowned(real_name, start, len);
+ git_buf_rtrim(real_name);
+
+ /*
+ * If this is the last email in the line, this is the email to replace,
+ * otherwise, it's the real email.
+ */
+ if (advance_until(&start, &len, ctx, '>') < 0)
+ return -1;
+
+ /* If we aren't at the end of the line, parse a second name and email */
+ if (!is_eol(ctx)) {
+ git_buf_attach_notowned(real_email, start, len);
+
+ git_parse_advance_ws(ctx);
+ if (advance_until(&start, &len, ctx, '<') < 0)
+ return -1;
+ git_buf_attach_notowned(replace_name, start, len);
+ git_buf_rtrim(replace_name);
+
+ if (advance_until(&start, &len, ctx, '>') < 0)
+ return -1;
+ }
+
+ git_buf_attach_notowned(replace_email, start, len);
+
+ if (!is_eol(ctx))
+ return -1;
+
+ return 0;
+}
+
+int git_mailmap_new(git_mailmap **out)
+{
+ int error;
+ git_mailmap *mm = git__calloc(1, sizeof(git_mailmap));
+ GIT_ERROR_CHECK_ALLOC(mm);
+
+ error = git_vector_init(&mm->entries, 0, mailmap_entry_cmp);
+ if (error < 0) {
+ git__free(mm);
+ return error;
+ }
+ *out = mm;
+ return 0;
+}
+
+void git_mailmap_free(git_mailmap *mm)
+{
+ size_t idx;
+ git_mailmap_entry *entry;
+ if (!mm)
+ return;
+
+ git_vector_foreach(&mm->entries, idx, entry)
+ mailmap_entry_free(entry);
+
+ git_vector_free(&mm->entries);
+ git__free(mm);
+}
+
+static int mailmap_add_entry_unterminated(
+ git_mailmap *mm,
+ const char *real_name, size_t real_name_size,
+ const char *real_email, size_t real_email_size,
+ const char *replace_name, size_t replace_name_size,
+ const char *replace_email, size_t replace_email_size)
+{
+ int error;
+ git_mailmap_entry *entry = git__calloc(1, sizeof(git_mailmap_entry));
+ GIT_ERROR_CHECK_ALLOC(entry);
+
+ assert(mm && replace_email && *replace_email);
+
+ if (real_name_size > 0) {
+ entry->real_name = git__substrdup(real_name, real_name_size);
+ GIT_ERROR_CHECK_ALLOC(entry->real_name);
+ }
+ if (real_email_size > 0) {
+ entry->real_email = git__substrdup(real_email, real_email_size);
+ GIT_ERROR_CHECK_ALLOC(entry->real_email);
+ }
+ if (replace_name_size > 0) {
+ entry->replace_name = git__substrdup(replace_name, replace_name_size);
+ GIT_ERROR_CHECK_ALLOC(entry->replace_name);
+ }
+ entry->replace_email = git__substrdup(replace_email, replace_email_size);
+ GIT_ERROR_CHECK_ALLOC(entry->replace_email);
+
+ error = git_vector_insert_sorted(&mm->entries, entry, mailmap_entry_replace);
+ if (error == GIT_EEXISTS)
+ error = GIT_OK;
+ else if (error < 0)
+ mailmap_entry_free(entry);
+
+ return error;
+}
+
+int git_mailmap_add_entry(
+ git_mailmap *mm, const char *real_name, const char *real_email,
+ const char *replace_name, const char *replace_email)
+{
+ return mailmap_add_entry_unterminated(
+ mm,
+ real_name, real_name ? strlen(real_name) : 0,
+ real_email, real_email ? strlen(real_email) : 0,
+ replace_name, replace_name ? strlen(replace_name) : 0,
+ replace_email, strlen(replace_email));
+}
+
+static int mailmap_add_buffer(git_mailmap *mm, const char *buf, size_t len)
+{
+ int error = 0;
+ git_parse_ctx ctx;
+
+ /* Scratch buffers containing the real parsed names & emails */
+ git_buf real_name = GIT_BUF_INIT;
+ git_buf real_email = GIT_BUF_INIT;
+ git_buf replace_name = GIT_BUF_INIT;
+ git_buf replace_email = GIT_BUF_INIT;
+
+ /* Buffers may not contain '\0's. */
+ if (memchr(buf, '\0', len) != NULL)
+ return -1;
+
+ git_parse_ctx_init(&ctx, buf, len);
+
+ /* Run the parser */
+ while (ctx.remain_len > 0) {
+ error = parse_mailmap_entry(
+ &real_name, &real_email, &replace_name, &replace_email, &ctx);
+ if (error < 0) {
+ error = 0; /* Skip lines which don't contain a valid entry */
+ git_parse_advance_line(&ctx);
+ continue; /* TODO: warn */
+ }
+
+ /* NOTE: Can't use add_entry(...) as our buffers aren't terminated */
+ error = mailmap_add_entry_unterminated(
+ mm, real_name.ptr, real_name.size, real_email.ptr, real_email.size,
+ replace_name.ptr, replace_name.size, replace_email.ptr, replace_email.size);
+ if (error < 0)
+ goto cleanup;
+
+ error = 0;
+ }
+
+cleanup:
+ git_buf_dispose(&real_name);
+ git_buf_dispose(&real_email);
+ git_buf_dispose(&replace_name);
+ git_buf_dispose(&replace_email);
+ return error;
+}
+
+int git_mailmap_from_buffer(git_mailmap **out, const char *data, size_t len)
+{
+ int error = git_mailmap_new(out);
+ if (error < 0)
+ return error;
+
+ error = mailmap_add_buffer(*out, data, len);
+ if (error < 0) {
+ git_mailmap_free(*out);
+ *out = NULL;
+ }
+ return error;
+}
+
+static int mailmap_add_blob(
+ git_mailmap *mm, git_repository *repo, const char *rev)
+{
+ git_object *object = NULL;
+ git_blob *blob = NULL;
+ git_buf content = GIT_BUF_INIT;
+ int error;
+
+ assert(mm && repo);
+
+ error = git_revparse_single(&object, repo, rev);
+ if (error < 0)
+ goto cleanup;
+
+ error = git_object_peel((git_object **)&blob, object, GIT_OBJECT_BLOB);
+ if (error < 0)
+ goto cleanup;
+
+ error = git_blob__getbuf(&content, blob);
+ if (error < 0)
+ goto cleanup;
+
+ error = mailmap_add_buffer(mm, content.ptr, content.size);
+ if (error < 0)
+ goto cleanup;
+
+cleanup:
+ git_buf_dispose(&content);
+ git_blob_free(blob);
+ git_object_free(object);
+ return error;
+}
+
+static int mailmap_add_file_ondisk(
+ git_mailmap *mm, const char *path, git_repository *repo)
+{
+ const char *base = repo ? git_repository_workdir(repo) : NULL;
+ git_buf fullpath = GIT_BUF_INIT;
+ git_buf content = GIT_BUF_INIT;
+ int error;
+
+ error = git_path_join_unrooted(&fullpath, path, base, NULL);
+ if (error < 0)
+ goto cleanup;
+
+ error = git_futils_readbuffer(&content, fullpath.ptr);
+ if (error < 0)
+ goto cleanup;
+
+ error = mailmap_add_buffer(mm, content.ptr, content.size);
+ if (error < 0)
+ goto cleanup;
+
+cleanup:
+ git_buf_dispose(&fullpath);
+ git_buf_dispose(&content);
+ return error;
+}
+
+/* NOTE: Only expose with an error return, currently never errors */
+static void mailmap_add_from_repository(git_mailmap *mm, git_repository *repo)
+{
+ git_config *config = NULL;
+ git_buf rev_buf = GIT_BUF_INIT;
+ git_buf path_buf = GIT_BUF_INIT;
+ const char *rev = NULL;
+ const char *path = NULL;
+
+ assert(mm && repo);
+
+ /* If we're in a bare repo, default blob to 'HEAD:.mailmap' */
+ if (repo->is_bare)
+ rev = MM_BLOB_DEFAULT;
+
+ /* Try to load 'mailmap.file' and 'mailmap.blob' cfgs from the repo */
+ if (git_repository_config(&config, repo) == 0) {
+ if (git_config_get_string_buf(&rev_buf, config, MM_BLOB_CONFIG) == 0)
+ rev = rev_buf.ptr;
+ if (git_config_get_path(&path_buf, config, MM_FILE_CONFIG) == 0)
+ path = path_buf.ptr;
+ }
+
+ /*
+ * Load mailmap files in order, overriding previous entries with new ones.
+ * 1. The '.mailmap' file in the repository's workdir root,
+ * 2. The blob described by the 'mailmap.blob' config (default HEAD:.mailmap),
+ * 3. The file described by the 'mailmap.file' config.
+ *
+ * We ignore errors from these loads, as these files may not exist, or may
+ * contain invalid information, and we don't want to report that error.
+ *
+ * XXX: Warn?
+ */
+ if (!repo->is_bare)
+ mailmap_add_file_ondisk(mm, MM_FILE, repo);
+ if (rev != NULL)
+ mailmap_add_blob(mm, repo, rev);
+ if (path != NULL)
+ mailmap_add_file_ondisk(mm, path, repo);
+
+ git_buf_dispose(&rev_buf);
+ git_buf_dispose(&path_buf);
+ git_config_free(config);
+}
+
+int git_mailmap_from_repository(git_mailmap **out, git_repository *repo)
+{
+ int error = git_mailmap_new(out);
+ if (error < 0)
+ return error;
+ mailmap_add_from_repository(*out, repo);
+ return 0;
+}
+
+const git_mailmap_entry *git_mailmap_entry_lookup(
+ const git_mailmap *mm, const char *name, const char *email)
+{
+ int error;
+ ssize_t fallback = -1;
+ size_t idx;
+ git_mailmap_entry *entry;
+
+ /* The lookup needle we want to use only sets the replace_email. */
+ git_mailmap_entry needle = { NULL };
+ needle.replace_email = (char *)email;
+
+ assert(email);
+
+ if (!mm)
+ return NULL;
+
+ /*
+ * We want to find the place to start looking. so we do a binary search for
+ * the "fallback" nameless entry. If we find it, we advance past it and record
+ * the index.
+ */
+ error = git_vector_bsearch(&idx, (git_vector *)&mm->entries, &needle);
+ if (error >= 0)
+ fallback = idx++;
+ else if (error != GIT_ENOTFOUND)
+ return NULL;
+
+ /* do a linear search for an exact match */
+ for (; idx < git_vector_length(&mm->entries); ++idx) {
+ entry = git_vector_get(&mm->entries, idx);
+
+ if (git__strcmp(entry->replace_email, email))
+ break; /* it's a different email, so we're done looking */
+
+ assert(entry->replace_name); /* should be specific */
+ if (!name || !git__strcmp(entry->replace_name, name))
+ return entry;
+ }
+
+ if (fallback < 0)
+ return NULL; /* no fallback */
+ return git_vector_get(&mm->entries, fallback);
+}
+
+int git_mailmap_resolve(
+ const char **real_name, const char **real_email,
+ const git_mailmap *mailmap,
+ const char *name, const char *email)
+{
+ const git_mailmap_entry *entry = NULL;
+ assert(name && email);
+
+ *real_name = name;
+ *real_email = email;
+
+ if ((entry = git_mailmap_entry_lookup(mailmap, name, email))) {
+ if (entry->real_name)
+ *real_name = entry->real_name;
+ if (entry->real_email)
+ *real_email = entry->real_email;
+ }
+ return 0;
+}
+
+int git_mailmap_resolve_signature(
+ git_signature **out, const git_mailmap *mailmap, const git_signature *sig)
+{
+ const char *name = NULL;
+ const char *email = NULL;
+ int error;
+
+ if (!sig)
+ return 0;
+
+ error = git_mailmap_resolve(&name, &email, mailmap, sig->name, sig->email);
+ if (error < 0)
+ return error;
+
+ error = git_signature_new(out, name, email, sig->when.time, sig->when.offset);
+ if (error < 0)
+ return error;
+
+ /* Copy over the sign, as git_signature_new doesn't let you pass it. */
+ (*out)->when.sign = sig->when.sign;
+ return 0;
+}
--- /dev/null
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+#ifndef INCLUDE_mailmap_h__
+#define INCLUDE_mailmap_h__
+
+#include "git2/mailmap.h"
+#include "vector.h"
+
+/*
+ * A mailmap is stored as a sorted vector of 'git_mailmap_entry's. These entries
+ * are sorted first by 'replace_email', and then by 'replace_name'. NULL
+ * replace_names are ordered first.
+ *
+ * Looking up a name and email in the mailmap is done with a binary search.
+ */
+struct git_mailmap {
+ git_vector entries;
+};
+
+/* Single entry parsed from a mailmap */
+typedef struct git_mailmap_entry {
+ char *real_name; /**< the real name (may be NULL) */
+ char *real_email; /**< the real email (may be NULL) */
+ char *replace_name; /**< the name to replace (may be NULL) */
+ char *replace_email; /**< the email to replace */
+} git_mailmap_entry;
+
+const git_mailmap_entry *git_mailmap_entry_lookup(
+ const git_mailmap *mm, const char *name, const char *email);
+
+#endif
unsigned int i;
if (length < 2) {
- giterr_set(GITERR_INVALID, "at least two commits are required to find an ancestor");
+ git_error_set(GIT_ERROR_INVALID, "at least two commits are required to find an ancestor");
return -1;
}
goto on_error;
if (!result) {
- giterr_set(GITERR_MERGE, "no merge base found");
+ git_error_set(GIT_ERROR_MERGE, "no merge base found");
error = GIT_ENOTFOUND;
goto on_error;
}
assert(out && repo && input_array);
if (length < 2) {
- giterr_set(GITERR_INVALID, "at least two commits are required to find an ancestor");
+ git_error_set(GIT_ERROR_INVALID, "at least two commits are required to find an ancestor");
return -1;
}
if (!result) {
git_revwalk_free(walk);
- giterr_set(GITERR_MERGE, "no merge base found");
+ git_error_set(GIT_ERROR_MERGE, "no merge base found");
return GIT_ENOTFOUND;
}
int error = 0;
redundant = git__calloc(commits->length, 1);
- GITERR_CHECK_ALLOC(redundant);
+ GIT_ERROR_CHECK_ALLOC(redundant);
filled_index = git__calloc((commits->length - 1), sizeof(unsigned int));
- GITERR_CHECK_ALLOC(filled_index);
+ GIT_ERROR_CHECK_ALLOC(filled_index);
for (i = 0; i < commits->length; ++i) {
if ((error = git_commit_list_parse(walk, commits->contents[i])) < 0)
while ((line = git__strsep(&buffer, "\n")) != NULL) {
if (strlen(line) != GIT_OID_HEXSZ) {
- giterr_set(GITERR_INVALID, "unable to parse OID - invalid length");
+ git_error_set(GIT_ERROR_INVALID, "unable to parse OID - invalid length");
error = -1;
goto cleanup;
}
goto cleanup;
if ((error = cb(&oid, payload)) != 0) {
- giterr_set_after_callback(error);
+ git_error_set_after_callback(error);
goto cleanup;
}
}
if (*buffer) {
- giterr_set(GITERR_MERGE, "no EOL at line %"PRIuZ, line_num);
+ git_error_set(GIT_ERROR_MERGE, "no EOL at line %"PRIuZ, line_num);
error = -1;
goto cleanup;
}
cleanup:
- git_buf_free(&merge_head_path);
- git_buf_free(&merge_head_file);
+ git_buf_dispose(&merge_head_path);
+ git_buf_dispose(&merge_head_file);
return error;
}
if ((error = driver->apply(driver, &path, &mode, &buf, name, src)) < 0 ||
(error = git_repository_odb(&odb, src->repo)) < 0 ||
- (error = git_odb_write(&oid, odb, buf.ptr, buf.size, GIT_OBJ_BLOB)) < 0)
+ (error = git_odb_write(&oid, odb, buf.ptr, buf.size, GIT_OBJECT_BLOB)) < 0)
goto done;
result = git_pool_mallocz(&diff_list->pool, sizeof(git_index_entry));
- GITERR_CHECK_ALLOC(result);
+ GIT_ERROR_CHECK_ALLOC(result);
git_oid_cpy(&result->id, &oid);
result->mode = mode;
result->file_size = buf.size;
result->path = git_pool_strdup(&diff_list->pool, path);
- GITERR_CHECK_ALLOC(result->path);
+ GIT_ERROR_CHECK_ALLOC(result->path);
*out = result;
done:
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_odb_free(odb);
return error;
}
/* Tracks deletes by oid for merge_diff_mark_similarity_exact(). This is a
-* non-shrinking queue where next_pos is the next position to dequeue.
+* non-shrinking queue where next_pos is the next position to dequeue.
*/
typedef struct {
git_array_t(size_t) arr;
}
static int deletes_by_oid_enqueue(git_oidmap *map, git_pool* pool, const git_oid *id, size_t idx) {
- khint_t pos;
+ size_t pos;
deletes_by_oid_queue *queue;
size_t *array_entry;
int error;
pos = git_oidmap_lookup_index(map, id);
if (!git_oidmap_valid_index(map, pos)) {
queue = git_pool_malloc(pool, sizeof(deletes_by_oid_queue));
- GITERR_CHECK_ALLOC(queue);
+ GIT_ERROR_CHECK_ALLOC(queue);
git_array_init(queue->arr);
queue->next_pos = 0;
} else {
queue = git_oidmap_value_at(map, pos);
array_entry = git_array_alloc(queue->arr);
- GITERR_CHECK_ALLOC(array_entry);
+ GIT_ERROR_CHECK_ALLOC(array_entry);
*array_entry = idx;
}
}
static int deletes_by_oid_dequeue(size_t *idx, git_oidmap *map, const git_oid *id) {
- khint_t pos;
+ size_t pos;
deletes_by_oid_queue *queue;
size_t *array_entry;
return GIT_ENOTFOUND;
queue = git_oidmap_value_at(map, pos);
-
+
if (queue->next_pos == 0) {
*idx = queue->first_entry;
} else {
similarity_ours = git__calloc(diff_list->conflicts.length,
sizeof(struct merge_diff_similarity));
- GITERR_CHECK_ALLOC(similarity_ours);
+ GIT_ERROR_CHECK_ALLOC(similarity_ours);
similarity_theirs = git__calloc(diff_list->conflicts.length,
sizeof(struct merge_diff_similarity));
- GITERR_CHECK_ALLOC(similarity_theirs);
+ GIT_ERROR_CHECK_ALLOC(similarity_theirs);
/* Calculate similarity between items that were deleted from the ancestor
* and added in the other branch.
goto done;
if (opts->rename_threshold < 100 && diff_list->conflicts.length <= opts->target_limit) {
- GITERR_CHECK_ALLOC_MULTIPLY(&cache_size, diff_list->conflicts.length, 3);
+ GIT_ERROR_CHECK_ALLOC_MULTIPLY(&cache_size, diff_list->conflicts.length, 3);
cache = git__calloc(cache_size, sizeof(void *));
- GITERR_CHECK_ALLOC(cache);
+ GIT_ERROR_CHECK_ALLOC(cache);
merge_diff_list_count_candidates(diff_list, &src_count, &tgt_count);
git_index_entry *entry;
entry = git_pool_malloc(&diff_list->pool, sizeof(git_index_entry));
- GITERR_CHECK_ALLOC(entry);
+ GIT_ERROR_CHECK_ALLOC(entry);
if ((error = index_entry_dup_pool(entry, &diff_list->pool, tree_items[0])) >= 0)
error = git_vector_insert(&diff_list->staged, entry);
if (given && given->default_driver) {
opts->default_driver = git__strdup(given->default_driver);
- GITERR_CHECK_ALLOC(opts->default_driver);
+ GIT_ERROR_CHECK_ALLOC(opts->default_driver);
} else {
error = git_config_get_entry(&entry, cfg, "merge.default");
if (error == 0) {
opts->default_driver = git__strdup(entry->value);
- GITERR_CHECK_ALLOC(opts->default_driver);
+ GIT_ERROR_CHECK_ALLOC(opts->default_driver);
} else if (error == GIT_ENOTFOUND) {
error = 0;
} else {
/* assign the internal metric with whitespace flag as payload */
if (!opts->metric) {
opts->metric = git__malloc(sizeof(git_diff_similarity_metric));
- GITERR_CHECK_ALLOC(opts->metric);
+ GIT_ERROR_CHECK_ALLOC(opts->metric);
opts->metric->file_signature = git_diff_find_similar__hashsig_for_file;
opts->metric->buffer_signature = git_diff_find_similar__hashsig_for_buf;
*out = NULL;
- GITERR_CHECK_VERSION(
+ GIT_ERROR_CHECK_VERSION(
given_opts, GIT_MERGE_OPTIONS_VERSION, "git_merge_options");
if ((error = merge_normalize_opts(repo, &opts, given_opts)) < 0)
}
diff_list = git_merge_diff_list__alloc(repo);
- GITERR_CHECK_ALLOC(diff_list);
+ GIT_ERROR_CHECK_ALLOC(diff_list);
ancestor_iter = iterator_given_or_empty(&empty_ancestor, ancestor_iter);
our_iter = iterator_given_or_empty(&empty_ours, our_iter);
if (!resolved) {
if ((opts.flags & GIT_MERGE_FAIL_ON_CONFLICT)) {
- giterr_set(GITERR_MERGE, "merge conflicts exist");
+ git_error_set(GIT_ERROR_MERGE, "merge conflicts exist");
error = GIT_EMERGECONFLICT;
goto done;
}
if (annotated_commit->type == GIT_ANNOTATED_COMMIT_REAL) {
id = git_array_alloc(*ids);
- GITERR_CHECK_ALLOC(id);
+ GIT_ERROR_CHECK_ALLOC(id);
git_oid_cpy(id, git_commit_id(annotated_commit->commit));
} else {
for (i = 0; i < annotated_commit->parents.size; i++) {
id = git_array_alloc(*ids);
- GITERR_CHECK_ALLOC(id);
+ GIT_ERROR_CHECK_ALLOC(id);
git_oid_cpy(id, &annotated_commit->parents.ptr[i]);
}
return -1;
result = git__calloc(1, sizeof(git_annotated_commit));
- GITERR_CHECK_ALLOC(result);
+ GIT_ERROR_CHECK_ALLOC(result);
result->type = GIT_ANNOTATED_COMMIT_VIRTUAL;
result->index = index;
if (error != GIT_ENOTFOUND)
goto done;
- giterr_clear();
+ git_error_clear();
}
if ((error = iterator_for_annotated_commit(&base_iter, base)) < 0 ||
if (error < 0)
git_filebuf_cleanup(&file);
- git_buf_free(&file_path);
+ git_buf_dispose(&file_path);
return error;
}
if (error < 0)
git_filebuf_cleanup(&file);
- git_buf_free(&file_path);
+ git_buf_dispose(&file_path);
return error;
}
assert(repo && heads);
entries = git__calloc(heads_len, sizeof(struct merge_msg_entry));
- GITERR_CHECK_ALLOC(entries);
+ GIT_ERROR_CHECK_ALLOC(entries);
if (git_vector_init(&matching, heads_len, NULL) < 0) {
git__free(entries);
if (error < 0)
git_filebuf_cleanup(&file);
- git_buf_free(&file_path);
+ git_buf_dispose(&file_path);
git_vector_free(&matching);
git__free(entries);
assert(repo && our_head && their_heads);
- GITERR_CHECK_ALLOC_ADD(&alloc_len, their_heads_len, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, their_heads_len, 1);
oids = git__calloc(alloc_len, sizeof(git_oid));
- GITERR_CHECK_ALLOC(oids);
+ GIT_ERROR_CHECK_ALLOC(oids);
git_oid_cpy(&oids[0], git_commit_id(our_head->commit));
goto done;
if ((conflicts = index_conflicts + wd_conflicts) > 0) {
- giterr_set(GITERR_MERGE, "%" PRIuZ " uncommitted change%s would be overwritten by merge",
+ git_error_set(GIT_ERROR_MERGE, "%" PRIuZ " uncommitted change%s would be overwritten by merge",
conflicts, (conflicts != 1) ? "s" : "");
error = GIT_ECONFLICT;
}
if (error < 0)
git_filebuf_cleanup(&file);
- git_buf_free(&file_path);
+ git_buf_dispose(&file_path);
return error;
}
git_annotated_commit **ancestor_head_out,
git_annotated_commit **our_head_out,
git_repository *repo,
+ git_reference *our_ref,
const git_annotated_commit **their_heads,
size_t their_heads_len)
{
git_annotated_commit *ancestor_head = NULL, *our_head = NULL;
- git_reference *our_ref = NULL;
int error = 0;
*ancestor_head_out = NULL;
if ((error = git_repository__ensure_not_bare(repo, "merge")) < 0)
goto done;
- if ((error = git_reference_lookup(&our_ref, repo, GIT_HEAD_FILE)) < 0 ||
- (error = git_annotated_commit_from_ref(&our_head, repo, our_ref)) < 0)
+ if ((error = git_annotated_commit_from_ref(&our_head, repo, our_ref)) < 0)
goto done;
if ((error = merge_ancestor_head(&ancestor_head, repo, our_head, their_heads, their_heads_len)) < 0) {
if (error != GIT_ENOTFOUND)
goto done;
- giterr_clear();
+ git_error_clear();
error = 0;
}
git_annotated_commit_free(our_head);
}
- git_reference_free(our_ref);
-
return error;
}
if ((error = git_config_get_string(&value, config, "merge.ff")) < 0) {
if (error == GIT_ENOTFOUND) {
- giterr_clear();
+ git_error_clear();
error = 0;
}
return error;
}
-int git_merge_analysis(
+int git_merge_analysis_for_ref(
git_merge_analysis_t *analysis_out,
git_merge_preference_t *preference_out,
git_repository *repo,
+ git_reference *our_ref,
const git_annotated_commit **their_heads,
size_t their_heads_len)
{
git_annotated_commit *ancestor_head = NULL, *our_head = NULL;
int error = 0;
+ bool unborn;
- assert(analysis_out && preference_out && repo && their_heads);
+ assert(analysis_out && preference_out && repo && their_heads && their_heads_len > 0);
if (their_heads_len != 1) {
- giterr_set(GITERR_MERGE, "can only merge a single branch");
+ git_error_set(GIT_ERROR_MERGE, "can only merge a single branch");
error = -1;
goto done;
}
if ((error = merge_preference(preference_out, repo)) < 0)
goto done;
- if (git_repository_head_unborn(repo)) {
+ if ((error = git_reference__is_unborn_head(&unborn, our_ref, repo)) < 0)
+ goto done;
+
+ if (unborn) {
*analysis_out |= GIT_MERGE_ANALYSIS_FASTFORWARD | GIT_MERGE_ANALYSIS_UNBORN;
+ error = 0;
goto done;
}
- if ((error = merge_heads(&ancestor_head, &our_head, repo, their_heads, their_heads_len)) < 0)
+ if ((error = merge_heads(&ancestor_head, &our_head, repo, our_ref, their_heads, their_heads_len)) < 0)
goto done;
/* We're up-to-date if we're trying to merge our own common ancestor. */
return error;
}
+int git_merge_analysis(
+ git_merge_analysis_t *analysis_out,
+ git_merge_preference_t *preference_out,
+ git_repository *repo,
+ const git_annotated_commit **their_heads,
+ size_t their_heads_len)
+{
+ git_reference *head_ref = NULL;
+ int error = 0;
+
+ if ((error = git_reference_lookup(&head_ref, repo, GIT_HEAD_FILE)) < 0) {
+ git_error_set(GIT_ERROR_MERGE, "failed to lookup HEAD reference");
+ return error;
+ }
+
+ error = git_merge_analysis_for_ref(analysis_out, preference_out, repo, head_ref, their_heads, their_heads_len);
+
+ git_reference_free(head_ref);
+
+ return error;
+}
+
int git_merge(
git_repository *repo,
const git_annotated_commit **their_heads,
git_reference *our_ref = NULL;
git_checkout_options checkout_opts;
git_annotated_commit *our_head = NULL, *base = NULL;
- git_index *index = NULL;
+ git_index *repo_index = NULL, *index = NULL;
git_indexwriter indexwriter = GIT_INDEXWRITER_INIT;
unsigned int checkout_strategy;
int error = 0;
- assert(repo && their_heads);
+ assert(repo && their_heads && their_heads_len > 0);
if (their_heads_len != 1) {
- giterr_set(GITERR_MERGE, "can only merge a single branch");
+ git_error_set(GIT_ERROR_MERGE, "can only merge a single branch");
return -1;
}
&checkout_strategy)) < 0)
goto done;
+ if ((error = git_repository_index(&repo_index, repo) < 0) ||
+ (error = git_index_read(repo_index, 0) < 0))
+ goto done;
+
/* Write the merge setup files to the repository. */
if ((error = git_annotated_commit_from_head(&our_head, repo)) < 0 ||
(error = git_merge__setup(repo, our_head, their_heads,
git_annotated_commit_free(our_head);
git_annotated_commit_free(base);
git_reference_free(our_ref);
+ git_index_free(repo_index);
return error;
}
git_merge_driver_entry *entry;
entry = git__calloc(1, sizeof(git_merge_driver_entry) + strlen(name) + 1);
- GITERR_CHECK_ALLOC(entry);
+ GIT_ERROR_CHECK_ALLOC(entry);
strcpy(entry->name, name);
entry->driver = driver;
assert(name && driver);
if (git_rwlock_wrlock(&merge_driver_registry.lock) < 0) {
- giterr_set(GITERR_OS, "failed to lock merge driver registry");
+ git_error_set(GIT_ERROR_OS, "failed to lock merge driver registry");
return -1;
}
if (!merge_driver_registry_find(NULL, name)) {
- giterr_set(GITERR_MERGE, "attempt to reregister existing driver '%s'",
+ git_error_set(GIT_ERROR_MERGE, "attempt to reregister existing driver '%s'",
name);
error = GIT_EEXISTS;
goto done;
int error = 0;
if (git_rwlock_wrlock(&merge_driver_registry.lock) < 0) {
- giterr_set(GITERR_OS, "failed to lock merge driver registry");
+ git_error_set(GIT_ERROR_OS, "failed to lock merge driver registry");
return -1;
}
if ((entry = merge_driver_registry_lookup(&pos, name)) == NULL) {
- giterr_set(GITERR_MERGE, "cannot find merge driver '%s' to unregister",
+ git_error_set(GIT_ERROR_MERGE, "cannot find merge driver '%s' to unregister",
name);
error = GIT_ENOTFOUND;
goto done;
return &git_merge_driver__binary;
if (git_rwlock_rdlock(&merge_driver_registry.lock) < 0) {
- giterr_set(GITERR_OS, "failed to lock merge driver registry");
+ git_error_set(GIT_ERROR_OS, "failed to lock merge driver registry");
return NULL;
}
git_rwlock_rdunlock(&merge_driver_registry.lock);
if (entry == NULL) {
- giterr_set(GITERR_MERGE, "cannot use an unregistered filter");
+ git_error_set(GIT_ERROR_MERGE, "cannot use an unregistered filter");
return NULL;
}
if ((xdl_result = xdl_merge(&ancestor_mmfile, &our_mmfile,
&their_mmfile, &xmparam, &mmbuffer)) < 0) {
- giterr_set(GITERR_MERGE, "failed to merge files");
+ git_error_set(GIT_ERROR_MERGE, "failed to merge files");
error = -1;
goto done;
}
{
int error;
char *packname;
- git_strmap_iter pos;
+ size_t pos;
struct git_pack_file *pack;
if ((error = git_packfile__name(&packname, path)) < 0)
return error;
if (git_mutex_lock(&git__mwindow_mutex) < 0) {
- giterr_set(GITERR_OS, "failed to lock mwindow mutex");
+ git_error_set(GIT_ERROR_OS, "failed to lock mwindow mutex");
return -1;
}
void git_mwindow_put_pack(struct git_pack_file *pack)
{
int count;
- git_strmap_iter pos;
+ size_t pos;
if (git_mutex_lock(&git__mwindow_mutex) < 0)
return;
void git_mwindow_free_all(git_mwindow_file *mwf)
{
if (git_mutex_lock(&git__mwindow_mutex)) {
- giterr_set(GITERR_THREAD, "unable to lock mwindow mutex");
+ git_error_set(GIT_ERROR_THREAD, "unable to lock mwindow mutex");
return;
}
}
if (!lru_w) {
- giterr_set(GITERR_OS, "failed to close memory window; couldn't find LRU");
+ git_error_set(GIT_ERROR_OS, "failed to close memory window; couldn't find LRU");
return -1;
}
git_mwindow *w = *cursor;
if (git_mutex_lock(&git__mwindow_mutex)) {
- giterr_set(GITERR_THREAD, "unable to lock mwindow mutex");
+ git_error_set(GIT_ERROR_THREAD, "unable to lock mwindow mutex");
return NULL;
}
int ret;
if (git_mutex_lock(&git__mwindow_mutex)) {
- giterr_set(GITERR_THREAD, "unable to lock mwindow mutex");
+ git_error_set(GIT_ERROR_THREAD, "unable to lock mwindow mutex");
return -1;
}
git_mwindow *w = *window;
if (w) {
if (git_mutex_lock(&git__mwindow_mutex)) {
- giterr_set(GITERR_THREAD, "unable to lock mwindow mutex");
+ git_error_set(GIT_ERROR_THREAD, "unable to lock mwindow mutex");
return;
}
return -1;
}
+static const char *default_port_http = "80";
+static const char *default_port_https = "443";
+
+const char *gitno__default_port(
+ gitno_connection_data *data)
+{
+ return data->use_ssl ? default_port_https : default_port_http;
+}
+
static const char *prefix_http = "http://";
static const char *prefix_https = "https://";
if (!git__prefixcmp(url, prefix_http)) {
path_search_start = url + strlen(prefix_http);
- default_port = "80";
+ default_port = default_port_http;
if (data->use_ssl) {
- giterr_set(GITERR_NET, "redirect from HTTPS to HTTP is not allowed");
+ git_error_set(GIT_ERROR_NET, "redirect from HTTPS to HTTP is not allowed");
goto cleanup;
}
} else if (!git__prefixcmp(url, prefix_https)) {
path_search_start = url + strlen(prefix_https);
- default_port = "443";
+ default_port = default_port_https;
data->use_ssl = true;
} else if (url[0] == '/')
- default_port = data->use_ssl ? "443" : "80";
+ default_port = gitno__default_port(data);
if (!default_port) {
- giterr_set(GITERR_NET, "unrecognized URL prefix");
+ git_error_set(GIT_ERROR_NET, "unrecognized URL prefix");
goto cleanup;
}
/* Check for errors in the resulting data */
if (original_host && url[0] != '/' && strcmp(original_host, data->host)) {
- giterr_set(GITERR_NET, "cross host redirect not allowed");
+ git_error_set(GIT_ERROR_NET, "cross host redirect not allowed");
error = -1;
}
}
int error = 0;
if (http_parser_parse_url(url, strlen(url), false, &u)) {
- giterr_set(GITERR_NET, "malformed URL '%s'", url);
+ git_error_set(GIT_ERROR_NET, "malformed URL '%s'", url);
error = GIT_EINVALIDSPEC;
goto done;
}
size_t url_path_len = u.field_data[UF_PATH].len;
git_buf_decode_percent(&path, url_path, url_path_len);
} else if (path_out) {
- giterr_set(GITERR_NET, "invalid url, missing path");
+ git_error_set(GIT_ERROR_NET, "invalid url, missing path");
error = GIT_EINVALIDSPEC;
goto done;
}
*password_out = git_buf_detach(&password);
done:
- git_buf_free(&host);
- git_buf_free(&port);
- git_buf_free(&path);
- git_buf_free(&username);
- git_buf_free(&password);
+ git_buf_dispose(&host);
+ git_buf_dispose(&port);
+ git_buf_dispose(&path);
+ git_buf_dispose(&username);
+ git_buf_dispose(&password);
return error;
}
const char *url,
const char *default_port);
+const char *gitno__default_port(gitno_connection_data *data);
+
#endif
#include "config.h"
#include "iterator.h"
#include "signature.h"
+#include "blob.h"
static int note_error_notfound(void)
{
- giterr_set(GITERR_INVALID, "note could not be found");
+ git_error_set(GIT_ERROR_INVALID, "note could not be found");
return GIT_ENOTFOUND;
}
GIT_UNUSED(note_oid);
GIT_UNUSED(fanout);
- giterr_set(GITERR_REPOSITORY, "object '%s' has no note", annotated_object_sha);
+ git_error_set(GIT_ERROR_REPOSITORY, "object '%s' has no note", annotated_object_sha);
return current_error;
}
GIT_UNUSED(note_oid);
GIT_UNUSED(fanout);
- giterr_set(GITERR_REPOSITORY, "note for '%s' exists already", annotated_object_sha);
+ git_error_set(GIT_ERROR_REPOSITORY, "note for '%s' exists already", annotated_object_sha);
return current_error;
}
git_oid oid;
git_tree *tree = NULL;
- // TODO: should we apply filters?
+ /* TODO: should we apply filters? */
/* create note object */
if ((error = git_blob_create_frombuffer(&oid, repo, note, strlen(note))) < 0)
goto cleanup;
git_blob *blob)
{
git_note *note = NULL;
+ git_off_t blobsize;
note = git__malloc(sizeof(git_note));
- GITERR_CHECK_ALLOC(note);
+ GIT_ERROR_CHECK_ALLOC(note);
git_oid_cpy(¬e->id, note_oid);
git_signature_dup(¬e->committer, git_commit_committer(commit)) < 0)
return -1;
- note->message = git__strndup(git_blob_rawcontent(blob), git_blob_rawsize(blob));
- GITERR_CHECK_ALLOC(note->message);
+ blobsize = git_blob_rawsize(blob);
+ GIT_ERROR_CHECK_BLOBSIZE(blobsize);
+
+ note->message = git__strndup(git_blob_rawcontent(blob), (size_t)blobsize);
+ GIT_ERROR_CHECK_ALLOC(note->message);
*out = note;
return 0;
{
if (notes_ref) {
*out = git__strdup(notes_ref);
- GITERR_CHECK_ALLOC(*out);
+ GIT_ERROR_CHECK_ALLOC(*out);
return 0;
}
error = git_oid_fromstr(annotated_object_id, buf.ptr);
cleanup:
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return error;
}
while (!(error = git_note_next(¬e_id, &annotated_id, iter))) {
if ((error = note_cb(¬e_id, &annotated_id, payload)) != 0) {
- giterr_set_after_callback(error);
+ git_error_set_after_callback(error);
break;
}
}
#include "repository.h"
#include "commit.h"
+#include "hash.h"
#include "tree.h"
#include "blob.h"
#include "oid.h"
bool git_object__strict_input_validation = true;
+extern int git_odb_hash(git_oid *out, const void *data, size_t len, git_object_t type);
+
typedef struct {
const char *str; /* type name string */
size_t size; /* size in bytes of the object structure */
int (*parse)(void *self, git_odb_object *obj);
+ int (*parse_raw)(void *self, const char *data, size_t size);
void (*free)(void *self);
} git_object_def;
static git_object_def git_objects_table[] = {
- /* 0 = GIT_OBJ__EXT1 */
- { "", 0, NULL, NULL },
+ /* 0 = GIT_OBJECT__EXT1 */
+ { "", 0, NULL, NULL, NULL },
- /* 1 = GIT_OBJ_COMMIT */
- { "commit", sizeof(git_commit), git_commit__parse, git_commit__free },
+ /* 1 = GIT_OBJECT_COMMIT */
+ { "commit", sizeof(git_commit), git_commit__parse, git_commit__parse_raw, git_commit__free },
- /* 2 = GIT_OBJ_TREE */
- { "tree", sizeof(git_tree), git_tree__parse, git_tree__free },
+ /* 2 = GIT_OBJECT_TREE */
+ { "tree", sizeof(git_tree), git_tree__parse, git_tree__parse_raw, git_tree__free },
- /* 3 = GIT_OBJ_BLOB */
- { "blob", sizeof(git_blob), git_blob__parse, git_blob__free },
+ /* 3 = GIT_OBJECT_BLOB */
+ { "blob", sizeof(git_blob), git_blob__parse, git_blob__parse_raw, git_blob__free },
- /* 4 = GIT_OBJ_TAG */
- { "tag", sizeof(git_tag), git_tag__parse, git_tag__free },
+ /* 4 = GIT_OBJECT_TAG */
+ { "tag", sizeof(git_tag), git_tag__parse, git_tag__parse_raw, git_tag__free },
- /* 5 = GIT_OBJ__EXT2 */
- { "", 0, NULL, NULL },
- /* 6 = GIT_OBJ_OFS_DELTA */
- { "OFS_DELTA", 0, NULL, NULL },
- /* 7 = GIT_OBJ_REF_DELTA */
- { "REF_DELTA", 0, NULL, NULL },
+ /* 5 = GIT_OBJECT__EXT2 */
+ { "", 0, NULL, NULL, NULL },
+ /* 6 = GIT_OBJECT_OFS_DELTA */
+ { "OFS_DELTA", 0, NULL, NULL, NULL },
+ /* 7 = GIT_OBJECT_REF_DELTA */
+ { "REF_DELTA", 0, NULL, NULL, NULL },
};
+int git_object__from_raw(
+ git_object **object_out,
+ const char *data,
+ size_t size,
+ git_object_t type)
+{
+ git_object_def *def;
+ git_object *object;
+ size_t object_size;
+ int error;
+
+ assert(object_out);
+ *object_out = NULL;
+
+ /* Validate type match */
+ if (type != GIT_OBJECT_BLOB && type != GIT_OBJECT_TREE && type != GIT_OBJECT_COMMIT && type != GIT_OBJECT_TAG) {
+ git_error_set(GIT_ERROR_INVALID, "the requested type is invalid");
+ return GIT_ENOTFOUND;
+ }
+
+ if ((object_size = git_object__size(type)) == 0) {
+ git_error_set(GIT_ERROR_INVALID, "the requested type is invalid");
+ return GIT_ENOTFOUND;
+ }
+
+ /* Allocate and initialize base object */
+ object = git__calloc(1, object_size);
+ GIT_ERROR_CHECK_ALLOC(object);
+ object->cached.flags = GIT_CACHE_STORE_PARSED;
+ object->cached.type = type;
+ git_odb_hash(&object->cached.oid, data, size, type);
+
+ /* Parse raw object data */
+ def = &git_objects_table[type];
+ assert(def->free && def->parse_raw);
+
+ if ((error = def->parse_raw(object, data, size)) < 0) {
+ def->free(object);
+ return error;
+ }
+
+ git_cached_obj_incref(object);
+ *object_out = object;
+
+ return 0;
+}
+
int git_object__from_odb_object(
git_object **object_out,
git_repository *repo,
git_odb_object *odb_obj,
- git_otype type)
+ git_object_t type)
{
int error;
size_t object_size;
*object_out = NULL;
/* Validate type match */
- if (type != GIT_OBJ_ANY && type != odb_obj->cached.type) {
- giterr_set(GITERR_INVALID,
+ if (type != GIT_OBJECT_ANY && type != odb_obj->cached.type) {
+ git_error_set(GIT_ERROR_INVALID,
"the requested type does not match the type in the ODB");
return GIT_ENOTFOUND;
}
if ((object_size = git_object__size(odb_obj->cached.type)) == 0) {
- giterr_set(GITERR_INVALID, "the requested type is invalid");
+ git_error_set(GIT_ERROR_INVALID, "the requested type is invalid");
return GIT_ENOTFOUND;
}
/* Allocate and initialize base object */
object = git__calloc(1, object_size);
- GITERR_CHECK_ALLOC(object);
+ GIT_ERROR_CHECK_ALLOC(object);
git_oid_cpy(&object->cached.oid, &odb_obj->cached.oid);
object->cached.type = odb_obj->cached.type;
void git_object__free(void *obj)
{
- git_otype type = ((git_object *)obj)->cached.type;
+ git_object_t type = ((git_object *)obj)->cached.type;
if (type < 0 || ((size_t)type) >= ARRAY_SIZE(git_objects_table) ||
!git_objects_table[type].free)
git_repository *repo,
const git_oid *id,
size_t len,
- git_otype type)
+ git_object_t type)
{
git_object *object = NULL;
git_odb *odb = NULL;
assert(repo && object_out && id);
if (len < GIT_OID_MINPREFIXLEN) {
- giterr_set(GITERR_OBJECT, "ambiguous lookup - OID prefix is too short");
+ git_error_set(GIT_ERROR_OBJECT, "ambiguous lookup - OID prefix is too short");
return GIT_EAMBIGUOUS;
}
if (cached->flags == GIT_CACHE_STORE_PARSED) {
object = (git_object *)cached;
- if (type != GIT_OBJ_ANY && type != object->cached.type) {
+ if (type != GIT_OBJECT_ANY && type != object->cached.type) {
git_object_free(object);
- giterr_set(GITERR_INVALID,
+ git_error_set(GIT_ERROR_INVALID,
"the requested type does not match the type in ODB");
return GIT_ENOTFOUND;
}
return error;
}
-int git_object_lookup(git_object **object_out, git_repository *repo, const git_oid *id, git_otype type) {
+int git_object_lookup(git_object **object_out, git_repository *repo, const git_oid *id, git_object_t type) {
return git_object_lookup_prefix(object_out, repo, id, GIT_OID_HEXSZ, type);
}
return &obj->cached.oid;
}
-git_otype git_object_type(const git_object *obj)
+git_object_t git_object_type(const git_object *obj)
{
assert(obj);
return obj->cached.type;
return obj->repo;
}
-const char *git_object_type2string(git_otype type)
+const char *git_object_type2string(git_object_t type)
{
if (type < 0 || ((size_t) type) >= ARRAY_SIZE(git_objects_table))
return "";
return git_objects_table[type].str;
}
-git_otype git_object_string2type(const char *str)
+git_object_t git_object_string2type(const char *str)
{
if (!str)
- return GIT_OBJ_BAD;
+ return GIT_OBJECT_INVALID;
return git_object_stringn2type(str, strlen(str));
}
-git_otype git_object_stringn2type(const char *str, size_t len)
+git_object_t git_object_stringn2type(const char *str, size_t len)
{
size_t i;
if (!str || !len || !*str)
- return GIT_OBJ_BAD;
+ return GIT_OBJECT_INVALID;
for (i = 0; i < ARRAY_SIZE(git_objects_table); i++)
if (*git_objects_table[i].str &&
!git__prefixncmp(str, len, git_objects_table[i].str))
- return (git_otype)i;
+ return (git_object_t)i;
- return GIT_OBJ_BAD;
+ return GIT_OBJECT_INVALID;
}
-int git_object_typeisloose(git_otype type)
+int git_object_typeisloose(git_object_t type)
{
if (type < 0 || ((size_t) type) >= ARRAY_SIZE(git_objects_table))
return 0;
return (git_objects_table[type].size > 0) ? 1 : 0;
}
-size_t git_object__size(git_otype type)
+size_t git_object__size(git_object_t type)
{
if (type < 0 || ((size_t) type) >= ARRAY_SIZE(git_objects_table))
return 0;
static int dereference_object(git_object **dereferenced, git_object *obj)
{
- git_otype type = git_object_type(obj);
+ git_object_t type = git_object_type(obj);
switch (type) {
- case GIT_OBJ_COMMIT:
+ case GIT_OBJECT_COMMIT:
return git_commit_tree((git_tree **)dereferenced, (git_commit*)obj);
- case GIT_OBJ_TAG:
+ case GIT_OBJECT_TAG:
return git_tag_target(dereferenced, (git_tag*)obj);
- case GIT_OBJ_BLOB:
- case GIT_OBJ_TREE:
+ case GIT_OBJECT_BLOB:
+ case GIT_OBJECT_TREE:
return GIT_EPEEL;
default:
}
}
-static int peel_error(int error, const git_oid *oid, git_otype type)
+static int peel_error(int error, const git_oid *oid, git_object_t type)
{
const char *type_name;
char hex_oid[GIT_OID_HEXSZ + 1];
git_oid_fmt(hex_oid, oid);
hex_oid[GIT_OID_HEXSZ] = '\0';
- giterr_set(GITERR_OBJECT, "the git_object of id '%s' can not be "
- "successfully peeled into a %s (git_otype=%i).", hex_oid, type_name, type);
+ git_error_set(GIT_ERROR_OBJECT, "the git_object of id '%s' can not be "
+ "successfully peeled into a %s (git_object_t=%i).", hex_oid, type_name, type);
return error;
}
-static int check_type_combination(git_otype type, git_otype target)
+static int check_type_combination(git_object_t type, git_object_t target)
{
if (type == target)
return 0;
switch (type) {
- case GIT_OBJ_BLOB:
- case GIT_OBJ_TREE:
+ case GIT_OBJECT_BLOB:
+ case GIT_OBJECT_TREE:
/* a blob or tree can never be peeled to anything but themselves */
return GIT_EINVALIDSPEC;
break;
- case GIT_OBJ_COMMIT:
+ case GIT_OBJECT_COMMIT:
/* a commit can only be peeled to a tree */
- if (target != GIT_OBJ_TREE && target != GIT_OBJ_ANY)
+ if (target != GIT_OBJECT_TREE && target != GIT_OBJECT_ANY)
return GIT_EINVALIDSPEC;
break;
- case GIT_OBJ_TAG:
+ case GIT_OBJECT_TAG:
/* a tag may point to anything, so we let anything through */
break;
default:
int git_object_peel(
git_object **peeled,
const git_object *object,
- git_otype target_type)
+ git_object_t target_type)
{
git_object *source, *deref = NULL;
int error;
assert(object && peeled);
- assert(target_type == GIT_OBJ_TAG ||
- target_type == GIT_OBJ_COMMIT ||
- target_type == GIT_OBJ_TREE ||
- target_type == GIT_OBJ_BLOB ||
- target_type == GIT_OBJ_ANY);
+ assert(target_type == GIT_OBJECT_TAG ||
+ target_type == GIT_OBJECT_COMMIT ||
+ target_type == GIT_OBJECT_TREE ||
+ target_type == GIT_OBJECT_BLOB ||
+ target_type == GIT_OBJECT_ANY);
if ((error = check_type_combination(git_object_type(object), target_type)) < 0)
return peel_error(error, git_object_id(object), target_type);
return 0;
}
- if (target_type == GIT_OBJ_ANY &&
+ if (target_type == GIT_OBJECT_ANY &&
git_object_type(deref) != git_object_type(object))
{
*peeled = deref;
git_object **out,
const git_object *treeish,
const char *path,
- git_otype type)
+ git_object_t type)
{
int error = -1;
git_tree *tree = NULL;
assert(out && treeish && path);
- if ((error = git_object_peel((git_object**)&tree, treeish, GIT_OBJ_TREE)) < 0 ||
+ if ((error = git_object_peel((git_object**)&tree, treeish, GIT_OBJECT_TREE)) < 0 ||
(error = git_tree_entry_bypath(&entry, tree, path)) < 0)
{
goto cleanup;
}
- if (type != GIT_OBJ_ANY && git_tree_entry_type(entry) != type)
+ if (type != GIT_OBJECT_ANY && git_tree_entry_type(entry) != type)
{
- giterr_set(GITERR_OBJECT,
+ git_error_set(GIT_ERROR_OBJECT,
"object at path '%s' is not of the asked-for type %d",
path, type);
error = GIT_EINVALIDSPEC;
if (error != GIT_EAMBIGUOUS)
break;
- giterr_clear();
+ git_error_clear();
len++;
}
}
bool git_object__is_valid(
- git_repository *repo, const git_oid *id, git_otype expected_type)
+ git_repository *repo, const git_oid *id, git_object_t expected_type)
{
git_odb *odb;
- git_otype actual_type;
+ git_object_t actual_type;
size_t len;
int error;
(error = git_odb_read_header(&len, &actual_type, odb, id)) < 0)
return false;
- if (expected_type != GIT_OBJ_ANY && expected_type != actual_type) {
- giterr_set(GITERR_INVALID,
+ if (expected_type != GIT_OBJECT_ANY && expected_type != actual_type) {
+ git_error_set(GIT_ERROR_INVALID,
"the requested type does not match the type in the ODB");
return false;
}
/* fully free the object; internal method, DO NOT EXPORT */
void git_object__free(void *object);
+/*
+ * Parse object from raw data. Note that the resulting object is
+ * tied to the lifetime of the data, as some objects simply point
+ * into it.
+ */
+int git_object__from_raw(
+ git_object **object_out,
+ const char *data,
+ size_t size,
+ git_object_t type);
+
int git_object__from_odb_object(
git_object **object_out,
git_repository *repo,
git_odb_object *odb_obj,
- git_otype type);
+ git_object_t type);
-int git_object__resolve_to_type(git_object **obj, git_otype type);
+int git_object__resolve_to_type(git_object **obj, git_object_t type);
-git_otype git_object_stringn2type(const char *str, size_t len);
+git_object_t git_object_stringn2type(const char *str, size_t len);
int git_oid__parse(git_oid *oid, const char **buffer_out, const char *buffer_end, const char *header);
void git_oid__writebuf(git_buf *buf, const char *header, const git_oid *oid);
bool git_object__is_valid(
- git_repository *repo, const git_oid *id, git_otype expected_type);
+ git_repository *repo, const git_oid *id, git_object_t expected_type);
-GIT_INLINE(git_otype) git_object__type_from_filemode(git_filemode_t mode)
+GIT_INLINE(git_object_t) git_object__type_from_filemode(git_filemode_t mode)
{
switch (mode) {
case GIT_FILEMODE_TREE:
- return GIT_OBJ_TREE;
+ return GIT_OBJECT_TREE;
case GIT_FILEMODE_COMMIT:
- return GIT_OBJ_COMMIT;
+ return GIT_OBJECT_COMMIT;
case GIT_FILEMODE_BLOB:
case GIT_FILEMODE_BLOB_EXECUTABLE:
case GIT_FILEMODE_LINK:
- return GIT_OBJ_BLOB;
+ return GIT_OBJECT_BLOB;
default:
- return GIT_OBJ_BAD;
+ return GIT_OBJECT_INVALID;
}
}
*/
int git_commit_lookup(git_commit **out, git_repository *repo, const git_oid *id)
{
- return git_object_lookup((git_object **)out, repo, id, GIT_OBJ_COMMIT);
+ return git_object_lookup((git_object **)out, repo, id, GIT_OBJECT_COMMIT);
}
int git_commit_lookup_prefix(git_commit **out, git_repository *repo, const git_oid *id, size_t len)
{
- return git_object_lookup_prefix((git_object **)out, repo, id, len, GIT_OBJ_COMMIT);
+ return git_object_lookup_prefix((git_object **)out, repo, id, len, GIT_OBJECT_COMMIT);
}
void git_commit_free(git_commit *obj)
*/
int git_tree_lookup(git_tree **out, git_repository *repo, const git_oid *id)
{
- return git_object_lookup((git_object **)out, repo, id, GIT_OBJ_TREE);
+ return git_object_lookup((git_object **)out, repo, id, GIT_OBJECT_TREE);
}
int git_tree_lookup_prefix(git_tree **out, git_repository *repo, const git_oid *id, size_t len)
{
- return git_object_lookup_prefix((git_object **)out, repo, id, len, GIT_OBJ_TREE);
+ return git_object_lookup_prefix((git_object **)out, repo, id, len, GIT_OBJECT_TREE);
}
void git_tree_free(git_tree *obj)
*/
int git_tag_lookup(git_tag **out, git_repository *repo, const git_oid *id)
{
- return git_object_lookup((git_object **)out, repo, id, GIT_OBJ_TAG);
+ return git_object_lookup((git_object **)out, repo, id, GIT_OBJECT_TAG);
}
int git_tag_lookup_prefix(git_tag **out, git_repository *repo, const git_oid *id, size_t len)
{
- return git_object_lookup_prefix((git_object **)out, repo, id, len, GIT_OBJ_TAG);
+ return git_object_lookup_prefix((git_object **)out, repo, id, len, GIT_OBJECT_TAG);
}
void git_tag_free(git_tag *obj)
*/
int git_blob_lookup(git_blob **out, git_repository *repo, const git_oid *id)
{
- return git_object_lookup((git_object **)out, repo, id, GIT_OBJ_BLOB);
+ return git_object_lookup((git_object **)out, repo, id, GIT_OBJECT_BLOB);
}
int git_blob_lookup_prefix(git_blob **out, git_repository *repo, const git_oid *id, size_t len)
{
- return git_object_lookup_prefix((git_object **)out, repo, id, len, GIT_OBJ_BLOB);
+ return git_object_lookup_prefix((git_object **)out, repo, id, len, GIT_OBJECT_BLOB);
}
void git_blob_free(git_blob *obj)
#include "delta.h"
#include "filter.h"
#include "repository.h"
+#include "blob.h"
#include "git2/odb_backend.h"
#include "git2/oid.h"
return &odb->own_cache;
}
-static int odb_otype_fast(git_otype *type_p, git_odb *db, const git_oid *id);
+static int odb_otype_fast(git_object_t *type_p, git_odb *db, const git_oid *id);
static int load_alternates(git_odb *odb, const char *objects_dir, int alternate_depth);
static int error_null_oid(int error, const char *message);
-static git_otype odb_hardcoded_type(const git_oid *id)
+static git_object_t odb_hardcoded_type(const git_oid *id)
{
static git_oid empty_tree = {{ 0x4b, 0x82, 0x5d, 0xc6, 0x42, 0xcb, 0x6e, 0xb9, 0xa0, 0x60,
0xe5, 0x4b, 0xf8, 0xd6, 0x92, 0x88, 0xfb, 0xee, 0x49, 0x04 }};
if (!git_oid_cmp(id, &empty_tree))
- return GIT_OBJ_TREE;
+ return GIT_OBJECT_TREE;
- return GIT_OBJ_BAD;
+ return GIT_OBJECT_INVALID;
}
static int odb_read_hardcoded(bool *found, git_rawobj *raw, const git_oid *id)
{
- git_otype type;
+ git_object_t type;
*found = false;
- if ((type = odb_hardcoded_type(id)) == GIT_OBJ_BAD)
+ if ((type = odb_hardcoded_type(id)) == GIT_OBJECT_INVALID)
return 0;
raw->type = type;
raw->len = 0;
raw->data = git__calloc(1, sizeof(uint8_t));
- GITERR_CHECK_ALLOC(raw->data);
+ GIT_ERROR_CHECK_ALLOC(raw->data);
*found = true;
return 0;
char *hdr,
size_t hdr_size,
git_off_t obj_len,
- git_otype obj_type)
+ git_object_t obj_type)
{
const char *type_str = git_object_type2string(obj_type);
int hdr_max = (hdr_size > INT_MAX-2) ? (INT_MAX-2) : (int)hdr_size;
int len;
- len = p_snprintf(hdr, hdr_max, "%s %lld", type_str, (long long)obj_len);
+ len = p_snprintf(hdr, hdr_max, "%s %"PRId64, type_str, (int64_t)obj_len);
if (len < 0 || len >= hdr_max) {
- giterr_set(GITERR_OS, "object header creation failed");
+ git_error_set(GIT_ERROR_OS, "object header creation failed");
return -1;
}
assert(id && obj);
if (!git_object_typeisloose(obj->type)) {
- giterr_set(GITERR_INVALID, "invalid object type");
+ git_error_set(GIT_ERROR_INVALID, "invalid object type");
return -1;
}
if (!obj->data && obj->len != 0) {
- giterr_set(GITERR_INVALID, "invalid object");
+ git_error_set(GIT_ERROR_INVALID, "invalid object");
return -1;
}
return object->cached.size;
}
-git_otype git_odb_object_type(git_odb_object *object)
+git_object_t git_odb_object_type(git_odb_object *object)
{
return object->cached.type;
}
git_cached_obj_decref(object);
}
-int git_odb__hashfd(git_oid *out, git_file fd, size_t size, git_otype type)
+int git_odb__hashfd(git_oid *out, git_file fd, size_t size, git_object_t type)
{
size_t hdr_len;
char hdr[64], buffer[FILEIO_BUFSIZE];
int error = 0;
if (!git_object_typeisloose(type)) {
- giterr_set(GITERR_INVALID, "invalid object type for hash");
+ git_error_set(GIT_ERROR_INVALID, "invalid object type for hash");
return -1;
}
* If size is not zero, the file was truncated after we originally
* stat'd it, so we consider this a read failure too */
if (read_len < 0 || size > 0) {
- giterr_set(GITERR_OS, "error reading file for hashing");
+ git_error_set(GIT_ERROR_OS, "error reading file for hashing");
error = -1;
goto done;
}
int git_odb__hashfd_filtered(
- git_oid *out, git_file fd, size_t size, git_otype type, git_filter_list *fl)
+ git_oid *out, git_file fd, size_t size, git_object_t type, git_filter_list *fl)
{
int error;
git_buf raw = GIT_BUF_INIT;
error = git_filter_list_apply_to_data(&post, fl, &raw);
- git_buf_free(&raw);
+ git_buf_dispose(&raw);
if (!error)
error = git_odb_hash(out, post.ptr, post.size, type);
- git_buf_free(&post);
+ git_buf_dispose(&post);
}
return error;
return -1;
if (!git__is_int(st.st_size) || (int)st.st_size < 0) {
- giterr_set(GITERR_FILESYSTEM, "file size overflow for 32-bit systems");
+ git_error_set(GIT_ERROR_FILESYSTEM, "file size overflow for 32-bit systems");
return -1;
}
int read_len;
size_t alloc_size;
- GITERR_CHECK_ALLOC_ADD(&alloc_size, size, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_size, size, 1);
link_data = git__malloc(alloc_size);
- GITERR_CHECK_ALLOC(link_data);
+ GIT_ERROR_CHECK_ALLOC(link_data);
read_len = p_readlink(path, link_data, size);
link_data[size] = '\0';
if (read_len != size) {
- giterr_set(GITERR_OS, "failed to read symlink data for '%s'", path);
+ git_error_set(GIT_ERROR_OS, "failed to read symlink data for '%s'", path);
git__free(link_data);
return -1;
}
- result = git_odb_hash(out, link_data, size, GIT_OBJ_BLOB);
+ result = git_odb_hash(out, link_data, size, GIT_OBJECT_BLOB);
git__free(link_data);
} else {
int fd = git_futils_open_ro(path);
if (fd < 0)
return -1;
- result = git_odb__hashfd(out, fd, size, GIT_OBJ_BLOB);
+ result = git_odb__hashfd(out, fd, size, GIT_OBJECT_BLOB);
p_close(fd);
}
return result;
}
-int git_odb_hashfile(git_oid *out, const char *path, git_otype type)
+int git_odb_hashfile(git_oid *out, const char *path, git_object_t type)
{
git_off_t size;
int result, fd = git_futils_open_ro(path);
return fd;
if ((size = git_futils_filesize(fd)) < 0 || !git__is_sizet(size)) {
- giterr_set(GITERR_OS, "file size overflow for 32-bit systems");
+ git_error_set(GIT_ERROR_OS, "file size overflow for 32-bit systems");
p_close(fd);
return -1;
}
return result;
}
-int git_odb_hash(git_oid *id, const void *data, size_t len, git_otype type)
+int git_odb_hash(git_oid *id, const void *data, size_t len, git_object_t type)
{
git_rawobj raw;
git_odb_stream stream;
char *buffer;
size_t size, written;
- git_otype type;
+ git_object_t type;
} fake_wstream;
static int fake_wstream__fwrite(git_odb_stream *_stream, const git_oid *oid)
git__free(stream);
}
-static int init_fake_wstream(git_odb_stream **stream_p, git_odb_backend *backend, git_off_t size, git_otype type)
+static int init_fake_wstream(git_odb_stream **stream_p, git_odb_backend *backend, git_off_t size, git_object_t type)
{
fake_wstream *stream;
+ size_t blobsize;
- if (!git__is_ssizet(size)) {
- giterr_set(GITERR_ODB, "object size too large to keep in memory");
- return -1;
- }
+ GIT_ERROR_CHECK_BLOBSIZE(size);
+ blobsize = (size_t)size;
stream = git__calloc(1, sizeof(fake_wstream));
- GITERR_CHECK_ALLOC(stream);
+ GIT_ERROR_CHECK_ALLOC(stream);
- stream->size = size;
+ stream->size = blobsize;
stream->type = type;
- stream->buffer = git__malloc(size);
+ stream->buffer = git__malloc(blobsize);
if (stream->buffer == NULL) {
git__free(stream);
return -1;
int git_odb_new(git_odb **out)
{
git_odb *db = git__calloc(1, sizeof(*db));
- GITERR_CHECK_ALLOC(db);
+ GIT_ERROR_CHECK_ALLOC(db);
if (git_cache_init(&db->own_cache) < 0 ||
git_vector_init(&db->backends, 4, backend_sort_cmp) < 0) {
assert(odb && backend);
- GITERR_CHECK_VERSION(backend, GIT_ODB_BACKEND_VERSION, "git_odb_backend");
+ GIT_ERROR_CHECK_VERSION(backend, GIT_ODB_BACKEND_VERSION, "git_odb_backend");
/* Check if the backend is already owned by another ODB */
assert(!backend->odb || backend->odb == odb);
internal = git__malloc(sizeof(backend_internal));
- GITERR_CHECK_ALLOC(internal);
+ GIT_ERROR_CHECK_ALLOC(internal);
internal->backend = backend;
internal->priority = priority;
static int git_odb__error_unsupported_in_backend(const char *action)
{
- giterr_set(GITERR_ODB,
+ git_error_set(GIT_ERROR_ODB,
"cannot %s - unsupported in the loaded odb backends", action);
return -1;
}
return 0;
}
- giterr_set(GITERR_ODB, "no ODB backend loaded at index %" PRIuZ, pos);
+ git_error_set(GIT_ERROR_ODB, "no ODB backend loaded at index %" PRIuZ, pos);
return GIT_ENOTFOUND;
}
if (as_alternates)
return 0;
- giterr_set(GITERR_ODB, "failed to load object database in '%s'", objects_dir);
+ git_error_set(GIT_ERROR_ODB, "failed to load object database in '%s'", objects_dir);
return -1;
}
return -1;
if (git_path_exists(alternates_path.ptr) == false) {
- git_buf_free(&alternates_path);
+ git_buf_dispose(&alternates_path);
return 0;
}
if (git_futils_readbuffer(&alternates_buf, alternates_path.ptr) < 0) {
- git_buf_free(&alternates_path);
+ git_buf_dispose(&alternates_path);
return -1;
}
break;
}
- git_buf_free(&alternates_path);
- git_buf_free(&alternates_buf);
+ git_buf_dispose(&alternates_path);
+ git_buf_dispose(&alternates_buf);
return result;
}
int val;
if (!repo) {
- giterr_set(GITERR_ODB, "cannot access repository to set odb caps");
+ git_error_set(GIT_ERROR_ODB, "cannot access repository to set odb caps");
return -1;
}
int error = GIT_EAMBIGUOUS;
if (!query->type)
- query->type = GIT_OBJ_ANY;
+ query->type = GIT_OBJECT_ANY;
/* if we have a short OID, expand it first */
if (query->length >= GIT_OID_MINPREFIXLEN && query->length < GIT_OID_HEXSZ) {
* or because the user passed a full OID. Ensure its type is right.
*/
if (query->length >= GIT_OID_HEXSZ) {
- git_otype actual_type;
+ git_object_t actual_type;
error = odb_otype_fast(&actual_type, db, &query->id);
if (!error) {
- if (query->type != GIT_OBJ_ANY && query->type != actual_type)
+ if (query->type != GIT_OBJECT_ANY && query->type != actual_type)
error = GIT_ENOTFOUND;
else
query->type = actual_type;
}
}
- giterr_clear();
+ git_error_clear();
return 0;
}
-int git_odb_read_header(size_t *len_p, git_otype *type_p, git_odb *db, const git_oid *id)
+int git_odb_read_header(size_t *len_p, git_object_t *type_p, git_odb *db, const git_oid *id)
{
int error;
git_odb_object *object;
}
static int odb_read_header_1(
- size_t *len_p, git_otype *type_p, git_odb *db,
+ size_t *len_p, git_object_t *type_p, git_odb *db,
const git_oid *id, bool only_refreshed)
{
size_t i;
- git_otype ht;
+ git_object_t ht;
bool passthrough = false;
int error;
- if (!only_refreshed && (ht = odb_hardcoded_type(id)) != GIT_OBJ_BAD) {
+ if (!only_refreshed && (ht = odb_hardcoded_type(id)) != GIT_OBJECT_INVALID) {
*type_p = ht;
*len_p = 0;
return 0;
}
int git_odb__read_header_or_object(
- git_odb_object **out, size_t *len_p, git_otype *type_p,
+ git_odb_object **out, size_t *len_p, git_object_t *type_p,
git_odb *db, const git_oid *id)
{
int error = GIT_ENOTFOUND;
}
}
- giterr_clear();
+ git_error_clear();
if ((object = odb_object__alloc(id, &raw)) == NULL) {
error = -1;
goto out;
return error;
}
-static int odb_otype_fast(git_otype *type_p, git_odb *db, const git_oid *id)
+static int odb_otype_fast(git_object_t *type_p, git_odb *db, const git_oid *id)
{
git_odb_object *object;
size_t _unused;
git_oid_tostr_s(&found_full_oid));
error = git_odb__error_ambiguous(buf.ptr);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
goto out;
}
git_vector_foreach(&db->backends, i, internal) {
git_odb_backend *b = internal->backend;
int error = b->foreach(b, cb, payload);
- if (error < 0)
+ if (error != 0)
return error;
}
}
int git_odb_write(
- git_oid *oid, git_odb *db, const void *data, size_t len, git_otype type)
+ git_oid *oid, git_odb *db, const void *data, size_t len, git_object_t type)
{
size_t i;
int error = GIT_ERROR;
return error;
}
-static int hash_header(git_hash_ctx *ctx, git_off_t size, git_otype type)
+static int hash_header(git_hash_ctx *ctx, git_off_t size, git_object_t type)
{
char header[64];
size_t hdrlen;
}
int git_odb_open_wstream(
- git_odb_stream **stream, git_odb *db, git_off_t size, git_otype type)
+ git_odb_stream **stream, git_odb *db, git_off_t size, git_object_t type)
{
size_t i, writes = 0;
int error = GIT_ERROR;
}
ctx = git__malloc(sizeof(git_hash_ctx));
- GITERR_CHECK_ALLOC(ctx);
+ GIT_ERROR_CHECK_ALLOC(ctx);
if ((error = git_hash_ctx_init(ctx)) < 0 ||
(error = hash_header(ctx, size, type)) < 0)
const git_odb_stream *stream,
const char *action)
{
- giterr_set(GITERR_ODB,
+ git_error_set(GIT_ERROR_ODB,
"cannot %s - "
"Invalid length. %"PRId64" was expected. The "
"total size of the received chunks amounts to %"PRId64".",
int git_odb_open_rstream(
git_odb_stream **stream,
size_t *len,
- git_otype *type,
+ git_object_t *type,
git_odb *db,
const git_oid *oid)
{
git_oid_tostr(expected_oid, sizeof(expected_oid), expected);
git_oid_tostr(actual_oid, sizeof(actual_oid), actual);
- giterr_set(GITERR_ODB, "object hash mismatch - expected %s but got %s",
+ git_error_set(GIT_ERROR_ODB, "object hash mismatch - expected %s but got %s",
expected_oid, actual_oid);
return GIT_EMISMATCH;
if (oid != NULL) {
char oid_str[GIT_OID_HEXSZ + 1];
git_oid_tostr(oid_str, oid_len+1, oid);
- giterr_set(GITERR_ODB, "object not found - %s (%.*s)",
+ git_error_set(GIT_ERROR_ODB, "object not found - %s (%.*s)",
message, (int) oid_len, oid_str);
} else
- giterr_set(GITERR_ODB, "object not found - %s", message);
+ git_error_set(GIT_ERROR_ODB, "object not found - %s", message);
return GIT_ENOTFOUND;
}
static int error_null_oid(int error, const char *message)
{
- giterr_set(GITERR_ODB, "odb: %s: null OID cannot exist", message);
+ git_error_set(GIT_ERROR_ODB, "odb: %s: null OID cannot exist", message);
return error;
}
int git_odb__error_ambiguous(const char *message)
{
- giterr_set(GITERR_ODB, "ambiguous SHA1 prefix - %s", message);
+ git_error_set(GIT_ERROR_ODB, "ambiguous SHA1 prefix - %s", message);
return GIT_EAMBIGUOUS;
}
typedef struct {
void *data; /**< Raw, decompressed object data. */
size_t len; /**< Total number of bytes in data. */
- git_otype type; /**< Type of this object. */
+ git_object_t type; /**< Type of this object. */
} git_rawobj;
/* EXPORT */
/*
* Format the object header such as it would appear in the on-disk object
*/
-int git_odb__format_object_header(size_t *out_len, char *hdr, size_t hdr_size, git_off_t obj_len, git_otype obj_type);
+int git_odb__format_object_header(size_t *out_len, char *hdr, size_t hdr_size, git_off_t obj_len, git_object_t obj_type);
/*
* Hash an open file descriptor.
* This is a performance call when the contents of a fd need to be hashed,
* The fd is never closed, not even on error. It must be opened and closed
* by the caller
*/
-int git_odb__hashfd(git_oid *out, git_file fd, size_t size, git_otype type);
+int git_odb__hashfd(git_oid *out, git_file fd, size_t size, git_object_t type);
/*
* Hash an open file descriptor applying an array of filters
* Acts just like git_odb__hashfd with the addition of filters...
*/
int git_odb__hashfd_filtered(
- git_oid *out, git_file fd, size_t len, git_otype type, git_filter_list *fl);
+ git_oid *out, git_file fd, size_t len, git_object_t type, git_filter_list *fl);
/*
* Hash a `path`, assuming it could be a POSIX symlink: if the path is a
* symlink, then the raw contents of the symlink will be hashed. Otherwise,
* this will fallback to `git_odb__hashfd`.
*
- * The hash type for this call is always `GIT_OBJ_BLOB` because symlinks may
- * only point to blobs.
+ * The hash type for this call is always `GIT_OBJIECT_BLOB` because
+ * symlinks may only point to blobs.
*/
int git_odb__hashlink(git_oid *out, const char *path);
* not be read.
*/
int git_odb__read_header_or_object(
- git_odb_object **out, size_t *len_p, git_otype *type_p,
+ git_odb_object **out, size_t *len_p, git_object_t *type_p,
git_odb *db, const git_oid *id);
/* freshen an entry in the object database */
#define MAX_HEADER_LEN 64
typedef struct { /* object header data */
- git_otype type; /* object type */
+ git_object_t type; /* object type */
size_t size; /* object size */
} obj_hdr;
size_t alloclen;
/* expand length for object root + 40 hex sha1 chars + 2 * '/' + '\0' */
- GITERR_CHECK_ALLOC_ADD(&alloclen, be->objects_dirlen, GIT_OID_HEXSZ);
- GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, 3);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, be->objects_dirlen, GIT_OID_HEXSZ);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, alloclen, 3);
if (git_buf_grow(name, alloclen) < 0)
return -1;
return 0;
on_error:
- giterr_set(GITERR_OBJECT, "failed to parse loose object: invalid header");
+ git_error_set(GIT_ERROR_OBJECT, "failed to parse loose object: invalid header");
return -1;
}
goto on_error;
if ((uint64_t)size > SIZE_MAX) {
- giterr_set(GITERR_OBJECT, "object is larger than available memory");
+ git_error_set(GIT_ERROR_OBJECT, "object is larger than available memory");
return -1;
}
- out->size = size;
+ out->size = (size_t)size;
if (GIT_ADD_SIZET_OVERFLOW(out_len, i, 1))
goto on_error;
return 0;
on_error:
- giterr_set(GITERR_OBJECT, "failed to parse loose object: invalid header");
+ git_error_set(GIT_ERROR_OBJECT, "failed to parse loose object: invalid header");
return -1;
}
goto done;
if (!git_object_typeisloose(hdr.type) || head_len > obj_len) {
- giterr_set(GITERR_ODB, "failed to inflate loose object");
+ git_error_set(GIT_ERROR_ODB, "failed to inflate loose object");
error = -1;
goto done;
}
out->data = git_buf_detach(&body);
done:
- git_buf_free(&body);
+ git_buf_dispose(&body);
return error;
}
goto done;
if (!git_object_typeisloose(hdr.type)) {
- giterr_set(GITERR_ODB, "failed to inflate disk object");
+ git_error_set(GIT_ERROR_ODB, "failed to inflate disk object");
error = -1;
goto done;
}
goto done;
if (!git_zstream_done(&zstream)) {
- giterr_set(GITERR_ZLIB, "failed to finish zlib inflation: stream aborted prematurely");
+ git_error_set(GIT_ERROR_ZLIB, "failed to finish zlib inflation: stream aborted prematurely");
error = -1;
goto done;
}
out->data = NULL;
out->len = 0;
- out->type = GIT_OBJ_BAD;
+ out->type = GIT_OBJECT_INVALID;
if ((error = git_futils_readbuffer(&obj, loc->ptr)) < 0)
goto done;
error = read_loose_standard(out, &obj);
done:
- git_buf_free(&obj);
+ git_buf_dispose(&obj);
return error;
}
error = read_header_loose_standard(out, obj, (size_t)obj_len);
if (!error && !git_object_typeisloose(out->type)) {
- giterr_set(GITERR_ZLIB, "failed to read loose object header");
+ git_error_set(GIT_ERROR_ZLIB, "failed to read loose object header");
error = -1;
goto done;
}
int error;
/* prealloc memory for OBJ_DIR/xx/xx..38x..xx */
- GITERR_CHECK_ALLOC_ADD(&alloc_len, dir_len, GIT_OID_HEXSZ);
- GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 3);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, dir_len, GIT_OID_HEXSZ);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 3);
if (git_buf_grow(object_location, alloc_len) < 0)
return -1;
return error;
/* Update the location according to the oid obtained */
- GITERR_CHECK_ALLOC_ADD(&alloc_len, dir_len, GIT_OID_HEXSZ);
- GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 2);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, dir_len, GIT_OID_HEXSZ);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 2);
git_buf_truncate(object_location, dir_len);
if (git_buf_grow(object_location, alloc_len) < 0)
*
***********************************************************/
-static int loose_backend__read_header(size_t *len_p, git_otype *type_p, git_odb_backend *backend, const git_oid *oid)
+static int loose_backend__read_header(size_t *len_p, git_object_t *type_p, git_odb_backend *backend, const git_oid *oid)
{
git_buf object_path = GIT_BUF_INIT;
git_rawobj raw;
assert(backend && oid);
raw.len = 0;
- raw.type = GIT_OBJ_BAD;
+ raw.type = GIT_OBJECT_INVALID;
if (locate_object(&object_path, (loose_backend *)backend, oid) < 0) {
error = git_odb__error_notfound("no matching loose object",
*type_p = raw.type;
}
- git_buf_free(&object_path);
+ git_buf_dispose(&object_path);
return error;
}
-static int loose_backend__read(void **buffer_p, size_t *len_p, git_otype *type_p, git_odb_backend *backend, const git_oid *oid)
+static int loose_backend__read(void **buffer_p, size_t *len_p, git_object_t *type_p, git_odb_backend *backend, const git_oid *oid)
{
git_buf object_path = GIT_BUF_INIT;
git_rawobj raw;
*type_p = raw.type;
}
- git_buf_free(&object_path);
+ git_buf_dispose(&object_path);
return error;
}
git_oid *out_oid,
void **buffer_p,
size_t *len_p,
- git_otype *type_p,
+ git_object_t *type_p,
git_odb_backend *backend,
const git_oid *short_oid,
size_t len)
*type_p = raw.type;
}
- git_buf_free(&object_path);
+ git_buf_dispose(&object_path);
}
return error;
error = locate_object(&object_path, (loose_backend *)backend, oid);
- git_buf_free(&object_path);
+ git_buf_dispose(&object_path);
return !error;
}
error = locate_object_short_oid(
&object_path, out, (loose_backend *)backend, short_id, len);
- git_buf_free(&object_path);
+ git_buf_dispose(&object_path);
return error;
}
if (filename_to_oid(&oid, path->ptr + state->dir_len) < 0)
return 0;
- return giterr_set_after_callback_function(
+ return git_error_set_after_callback_function(
state->cb(&oid, state->data), "git_odb_foreach");
}
error = git_path_direach(&buf, 0, foreach_cb, &state);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return error;
}
error = git_filebuf_commit_at(
&stream->fbuf, final_path.ptr);
- git_buf_free(&final_path);
+ git_buf_dispose(&final_path);
return error;
}
return flags;
}
-static int loose_backend__writestream(git_odb_stream **stream_out, git_odb_backend *_backend, git_off_t length, git_otype type)
+static int loose_backend__writestream(git_odb_stream **stream_out, git_odb_backend *_backend, git_off_t length, git_object_t type)
{
loose_backend *backend;
loose_writestream *stream = NULL;
return error;
stream = git__calloc(1, sizeof(loose_writestream));
- GITERR_CHECK_ALLOC(stream);
+ GIT_ERROR_CHECK_ALLOC(stream);
stream->stream.backend = _backend;
stream->stream.read = NULL; /* read only */
git__free(stream);
stream = NULL;
}
- git_buf_free(&tmp_path);
+ git_buf_dispose(&tmp_path);
*stream_out = (git_odb_stream *)stream;
return !stream ? -1 : 0;
return error;
if (!git_object_typeisloose(hdr->type)) {
- giterr_set(GITERR_ODB, "failed to inflate loose object");
+ git_error_set(GIT_ERROR_ODB, "failed to inflate loose object");
return -1;
}
return error;
if (!git_object_typeisloose(hdr->type)) {
- giterr_set(GITERR_ODB, "failed to inflate disk object");
+ git_error_set(GIT_ERROR_ODB, "failed to inflate disk object");
return -1;
}
static int loose_backend__readstream(
git_odb_stream **stream_out,
size_t *len_out,
- git_otype *type_out,
+ git_object_t *type_out,
git_odb_backend *_backend,
const git_oid *oid)
{
backend = (loose_backend *)_backend;
*stream_out = NULL;
*len_out = 0;
- *type_out = GIT_OBJ_BAD;
+ *type_out = GIT_OBJECT_INVALID;
if (locate_object(&object_path, backend, oid) < 0) {
error = git_odb__error_notfound("no matching loose object",
}
stream = git__calloc(1, sizeof(loose_readstream));
- GITERR_CHECK_ALLOC(stream);
+ GIT_ERROR_CHECK_ALLOC(stream);
hash_ctx = git__malloc(sizeof(git_hash_ctx));
- GITERR_CHECK_ALLOC(hash_ctx);
+ GIT_ERROR_CHECK_ALLOC(hash_ctx);
if ((error = git_hash_ctx_init(hash_ctx)) < 0 ||
(error = git_futils_mmap_ro_file(&stream->map, object_path.ptr)) < 0 ||
done:
if (error < 0) {
- git_futils_mmap_free(&stream->map);
- git_zstream_free(&stream->zstream);
- git_hash_ctx_cleanup(hash_ctx);
- git__free(hash_ctx);
- git__free(stream);
+ if (stream) {
+ git_futils_mmap_free(&stream->map);
+ git_zstream_free(&stream->zstream);
+ git__free(stream);
+ }
+ if (hash_ctx) {
+ git_hash_ctx_cleanup(hash_ctx);
+ git__free(hash_ctx);
+ }
}
- git_buf_free(&object_path);
+ git_buf_dispose(&object_path);
return error;
}
-static int loose_backend__write(git_odb_backend *_backend, const git_oid *oid, const void *data, size_t len, git_otype type)
+static int loose_backend__write(git_odb_backend *_backend, const git_oid *oid, const void *data, size_t len, git_object_t type)
{
int error = 0;
git_buf final_path = GIT_BUF_INIT;
cleanup:
if (error < 0)
git_filebuf_cleanup(&fbuf);
- git_buf_free(&final_path);
+ git_buf_dispose(&final_path);
return error;
}
return -1;
error = git_futils_touch(path.ptr, NULL);
- git_buf_free(&path);
+ git_buf_dispose(&path);
return error;
}
objects_dirlen = strlen(objects_dir);
- GITERR_CHECK_ALLOC_ADD(&alloclen, sizeof(loose_backend), objects_dirlen);
- GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, 2);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, sizeof(loose_backend), objects_dirlen);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, alloclen, 2);
backend = git__calloc(1, alloclen);
- GITERR_CHECK_ALLOC(backend);
+ GIT_ERROR_CHECK_ALLOC(backend);
backend->parent.version = GIT_ODB_BACKEND_VERSION;
backend->objects_dirlen = objects_dirlen;
struct memobject {
git_oid oid;
size_t len;
- git_otype type;
+ git_object_t type;
char data[GIT_FLEX_ARRAY];
};
git_array_t(struct memobject *) commits;
};
-static int impl__write(git_odb_backend *_backend, const git_oid *oid, const void *data, size_t len, git_otype type)
+static int impl__write(git_odb_backend *_backend, const git_oid *oid, const void *data, size_t len, git_object_t type)
{
struct memory_packer_db *db = (struct memory_packer_db *)_backend;
- struct memobject *obj = NULL;
- khiter_t pos;
+ struct memobject *obj = NULL;
+ size_t pos;
size_t alloc_len;
int rval;
if (rval == 0)
return 0;
- GITERR_CHECK_ALLOC_ADD(&alloc_len, sizeof(struct memobject), len);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, sizeof(struct memobject), len);
obj = git__malloc(alloc_len);
- GITERR_CHECK_ALLOC(obj);
+ GIT_ERROR_CHECK_ALLOC(obj);
memcpy(obj->data, data, len);
git_oid_cpy(&obj->oid, oid);
git_oidmap_set_key_at(db->objects, pos, &obj->oid);
git_oidmap_set_value_at(db->objects, pos, obj);
- if (type == GIT_OBJ_COMMIT) {
+ if (type == GIT_OBJECT_COMMIT) {
struct memobject **store = git_array_alloc(db->commits);
- GITERR_CHECK_ALLOC(store);
+ GIT_ERROR_CHECK_ALLOC(store);
*store = obj;
}
return git_oidmap_exists(db->objects, oid);
}
-static int impl__read(void **buffer_p, size_t *len_p, git_otype *type_p, git_odb_backend *backend, const git_oid *oid)
+static int impl__read(void **buffer_p, size_t *len_p, git_object_t *type_p, git_odb_backend *backend, const git_oid *oid)
{
struct memory_packer_db *db = (struct memory_packer_db *)backend;
struct memobject *obj = NULL;
- khiter_t pos;
+ size_t pos;
pos = git_oidmap_lookup_index(db->objects, oid);
if (!git_oidmap_valid_index(db->objects, pos))
*len_p = obj->len;
*type_p = obj->type;
*buffer_p = git__malloc(obj->len);
- GITERR_CHECK_ALLOC(*buffer_p);
+ GIT_ERROR_CHECK_ALLOC(*buffer_p);
memcpy(*buffer_p, obj->data, obj->len);
return 0;
}
-static int impl__read_header(size_t *len_p, git_otype *type_p, git_odb_backend *backend, const git_oid *oid)
+static int impl__read_header(size_t *len_p, git_object_t *type_p, git_odb_backend *backend, const git_oid *oid)
{
struct memory_packer_db *db = (struct memory_packer_db *)backend;
struct memobject *obj = NULL;
- khiter_t pos;
+ size_t pos;
pos = git_oidmap_lookup_index(db->objects, oid);
if (!git_oidmap_valid_index(db->objects, pos))
assert(out);
db = git__calloc(1, sizeof(struct memory_packer_db));
- GITERR_CHECK_ALLOC(db);
+ GIT_ERROR_CHECK_ALLOC(db);
db->objects = git_oidmap_alloc();
/* ignore missing .pack file as git does */
if (error == GIT_ENOTFOUND) {
- giterr_clear();
+ git_error_clear();
return 0;
}
/* reload all packs */
error = git_path_direach(&path, 0, packfile_load__cb, backend);
- git_buf_free(&path);
+ git_buf_dispose(&path);
git_vector_sort(&backend->packs);
return error;
}
static int pack_backend__read_header(
- size_t *len_p, git_otype *type_p,
+ size_t *len_p, git_object_t *type_p,
struct git_odb_backend *backend, const git_oid *oid)
{
struct git_pack_entry e;
}
static int pack_backend__read(
- void **buffer_p, size_t *len_p, git_otype *type_p,
+ void **buffer_p, size_t *len_p, git_object_t *type_p,
git_odb_backend *backend, const git_oid *oid)
{
struct git_pack_entry e;
git_oid *out_oid,
void **buffer_p,
size_t *len_p,
- git_otype *type_p,
+ git_object_t *type_p,
git_odb_backend *backend,
const git_oid *short_oid,
size_t len)
return error;
git_vector_foreach(&backend->packs, i, p) {
- if ((error = git_pack_foreach_entry(p, cb, data)) < 0)
+ if ((error = git_pack_foreach_entry(p, cb, data)) != 0)
return error;
}
git_transfer_progress_cb progress_cb,
void *progress_payload)
{
+ git_indexer_options opts = GIT_INDEXER_OPTIONS_INIT;
struct pack_backend *backend;
struct pack_writepack *writepack;
*out = NULL;
+ opts.progress_cb = progress_cb;
+ opts.progress_cb_payload = progress_payload;
+
backend = (struct pack_backend *)_backend;
writepack = git__calloc(1, sizeof(struct pack_writepack));
- GITERR_CHECK_ALLOC(writepack);
+ GIT_ERROR_CHECK_ALLOC(writepack);
if (git_indexer_new(&writepack->indexer,
- backend->pack_folder, 0, odb, progress_cb, progress_payload) < 0) {
+ backend->pack_folder, 0, odb, &opts) < 0) {
git__free(writepack);
return -1;
}
static int pack_backend__alloc(struct pack_backend **out, size_t initial_size)
{
struct pack_backend *backend = git__calloc(1, sizeof(struct pack_backend));
- GITERR_CHECK_ALLOC(backend);
+ GIT_ERROR_CHECK_ALLOC(backend);
if (git_vector_init(&backend->packs, initial_size, packfile_sort__cb) < 0) {
git__free(backend);
*backend_out = (git_odb_backend *)backend;
- git_buf_free(&path);
+ git_buf_dispose(&path);
return error;
}
#include "offmap.h"
+#define kmalloc git__malloc
+#define kcalloc git__calloc
+#define krealloc git__realloc
+#define kreallocarray git__reallocarray
+#define kfree git__free
+#include "khash.h"
+
+__KHASH_TYPE(off, git_off_t, void *)
+
__KHASH_IMPL(off, static kh_inline, git_off_t, void *, 1, kh_int64_hash_func, kh_int64_hash_equal)
git_offmap *git_offmap_alloc(void)
return kh_get(off, map, key) != kh_end(map);
}
+int git_offmap_has_data(git_offmap *map, size_t idx)
+{
+ return kh_exist(map, idx);
+}
+
+git_off_t git_offmap_key_at(git_offmap *map, size_t idx)
+{
+ return kh_key(map, idx);
+}
+
void *git_offmap_value_at(git_offmap *map, size_t idx)
{
return kh_val(map, idx);
if (git_offmap_valid_index(map, idx))
git_offmap_delete_at(map, idx);
}
+
+size_t git_offmap_begin(git_offmap *map)
+{
+ GIT_UNUSED(map);
+ return 0;
+}
+
+size_t git_offmap_end(git_offmap *map)
+{
+ return map->n_buckets;
+}
#include "git2/types.h"
-#define kmalloc git__malloc
-#define kcalloc git__calloc
-#define krealloc git__realloc
-#define kreallocarray git__reallocarray
-#define kfree git__free
-#include "khash.h"
-
-__KHASH_TYPE(off, git_off_t, void *)
-typedef khash_t(off) git_offmap;
+typedef struct kh_off_s git_offmap;
git_offmap *git_offmap_alloc(void);
void git_offmap_free(git_offmap *map);
int git_offmap_valid_index(git_offmap *map, size_t idx);
int git_offmap_exists(git_offmap *map, const git_off_t key);
+int git_offmap_has_data(git_offmap *map, size_t idx);
+git_off_t git_offmap_key_at(git_offmap *map, size_t idx);
void *git_offmap_value_at(git_offmap *map, size_t idx);
void git_offmap_set_value_at(git_offmap *map, size_t idx, void *value);
void git_offmap_delete_at(git_offmap *map, size_t idx);
void git_offmap_insert(git_offmap *map, const git_off_t key, void *value, int *rval);
void git_offmap_delete(git_offmap *map, const git_off_t key);
-#define git_offmap_foreach kh_foreach
-#define git_offmap_foreach_value kh_foreach_value
+size_t git_offmap_begin(git_offmap *map);
+size_t git_offmap_end(git_offmap *map);
+
+#define git_offmap_foreach(h, kvar, vvar, code) { size_t __i; \
+ for (__i = git_offmap_begin(h); __i != git_offmap_end(h); ++__i) { \
+ if (!git_offmap_has_data(h,__i)) continue; \
+ (kvar) = git_offmap_key_at(h,__i); \
+ (vvar) = git_offmap_value_at(h,__i); \
+ code; \
+ } }
+
+#define git_offmap_foreach_value(h, vvar, code) { size_t __i; \
+ for (__i = git_offmap_begin(h); __i != git_offmap_end(h); ++__i) { \
+ if (!git_offmap_has_data(h,__i)) continue; \
+ (vvar) = git_offmap_value_at(h,__i); \
+ code; \
+ } }
#endif
static int oid_error_invalid(const char *msg)
{
- giterr_set(GITERR_INVALID, "unable to parse OID - %s", msg);
+ git_error_set(GIT_ERROR_INVALID, "unable to parse OID - %s", msg);
return -1;
}
static int resize_trie(git_oid_shorten *self, size_t new_size)
{
self->nodes = git__reallocarray(self->nodes, new_size, sizeof(trie_node));
- GITERR_CHECK_ALLOC(self->nodes);
+ GIT_ERROR_CHECK_ALLOC(self->nodes);
if (new_size > self->size) {
memset(&self->nodes[self->size], 0x0, (new_size - self->size) * sizeof(trie_node));
node_index idx;
if (os->full) {
- giterr_set(GITERR_INVALID, "unable to shorten OID - OID set full");
+ git_error_set(GIT_ERROR_INVALID, "unable to shorten OID - OID set full");
return -1;
}
trie_node *node;
if (c == -1) {
- giterr_set(GITERR_INVALID, "unable to shorten OID - invalid hex value");
+ git_error_set(GIT_ERROR_INVALID, "unable to shorten OID - invalid hex value");
return -1;
}
node = push_leaf(os, idx, git__fromhex(tail[0]), &tail[1]);
if (node == NULL) {
if (os->full)
- giterr_set(GITERR_INVALID, "unable to shorten OID - OID set full");
+ git_error_set(GIT_ERROR_INVALID, "unable to shorten OID - OID set full");
return -1;
}
}
if (node->children[c] == 0) {
if (push_leaf(os, idx, c, &text_oid[i + 1]) == NULL) {
if (os->full)
- giterr_set(GITERR_INVALID, "unable to shorten OID - OID set full");
+ git_error_set(GIT_ERROR_INVALID, "unable to shorten OID - OID set full");
return -1;
}
break;
#include "oidmap.h"
+#define kmalloc git__malloc
+#define kcalloc git__calloc
+#define krealloc git__realloc
+#define kreallocarray git__reallocarray
+#define kfree git__free
+#include "khash.h"
+
+__KHASH_TYPE(oid, const git_oid *, void *)
+
GIT_INLINE(khint_t) git_oidmap_hash(const git_oid *oid)
{
khint_t h;
if (git_oidmap_valid_index(map, idx))
git_oidmap_delete_at(map, idx);
}
+
+size_t git_oidmap_begin(git_oidmap *map)
+{
+ GIT_UNUSED(map);
+ return 0;
+}
+
+size_t git_oidmap_end(git_oidmap *map)
+{
+ return map->n_buckets;
+}
#include "git2/oid.h"
-#define kmalloc git__malloc
-#define kcalloc git__calloc
-#define krealloc git__realloc
-#define kreallocarray git__reallocarray
-#define kfree git__free
-#include "khash.h"
-
-__KHASH_TYPE(oid, const git_oid *, void *)
-typedef khash_t(oid) git_oidmap;
+typedef struct kh_oid_s git_oidmap;
git_oidmap *git_oidmap_alloc(void);
void git_oidmap_free(git_oidmap *map);
void git_oidmap_insert(git_oidmap *map, const git_oid *key, void *value, int *rval);
void git_oidmap_delete(git_oidmap *map, const git_oid *key);
-#define git_oidmap_foreach_value kh_foreach_value
+size_t git_oidmap_begin(git_oidmap *map);
+size_t git_oidmap_end(git_oidmap *map);
-#define git_oidmap_begin kh_begin
-#define git_oidmap_end kh_end
+#define git_oidmap_foreach_value(h, vvar, code) { size_t __i; \
+ for (__i = git_oidmap_begin(h); __i != git_oidmap_end(h); ++__i) { \
+ if (!git_oidmap_has_data(h,__i)) continue; \
+ (vvar) = git_oidmap_value_at(h,__i); \
+ code; \
+ } }
#endif
git_transfer_progress *stats;
};
+struct walk_object {
+ git_oid id;
+ unsigned int uninteresting:1,
+ seen:1;
+};
+
#ifdef GIT_THREADS
#define GIT_PACKBUILDER__MUTEX_OP(pb, mtx, op) do { \
ret = git_config_get_int64(&val, config, KEY); \
if (!ret) { \
if (!git__is_sizet(val)) { \
- giterr_set(GITERR_CONFIG, \
+ git_error_set(GIT_ERROR_CONFIG, \
"configuration value '%s' is too large", KEY); \
ret = -1; \
goto out; \
*out = NULL;
pb = git__calloc(1, sizeof(*pb));
- GITERR_CHECK_ALLOC(pb);
+ GIT_ERROR_CHECK_ALLOC(pb);
pb->object_ix = git_oidmap_alloc();
if (!pb->object_ix)
if (!pb->walk_objects)
goto on_error;
- git_pool_init(&pb->object_pool, sizeof(git_walk_object));
+ git_pool_init(&pb->object_pool, sizeof(struct walk_object));
pb->repo = repo;
pb->nr_threads = 1; /* do not spawn any thread by default */
git_mutex_init(&pb->progress_mutex) ||
git_cond_init(&pb->progress_cond))
{
- giterr_set(GITERR_OS, "failed to initialize packbuilder mutex");
+ git_error_set(GIT_ERROR_OS, "failed to initialize packbuilder mutex");
goto on_error;
}
static void rehash(git_packbuilder *pb)
{
git_pobject *po;
- khiter_t pos;
- size_t i;
+ size_t pos, i;
int ret;
git_oidmap_clear(pb->object_ix);
const char *name)
{
git_pobject *po;
- khiter_t pos;
- size_t newsize;
+ size_t newsize, pos;
int ret;
assert(pb && oid);
return 0;
if (pb->nr_objects >= pb->nr_alloc) {
- GITERR_CHECK_ALLOC_ADD(&newsize, pb->nr_alloc, 1024);
- GITERR_CHECK_ALLOC_MULTIPLY(&newsize, newsize, 3 / 2);
+ GIT_ERROR_CHECK_ALLOC_ADD(&newsize, pb->nr_alloc, 1024);
+ GIT_ERROR_CHECK_ALLOC_MULTIPLY(&newsize, newsize, 3 / 2);
if (!git__is_uint32(newsize)) {
- giterr_set(GITERR_NOMEMORY, "packfile too large to fit in memory.");
+ git_error_set(GIT_ERROR_NOMEMORY, "packfile too large to fit in memory.");
return -1;
}
pb->object_list = git__reallocarray(pb->object_list,
pb->nr_alloc, sizeof(*po));
- GITERR_CHECK_ALLOC(pb->object_list);
+ GIT_ERROR_CHECK_ALLOC(pb->object_list);
rehash(pb);
}
pos = git_oidmap_put(pb->object_ix, &po->id, &ret);
if (ret < 0) {
- giterr_set_oom();
+ git_error_set_oom();
return ret;
}
assert(ret != 0);
pb->nr_objects, 0, pb->progress_cb_payload);
if (ret)
- return giterr_set_after_callback(ret);
+ return git_error_set_after_callback(ret);
}
}
goto on_error;
if (error == GIT_EBUFS || delta_size != po->delta_size) {
- giterr_set(GITERR_INVALID, "delta size changed");
+ git_error_set(GIT_ERROR_INVALID, "delta size changed");
goto on_error;
}
void *cb_data)
{
git_odb_object *obj = NULL;
- git_otype type;
+ git_object_t type;
unsigned char hdr[10], *zbuf = NULL;
void *data = NULL;
size_t hdr_len, zbuf_len = COMPRESS_BUFLEN, data_len;
goto done;
data_len = po->delta_size;
- type = GIT_OBJ_REF_DELTA;
+ type = GIT_OBJECT_REF_DELTA;
} else {
if ((error = git_odb_read(&obj, pb->odb, &po->id)) < 0)
goto done;
(error = git_hash_update(&pb->ctx, hdr, hdr_len)) < 0)
goto done;
- if (type == GIT_OBJ_REF_DELTA) {
+ if (type == GIT_OBJECT_REF_DELTA) {
if ((error = write_cb(po->delta->id.id, GIT_OID_RAWSZ, cb_data)) < 0 ||
(error = git_hash_update(&pb->ctx, po->delta->id.id, GIT_OID_RAWSZ)) < 0)
goto done;
goto done;
} else {
zbuf = git__malloc(zbuf_len);
- GITERR_CHECK_ALLOC(zbuf);
+ GIT_ERROR_CHECK_ALLOC(zbuf);
git_zstream_reset(&pb->zstream);
git_zstream_set_input(&pb->zstream, data, data_len);
{
git_packbuilder *pb = data;
git_pobject *po;
- khiter_t pos;
+ size_t pos;
GIT_UNUSED(name);
*/
for (i = last_untagged; i < pb->nr_objects; i++) {
git_pobject *po = pb->object_list + i;
- if (po->type != GIT_OBJ_COMMIT &&
- po->type != GIT_OBJ_TAG)
+ if (po->type != GIT_OBJECT_COMMIT &&
+ po->type != GIT_OBJECT_TAG)
continue;
add_to_write_order(wo, &wo_end, po);
}
*/
for (i = last_untagged; i < pb->nr_objects; i++) {
git_pobject *po = pb->object_list + i;
- if (po->type != GIT_OBJ_TREE)
+ if (po->type != GIT_OBJECT_TREE)
continue;
add_to_write_order(wo, &wo_end, po);
}
if (wo_end != pb->nr_objects) {
git__free(wo);
- giterr_set(GITERR_INVALID, "invalid write order");
+ git_error_set(GIT_ERROR_INVALID, "invalid write order");
return NULL;
}
return -1;
if (!git__is_uint32(pb->nr_objects)) {
- giterr_set(GITERR_INVALID, "too many objects");
+ git_error_set(GIT_ERROR_INVALID, "too many objects");
return -1;
}
sz = git_odb_object_size(obj);
trg->data = git__malloc(sz);
- GITERR_CHECK_ALLOC(trg->data);
+ GIT_ERROR_CHECK_ALLOC(trg->data);
memcpy(trg->data, git_odb_object_data(obj), sz);
git_odb_object_free(obj);
if (sz != trg_size) {
- giterr_set(GITERR_INVALID,
+ git_error_set(GIT_ERROR_INVALID,
"inconsistent target object length");
return -1;
}
sz = obj_sz;
src->data = git__malloc(sz);
- GITERR_CHECK_ALLOC(src->data);
+ GIT_ERROR_CHECK_ALLOC(src->data);
memcpy(src->data, git_odb_object_data(obj), sz);
git_odb_object_free(obj);
if (sz != src_size) {
- giterr_set(GITERR_INVALID,
+ git_error_set(GIT_ERROR_INVALID,
"inconsistent source object length");
return -1;
}
}
trg_object->delta_data = git__realloc(delta_buf, delta_size);
- GITERR_CHECK_ALLOC(trg_object->delta_data);
+ GIT_ERROR_CHECK_ALLOC(trg_object->delta_data);
} else {
/* create delta when writing the pack */
git_packbuilder__cache_unlock(pb);
count, pb->nr_objects, pb->progress_cb_payload);
if (ret)
- return giterr_set_after_callback(ret);
+ return git_error_set_after_callback(ret);
}
}
int error = -1;
array = git__calloc(window, sizeof(struct unpacked));
- GITERR_CHECK_ALLOC(array);
+ GIT_ERROR_CHECK_ALLOC(array);
for (;;) {
struct unpacked *n = array + idx;
git__free(po->delta_data);
po->delta_data = git__malloc(zbuf.size);
- GITERR_CHECK_ALLOC(po->delta_data);
+ GIT_ERROR_CHECK_ALLOC(po->delta_data);
memcpy(po->delta_data, zbuf.ptr, zbuf.size);
po->z_delta_size = zbuf.size;
git__free(array[i].data);
}
git__free(array);
- git_buf_free(&zbuf);
+ git_buf_dispose(&zbuf);
return error;
}
git_packbuilder__progress_unlock(me->pb);
if (git_mutex_lock(&me->mutex)) {
- giterr_set(GITERR_THREAD, "unable to lock packfile condition mutex");
+ git_error_set(GIT_ERROR_THREAD, "unable to lock packfile condition mutex");
return NULL;
}
}
p = git__mallocarray(pb->nr_threads, sizeof(*p));
- GITERR_CHECK_ALLOC(p);
+ GIT_ERROR_CHECK_ALLOC(p);
/* Partition the work among the threads */
for (i = 0; i < pb->nr_threads; ++i) {
ret = git_thread_create(&p[i].thread,
threaded_find_deltas, &p[i]);
if (ret) {
- giterr_set(GITERR_THREAD, "unable to create thread");
+ git_error_set(GIT_ERROR_THREAD, "unable to create thread");
return -1;
}
active_threads++;
git_packbuilder__progress_unlock(pb);
if (git_mutex_lock(&target->mutex)) {
- giterr_set(GITERR_THREAD, "unable to lock packfile condition mutex");
+ git_error_set(GIT_ERROR_THREAD, "unable to lock packfile condition mutex");
git__free(p);
return -1;
}
pb->progress_cb(GIT_PACKBUILDER_DELTAFICATION, 0, pb->nr_objects, pb->progress_cb_payload);
delta_list = git__mallocarray(pb->nr_objects, sizeof(*delta_list));
- GITERR_CHECK_ALLOC(delta_list);
+ GIT_ERROR_CHECK_ALLOC(delta_list);
for (i = 0; i < pb->nr_objects; ++i) {
git_pobject *po = pb->object_list + i;
git_transfer_progress_cb progress_cb,
void *progress_cb_payload)
{
+ git_indexer_options opts = GIT_INDEXER_OPTIONS_INIT;
git_indexer *indexer;
git_transfer_progress stats;
struct pack_write_context ctx;
PREPARE_PACK;
+ opts.progress_cb = progress_cb;
+ opts.progress_cb_payload = progress_cb_payload;
+
if (git_indexer_new(
- &indexer, path, mode, pb->odb, progress_cb, progress_cb_payload) < 0)
+ &indexer, path, mode, pb->odb, &opts) < 0)
return -1;
if (!git_repository__cvar(&t, pb->repo, GIT_CVAR_FSYNCOBJECTFILES) && t)
struct tree_walk_context *ctx = payload;
/* A commit inside a tree represents a submodule commit and should be skipped. */
- if (git_tree_entry_type(entry) == GIT_OBJ_COMMIT)
+ if (git_tree_entry_type(entry) == GIT_OBJECT_COMMIT)
return 0;
if (!(error = git_buf_sets(&ctx->buf, root)) &&
error = git_tree_walk(tree, GIT_TREEWALK_PRE, cb_tree_walk, &context);
git_tree_free(tree);
- git_buf_free(&context.buf);
+ git_buf_dispose(&context.buf);
return error;
}
assert(pb && id);
- if ((error = git_object_lookup(&obj, pb->repo, id, GIT_OBJ_ANY)) < 0)
+ if ((error = git_object_lookup(&obj, pb->repo, id, GIT_OBJECT_ANY)) < 0)
return error;
switch (git_object_type(obj)) {
- case GIT_OBJ_BLOB:
+ case GIT_OBJECT_BLOB:
error = git_packbuilder_insert(pb, id, name);
break;
- case GIT_OBJ_TREE:
+ case GIT_OBJECT_TREE:
error = git_packbuilder_insert_tree(pb, id);
break;
- case GIT_OBJ_COMMIT:
+ case GIT_OBJECT_COMMIT:
error = git_packbuilder_insert_commit(pb, id);
break;
- case GIT_OBJ_TAG:
+ case GIT_OBJECT_TAG:
if ((error = git_packbuilder_insert(pb, id, name)) < 0)
goto cleanup;
error = git_packbuilder_insert_recur(pb, git_tag_target_id((git_tag *) obj), NULL);
break;
default:
- giterr_set(GITERR_INVALID, "unknown object type");
+ git_error_set(GIT_ERROR_INVALID, "unknown object type");
error = -1;
}
return pb->nr_written;
}
-int lookup_walk_object(git_walk_object **out, git_packbuilder *pb, const git_oid *id)
+static int lookup_walk_object(struct walk_object **out, git_packbuilder *pb, const git_oid *id)
{
- git_walk_object *obj;
+ struct walk_object *obj;
obj = git_pool_mallocz(&pb->object_pool, 1);
if (!obj) {
- giterr_set_oom();
+ git_error_set_oom();
return -1;
}
return 0;
}
-static int retrieve_object(git_walk_object **out, git_packbuilder *pb, const git_oid *id)
+static int retrieve_object(struct walk_object **out, git_packbuilder *pb, const git_oid *id)
{
int error;
- khiter_t pos;
- git_walk_object *obj;
+ size_t pos;
+ struct walk_object *obj;
pos = git_oidmap_lookup_index(pb->walk_objects, id);
if (git_oidmap_valid_index(pb->walk_objects, pos)) {
static int mark_blob_uninteresting(git_packbuilder *pb, const git_oid *id)
{
int error;
- git_walk_object *obj;
+ struct walk_object *obj;
if ((error = retrieve_object(&obj, pb, id)) < 0)
return error;
static int mark_tree_uninteresting(git_packbuilder *pb, const git_oid *id)
{
- git_walk_object *obj;
+ struct walk_object *obj;
git_tree *tree;
int error;
size_t i;
const git_tree_entry *entry = git_tree_entry_byindex(tree, i);
const git_oid *entry_id = git_tree_entry_id(entry);
switch (git_tree_entry_type(entry)) {
- case GIT_OBJ_TREE:
+ case GIT_OBJECT_TREE:
if ((error = mark_tree_uninteresting(pb, entry_id)) < 0)
goto cleanup;
break;
- case GIT_OBJ_BLOB:
+ case GIT_OBJECT_BLOB:
if ((error = mark_blob_uninteresting(pb, entry_id)) < 0)
goto cleanup;
break;
size_t i;
int error;
git_tree *subtree;
- git_walk_object *obj;
+ struct walk_object *obj;
const char *name;
if ((error = retrieve_object(&obj, pb, git_tree_id(tree))) < 0)
const git_tree_entry *entry = git_tree_entry_byindex(tree, i);
const git_oid *entry_id = git_tree_entry_id(entry);
switch (git_tree_entry_type(entry)) {
- case GIT_OBJ_TREE:
+ case GIT_OBJECT_TREE:
if ((error = git_tree_lookup(&subtree, pb->repo, entry_id)) < 0)
return error;
return error;
break;
- case GIT_OBJ_BLOB:
+ case GIT_OBJECT_BLOB:
if ((error = retrieve_object(&obj, pb, entry_id)) < 0)
return error;
if (obj->uninteresting)
return error;
}
-int insert_commit(git_packbuilder *pb, git_walk_object *obj)
+int insert_commit(git_packbuilder *pb, struct walk_object *obj)
{
int error;
git_commit *commit = NULL;
{
int error;
git_oid id;
- git_walk_object *obj;
+ struct walk_object *obj;
assert(pb && walk);
typedef struct git_pobject {
git_oid id;
- git_otype type;
+ git_object_t type;
git_off_t offset;
size_t size;
filled:1;
} git_pobject;
-typedef struct {
- git_oid id;
- unsigned int uninteresting:1,
- seen:1;
-} git_walk_object;
-
struct git_packbuilder {
git_repository *repo; /* associated repository */
git_odb *odb; /* associated object database */
git_mwindow **w_curs,
git_off_t *curpos,
size_t size,
- git_otype type);
+ git_object_t type);
/* Can find the offset of an object given
* a prefix of an identifier.
static int packfile_error(const char *message)
{
- giterr_set(GITERR_ODB, "invalid pack file - %s", message);
+ git_error_set(GIT_ERROR_ODB, "invalid pack file - %s", message);
return -1;
}
static int cache_init(git_pack_cache *cache)
{
cache->entries = git_offmap_alloc();
- GITERR_CHECK_ALLOC(cache->entries);
+ GIT_ERROR_CHECK_ALLOC(cache->entries);
cache->memory_limit = GIT_PACK_CACHE_MEMORY_LIMIT;
if (git_mutex_init(&cache->lock)) {
- giterr_set(GITERR_OS, "failed to initialize pack cache mutex");
+ git_error_set(GIT_ERROR_OS, "failed to initialize pack cache mutex");
git__free(cache->entries);
cache->entries = NULL;
static git_pack_cache_entry *cache_get(git_pack_cache *cache, git_off_t offset)
{
- khiter_t k;
git_pack_cache_entry *entry = NULL;
+ size_t k;
if (git_mutex_lock(&cache->lock) < 0)
return NULL;
{
git_pack_cache_entry *entry;
int error, exists = 0;
- khiter_t k;
+ size_t k;
if (base->len > GIT_PACK_CACHE_SIZE_LIMIT)
return -1;
entry = new_cache_object(base);
if (entry) {
if (git_mutex_lock(&cache->lock) < 0) {
- giterr_set(GITERR_OS, "failed to lock cache");
+ git_error_set(GIT_ERROR_OS, "failed to lock cache");
git__free(entry);
return -1;
}
if (p_fstat(fd, &st) < 0) {
p_close(fd);
- giterr_set(GITERR_OS, "unable to stat pack index '%s'", path);
+ git_error_set(GIT_ERROR_OS, "unable to stat pack index '%s'", path);
return -1;
}
(idx_size = (size_t)st.st_size) < 4 * 256 + 20 + 20)
{
p_close(fd);
- giterr_set(GITERR_ODB, "invalid pack index '%s'", path);
+ git_error_set(GIT_ERROR_ODB, "invalid pack index '%s'", path);
return -1;
}
git_buf_put(&idx_name, p->pack_name, name_len - strlen(".pack"));
git_buf_puts(&idx_name, ".idx");
if (git_buf_oom(&idx_name)) {
- git_buf_free(&idx_name);
+ git_buf_dispose(&idx_name);
return -1;
}
if ((error = git_mutex_lock(&p->lock)) < 0) {
- git_buf_free(&idx_name);
+ git_buf_dispose(&idx_name);
return error;
}
if (p->index_version == -1)
error = pack_index_check(idx_name.ptr, p);
- git_buf_free(&idx_name);
+ git_buf_dispose(&idx_name);
git_mutex_unlock(&p->lock);
* - each byte afterwards: low seven bits are size continuation,
* with the high bit being "size continues"
*/
-size_t git_packfile__object_header(unsigned char *hdr, size_t size, git_otype type)
+size_t git_packfile__object_header(unsigned char *hdr, size_t size, git_object_t type)
{
unsigned char *hdr_base;
unsigned char c;
- assert(type >= GIT_OBJ_COMMIT && type <= GIT_OBJ_REF_DELTA);
+ assert(type >= GIT_OBJECT_COMMIT && type <= GIT_OBJECT_REF_DELTA);
/* TODO: add support for chunked objects; see git.git 6c0d19b1 */
static int packfile_unpack_header1(
unsigned long *usedp,
size_t *sizep,
- git_otype *type,
+ git_object_t *type,
const unsigned char *buf,
unsigned long len)
{
shift = 4;
while (c & 0x80) {
if (len <= used) {
- giterr_set(GITERR_ODB, "buffer too small");
+ git_error_set(GIT_ERROR_ODB, "buffer too small");
return GIT_EBUFS;
}
if (bitsizeof(long) <= shift) {
*usedp = 0;
- giterr_set(GITERR_ODB, "packfile corrupted");
+ git_error_set(GIT_ERROR_ODB, "packfile corrupted");
return -1;
}
int git_packfile_unpack_header(
size_t *size_p,
- git_otype *type_p,
+ git_object_t *type_p,
git_mwindow_file *mwf,
git_mwindow **w_curs,
git_off_t *curpos)
int git_packfile_resolve_header(
size_t *size_p,
- git_otype *type_p,
+ git_object_t *type_p,
struct git_pack_file *p,
git_off_t offset)
{
git_mwindow *w_curs = NULL;
git_off_t curpos = offset;
size_t size;
- git_otype type;
+ git_object_t type;
git_off_t base_offset;
int error;
if (error < 0)
return error;
- if (type == GIT_OBJ_OFS_DELTA || type == GIT_OBJ_REF_DELTA) {
+ if (type == GIT_OBJECT_OFS_DELTA || type == GIT_OBJECT_REF_DELTA) {
size_t base_size;
git_packfile_stream stream;
if ((error = git_packfile_stream_open(&stream, p, curpos)) < 0)
return error;
error = git_delta_read_header_fromstream(&base_size, size_p, &stream);
- git_packfile_stream_free(&stream);
+ git_packfile_stream_dispose(&stream);
if (error < 0)
return error;
} else {
base_offset = 0;
}
- while (type == GIT_OBJ_OFS_DELTA || type == GIT_OBJ_REF_DELTA) {
+ while (type == GIT_OBJECT_OFS_DELTA || type == GIT_OBJECT_REF_DELTA) {
curpos = base_offset;
error = git_packfile_unpack_header(&size, &type, &p->mwf, &w_curs, &curpos);
if (error < 0)
return error;
- if (type != GIT_OBJ_OFS_DELTA && type != GIT_OBJ_REF_DELTA)
+ if (type != GIT_OBJECT_OFS_DELTA && type != GIT_OBJECT_REF_DELTA)
break;
base_offset = get_delta_base(p, &w_curs, &curpos, type, base_offset);
git_mwindow_close(&w_curs);
git_off_t curpos = obj_offset, base_offset;
int error = 0, use_heap = 0;
size_t size, elem_pos;
- git_otype type;
+ git_object_t type;
elem_pos = 0;
while (true) {
/* if we run out of space on the small stack, use the array */
if (elem_pos == SMALL_STACK_SIZE) {
git_array_init_to_size(chain, elem_pos);
- GITERR_CHECK_ARRAY(chain);
+ GIT_ERROR_CHECK_ARRAY(chain);
memcpy(chain.ptr, small_stack, elem_pos * sizeof(struct pack_chain_elem));
chain.size = elem_pos;
use_heap = 1;
elem->type = type;
elem->base_key = obj_offset;
- if (type != GIT_OBJ_OFS_DELTA && type != GIT_OBJ_REF_DELTA)
+ if (type != GIT_OBJECT_OFS_DELTA && type != GIT_OBJECT_REF_DELTA)
break;
base_offset = get_delta_base(p, &w_curs, &curpos, type, obj_offset);
elem_pos++;
}
-
+
*stack_sz = elem_pos + 1;
*chain_out = chain;
return error;
git_pack_cache_entry *cached = NULL;
struct pack_chain_elem small_stack[SMALL_STACK_SIZE];
size_t stack_size = 0, elem_pos, alloclen;
- git_otype base_type;
+ git_object_t base_type;
/*
* TODO: optionally check the CRC on the packfile
obj->data = NULL;
obj->len = 0;
- obj->type = GIT_OBJ_BAD;
+ obj->type = GIT_OBJECT_INVALID;
/* let's point to the right stack */
stack = chain.ptr ? chain.ptr : small_stack;
}
switch (base_type) {
- case GIT_OBJ_COMMIT:
- case GIT_OBJ_TREE:
- case GIT_OBJ_BLOB:
- case GIT_OBJ_TAG:
+ case GIT_OBJECT_COMMIT:
+ case GIT_OBJECT_TREE:
+ case GIT_OBJECT_BLOB:
+ case GIT_OBJECT_TAG:
if (!cached) {
curpos = elem->offset;
error = packfile_unpack_compressed(obj, p, &w_curs, &curpos, elem->size, elem->type);
if (error < 0)
goto cleanup;
break;
- case GIT_OBJ_OFS_DELTA:
- case GIT_OBJ_REF_DELTA:
+ case GIT_OBJECT_OFS_DELTA:
+ case GIT_OBJECT_REF_DELTA:
error = packfile_error("dependency chain ends in a delta");
goto cleanup;
default:
if (cached && stack_size == 1) {
void *data = obj->data;
- GITERR_CHECK_ALLOC_ADD(&alloclen, obj->len, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, obj->len, 1);
obj->data = git__malloc(alloclen);
- GITERR_CHECK_ALLOC(obj->data);
+ GIT_ERROR_CHECK_ALLOC(obj->data);
memcpy(obj->data, data, obj->len + 1);
git_atomic_dec(&cached->refcount);
base = *obj;
obj->data = NULL;
obj->len = 0;
- obj->type = GIT_OBJ_BAD;
+ obj->type = GIT_OBJECT_INVALID;
error = git_delta_apply(&obj->data, &obj->len, base.data, base.len, delta.data, delta.len);
obj->type = base_type;
obj->zstream.next_out = Z_NULL;
st = inflateInit(&obj->zstream);
if (st != Z_OK) {
- giterr_set(GITERR_ZLIB, "failed to init packfile stream");
+ git_error_set(GIT_ERROR_ZLIB, "failed to init packfile stream");
return -1;
}
written = len - obj->zstream.avail_out;
if (st != Z_OK && st != Z_STREAM_END) {
- giterr_set(GITERR_ZLIB, "error reading from the zlib stream");
+ git_error_set(GIT_ERROR_ZLIB, "error reading from the zlib stream");
return -1;
}
}
-void git_packfile_stream_free(git_packfile_stream *obj)
+void git_packfile_stream_dispose(git_packfile_stream *obj)
{
inflateEnd(&obj->zstream);
}
git_mwindow **w_curs,
git_off_t *curpos,
size_t size,
- git_otype type)
+ git_object_t type)
{
size_t buf_size;
int st;
z_stream stream;
unsigned char *buffer, *in;
- GITERR_CHECK_ALLOC_ADD(&buf_size, size, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&buf_size, size, 1);
buffer = git__calloc(1, buf_size);
- GITERR_CHECK_ALLOC(buffer);
+ GIT_ERROR_CHECK_ALLOC(buffer);
memset(&stream, 0, sizeof(stream));
stream.next_out = buffer;
st = inflateInit(&stream);
if (st != Z_OK) {
git__free(buffer);
- giterr_set(GITERR_ZLIB, "failed to init zlib stream on unpack");
+ git_error_set(GIT_ERROR_ZLIB, "failed to init zlib stream on unpack");
return -1;
}
if ((st != Z_STREAM_END) || stream.total_out != size) {
git__free(buffer);
- giterr_set(GITERR_ZLIB, "error inflating zlib stream");
+ git_error_set(GIT_ERROR_ZLIB, "error inflating zlib stream");
return -1;
}
struct git_pack_file *p,
git_mwindow **w_curs,
git_off_t *curpos,
- git_otype type,
+ git_object_t type,
git_off_t delta_obj_offset)
{
unsigned int left = 0;
* that is assured. An OFS_DELTA longer than the hash size
* is stupid, as then a REF_DELTA would be smaller to store.
*/
- if (type == GIT_OBJ_OFS_DELTA) {
+ if (type == GIT_OBJECT_OFS_DELTA) {
unsigned used = 0;
unsigned char c = base_info[used++];
size_t unsigned_base_offset = c & 127;
return 0; /* out of bound */
base_offset = delta_obj_offset - unsigned_base_offset;
*curpos += used;
- } else if (type == GIT_OBJ_REF_DELTA) {
+ } else if (type == GIT_OBJECT_REF_DELTA) {
/* If we have the cooperative cache, search in it first */
if (p->has_cache) {
- khiter_t k;
git_oid oid;
+ size_t k;
git_oid_fromraw(&oid, base_info);
k = git_oidmap_lookup_index(p->idx_cache, &oid);
return 0;
cleanup:
- giterr_set(GITERR_OS, "invalid packfile '%s'", p->pack_name);
+ git_error_set(GIT_ERROR_OS, "invalid packfile '%s'", p->pack_name);
if (p->mwf.fd >= 0)
p_close(p->mwf.fd);
if (path_len < strlen(".idx"))
return git_odb__error_notfound("invalid packfile path", NULL, 0);
- GITERR_CHECK_ALLOC_ADD(&alloc_len, sizeof(*p), path_len);
- GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 2);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, sizeof(*p), path_len);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 2);
p = git__calloc(1, alloc_len);
- GITERR_CHECK_ALLOC(p);
+ GIT_ERROR_CHECK_ALLOC(p);
memcpy(p->pack_name, path, path_len + 1);
p->index_version = -1;
if (git_mutex_init(&p->lock)) {
- giterr_set(GITERR_OS, "failed to initialize packfile mutex");
+ git_error_set(GIT_ERROR_OS, "failed to initialize packfile mutex");
git__free(p);
return -1;
}
for (i = 0; i < p->num_objects; i++)
if ((error = cb(p->oids[i], data)) != 0)
- return giterr_set_after_callback(error);
+ return git_error_set_after_callback(error);
return error;
}
return git_odb__error_ambiguous("found multiple offsets for pack entry");
if ((offset = nth_packed_object_offset(p, pos)) < 0) {
- giterr_set(GITERR_ODB, "packfile index is corrupt");
+ git_error_set(GIT_ERROR_ODB, "packfile index is corrupt");
return -1;
}
git_off_t base_key;
git_off_t offset;
size_t size;
- git_otype type;
+ git_object_t type;
};
typedef git_array_t(struct pack_chain_elem) git_dependency_chain;
git_mwindow *mw;
} git_packfile_stream;
-size_t git_packfile__object_header(unsigned char *hdr, size_t size, git_otype type);
+size_t git_packfile__object_header(unsigned char *hdr, size_t size, git_object_t type);
int git_packfile__name(char **out, const char *path);
int git_packfile_unpack_header(
size_t *size_p,
- git_otype *type_p,
+ git_object_t *type_p,
git_mwindow_file *mwf,
git_mwindow **w_curs,
git_off_t *curpos);
int git_packfile_resolve_header(
size_t *size_p,
- git_otype *type_p,
+ git_object_t *type_p,
struct git_pack_file *p,
git_off_t offset);
int git_packfile_stream_open(git_packfile_stream *obj, struct git_pack_file *p, git_off_t curpos);
ssize_t git_packfile_stream_read(git_packfile_stream *obj, void *buffer, size_t len);
-void git_packfile_stream_free(git_packfile_stream *obj);
+void git_packfile_stream_dispose(git_packfile_stream *obj);
git_off_t get_delta_base(struct git_pack_file *p, git_mwindow **w_curs,
- git_off_t *curpos, git_otype type,
+ git_off_t *curpos, git_object_t type,
git_off_t delta_obj_offset);
void git_packfile_close(struct git_pack_file *p, bool unlink_packfile);
void git_parse_ctx_clear(git_parse_ctx *ctx);
#define git_parse_err(...) \
- ( giterr_set(GITERR_PATCH, __VA_ARGS__), -1 )
+ ( git_error_set(GIT_ERROR_PATCH, __VA_ARGS__), -1 )
#define git_parse_ctx_contains_s(ctx, str) \
git_parse_ctx_contains(ctx, str, sizeof(str) - 1)
if (git_diff_delta__format_file_header(
&file_header, patch->delta, NULL, NULL, 0) < 0)
- giterr_clear();
+ git_error_clear();
else
out += git_buf_len(&file_header);
- git_buf_free(&file_header);
+ git_buf_dispose(&file_header);
}
return out;
static int patch_error_outofrange(const char *thing)
{
- giterr_set(GITERR_INVALID, "patch %s index out of range", thing);
+ git_error_set(GIT_ERROR_INVALID, "patch %s index out of range", thing);
return GIT_ENOTFOUND;
}
const git_diff_options *opts)
{
if (opts) {
- GITERR_CHECK_VERSION(opts, GIT_DIFF_OPTIONS_VERSION, "git_diff_options");
+ GIT_ERROR_CHECK_VERSION(opts, GIT_DIFF_OPTIONS_VERSION, "git_diff_options");
memcpy(out, opts, sizeof(git_diff_options));
} else {
git_diff_options default_opts = GIT_DIFF_OPTIONS_INIT;
git__strdup(opts->new_prefix) :
git__strdup(DIFF_NEW_PREFIX_DEFAULT);
- GITERR_CHECK_ALLOC(out->old_prefix);
- GITERR_CHECK_ALLOC(out->new_prefix);
+ GIT_ERROR_CHECK_ALLOC(out->old_prefix);
+ GIT_ERROR_CHECK_ALLOC(out->new_prefix);
return 0;
}
{
int error;
git_patch_generated *patch = git__calloc(1, sizeof(git_patch_generated));
- GITERR_CHECK_ALLOC(patch);
+ GIT_ERROR_CHECK_ALLOC(patch);
if (!(error = patch_generated_init(patch, diff, delta_index))) {
patch->flags |= GIT_PATCH_GENERATED_ALLOCATED;
if (!output->file_cb)
return 0;
- return giterr_set_after_callback_function(
+ return git_error_set_after_callback_function(
output->file_cb(patch->base.delta, progress, output->payload),
"git_patch");
}
}
done:
- git_buf_free(&deflate);
- git_buf_free(&delta);
+ git_buf_dispose(&deflate);
+ git_buf_dispose(&delta);
return error;
}
return error;
}
- error = giterr_set_after_callback_function(
+ error = git_error_set_after_callback_function(
output->binary_cb(patch->base.delta, &binary, output->payload),
"git_patch");
{
if (diff)
return 0;
- giterr_set(GITERR_INVALID, "must provide valid diff to %s", action);
+ git_error_set(GIT_ERROR_INVALID, "must provide valid diff to %s", action);
return -1;
}
size_t new_len = *new_path ? strlen(*new_path) : 0;
size_t alloc_len;
- GITERR_CHECK_ALLOC_ADD(&alloc_len, sizeof(*pd), old_len);
- GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, new_len);
- GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 2);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, sizeof(*pd), old_len);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, new_len);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 2);
*out = pd = git__calloc(1, alloc_len);
- GITERR_CHECK_ALLOC(pd);
+ GIT_ERROR_CHECK_ALLOC(pd);
pd->patch.flags = GIT_PATCH_GENERATED_ALLOCATED;
delta = git_vector_get(&diff->deltas, idx);
if (!delta) {
- giterr_set(GITERR_INVALID, "index out of range for delta in diff");
+ git_error_set(GIT_ERROR_INVALID, "index out of range for delta in diff");
return GIT_ENOTFOUND;
}
if (binary->old_file.data) {
patch->binary.old_file.data = git__malloc(binary->old_file.datalen);
- GITERR_CHECK_ALLOC(patch->binary.old_file.data);
+ GIT_ERROR_CHECK_ALLOC(patch->binary.old_file.data);
memcpy((char *)patch->binary.old_file.data,
binary->old_file.data, binary->old_file.datalen);
if (binary->new_file.data) {
patch->binary.new_file.data = git__malloc(binary->new_file.datalen);
- GITERR_CHECK_ALLOC(patch->binary.new_file.data);
+ GIT_ERROR_CHECK_ALLOC(patch->binary.new_file.data);
memcpy((char *)patch->binary.new_file.data,
binary->new_file.data, binary->new_file.datalen);
GIT_UNUSED(delta);
hunk = git_array_alloc(patch->base.hunks);
- GITERR_CHECK_ALLOC(hunk);
+ GIT_ERROR_CHECK_ALLOC(hunk);
memcpy(&hunk->hunk, hunk_, sizeof(hunk->hunk));
assert(hunk); /* programmer error if no hunk is available */
line = git_array_alloc(patch->base.lines);
- GITERR_CHECK_ALLOC(line);
+ GIT_ERROR_CHECK_ALLOC(line);
memcpy(line, line_, sizeof(*line));
patch->old_path = git_buf_detach(&old_path);
out:
- git_buf_free(&old_path);
+ git_buf_dispose(&old_path);
return error;
}
patch->new_path = git_buf_detach(&new_path);
out:
- git_buf_free(&new_path);
+ git_buf_dispose(&new_path);
return error;
}
if (val < 0 || val > 100)
return -1;
- *out = val;
+ *out = (uint16_t)val;
return 0;
}
return error;
}
-static int parse_number(git_off_t *out, git_patch_parse_ctx *ctx)
-{
- const char *end;
- int64_t num;
-
- if (!git__isdigit(ctx->parse_ctx.line[0]))
- return -1;
-
- if (git__strntol64(&num, ctx->parse_ctx.line, ctx->parse_ctx.line_len, &end, 10) < 0)
- return -1;
-
- if (num < 0)
- return -1;
-
- *out = num;
- git_parse_advance_chars(&ctx->parse_ctx, (end - ctx->parse_ctx.line));
-
- return 0;
-}
-
static int parse_int(int *out, git_patch_parse_ctx *ctx)
{
git_off_t num;
return 0;
fail:
- giterr_set(GITERR_PATCH, "invalid patch hunk header at line %"PRIuZ,
+ git_error_set(GIT_ERROR_PATCH, "invalid patch hunk header at line %"PRIuZ,
ctx->parse_ctx.line_num);
return -1;
}
}
line = git_array_alloc(patch->base.lines);
- GITERR_CHECK_ALLOC(line);
+ GIT_ERROR_CHECK_ALLOC(line);
memset(line, 0x0, sizeof(git_diff_line));
* noise, continue.
*/
if (parse_hunk_header(&hunk, ctx) < 0) {
- giterr_clear();
+ git_error_clear();
continue;
}
continue;
}
- giterr_set(GITERR_PATCH, "no patch found");
+ git_error_set(GIT_ERROR_PATCH, "no patch found");
error = GIT_ENOTFOUND;
done:
binary->data = git_buf_detach(&decoded);
done:
- git_buf_free(&base85);
- git_buf_free(&decoded);
+ git_buf_dispose(&base85);
+ git_buf_dispose(&decoded);
return error;
}
while (git_parse_ctx_contains_s(&ctx->parse_ctx, "@@ -")) {
hunk = git_array_alloc(patch->base.hunks);
- GITERR_CHECK_ALLOC(hunk);
+ GIT_ERROR_CHECK_ALLOC(hunk);
memset(hunk, 0, sizeof(git_patch_hunk));
*out = NULL;
patch = git__calloc(1, sizeof(git_patch_parsed));
- GITERR_CHECK_ALLOC(patch);
+ GIT_ERROR_CHECK_ALLOC(patch);
patch->ctx = ctx;
GIT_REFCOUNT_INC(patch->ctx);
patch->base.free_fn = patch_parsed__free;
patch->base.delta = git__calloc(1, sizeof(git_diff_delta));
- GITERR_CHECK_ALLOC(patch->base.delta);
+ GIT_ERROR_CHECK_ALLOC(patch->base.delta);
patch->base.delta->status = GIT_DELTA_MODIFIED;
patch->base.delta->nfiles = 2;
int error;
ctx = git_patch_parse_ctx_init(content, content_len, opts);
- GITERR_CHECK_ALLOC(ctx);
+ GIT_ERROR_CHECK_ALLOC(ctx);
error = git_patch_parse(out, ctx);
git_path_dirname_r(&buf, path);
dirname = git_buf_detach(&buf);
- git_buf_free(&buf); /* avoid memleak if error occurs */
+ git_buf_dispose(&buf); /* avoid memleak if error occurs */
return dirname;
}
git_path_basename_r(&buf, path);
basename = git_buf_detach(&buf);
- git_buf_free(&buf); /* avoid memleak if error occurs */
+ git_buf_dispose(&buf); /* avoid memleak if error occurs */
return basename;
}
}
if (p_realpath(path, buf) == NULL) {
- /* giterr_set resets the errno when dealing with a GITERR_OS kind of error */
+ /* git_error_set resets the errno when dealing with a GIT_ERROR_OS kind of error */
int error = (errno == ENOENT || errno == ENOTDIR) ? GIT_ENOTFOUND : -1;
- giterr_set(GITERR_OS, "failed to resolve path '%s'", path);
+ git_error_set(GIT_ERROR_OS, "failed to resolve path '%s'", path);
git_buf_clear(path_out);
static int error_invalid_local_file_uri(const char *uri)
{
- giterr_set(GITERR_CONFIG, "'%s' is not a valid local file URI", uri);
+ git_error_set(GIT_ERROR_CONFIG, "'%s' is not a valid local file URI", uri);
return -1;
}
if (!scan) {
error = cb(data, "");
if (error)
- giterr_set_after_callback(error);
+ git_error_set_after_callback(error);
return error;
}
iter.ptr[scan] = oldc;
if (error) {
- giterr_set_after_callback(error);
+ git_error_set_after_callback(error);
break;
}
if (!error && stop == 0 && iter.ptr[0] != '/') {
error = cb(data, "");
if (error)
- giterr_set_after_callback(error);
+ git_error_set_after_callback(error);
}
return error;
return false;
if ((error = git_buf_sets(&dir, path)) != 0)
- giterr_clear();
+ git_error_clear();
else
error = git_path_direach(&dir, 0, path_found_entry, NULL);
- git_buf_free(&dir);
+ git_buf_dispose(&dir);
return !error;
}
switch (errno_value) {
case ENOENT:
case ENOTDIR:
- giterr_set(GITERR_OS, "could not find '%s' to %s", path, action);
+ git_error_set(GIT_ERROR_OS, "could not find '%s' to %s", path, action);
return GIT_ENOTFOUND;
case EINVAL:
case ENAMETOOLONG:
- giterr_set(GITERR_OS, "invalid path for filesystem '%s'", path);
+ git_error_set(GIT_ERROR_OS, "invalid path for filesystem '%s'", path);
return GIT_EINVALIDSPEC;
case EEXIST:
- giterr_set(GITERR_OS, "failed %s - '%s' already exists", action, path);
+ git_error_set(GIT_ERROR_OS, "failed %s - '%s' already exists", action, path);
return GIT_EEXISTS;
case EACCES:
- giterr_set(GITERR_OS, "failed %s - '%s' is locked", action, path);
+ git_error_set(GIT_ERROR_OS, "failed %s - '%s' is locked", action, path);
return GIT_ELOCKED;
default:
- giterr_set(GITERR_OS, "could not %s '%s'", action, path);
+ git_error_set(GIT_ERROR_OS, "could not %s '%s'", action, path);
return -1;
}
}
char *base, *to, *from, *next;
size_t len;
- GITERR_CHECK_ALLOC_BUF(path);
+ GIT_ERROR_CHECK_ALLOC_BUF(path);
if (ceiling > path->size)
ceiling = path->size;
else if (len == 2 && from[0] == '.' && from[1] == '.') {
/* error out if trying to up one from a hard base */
if (to == base && ceiling != 0) {
- giterr_set(GITERR_INVALID,
+ git_error_set(GIT_ERROR_INVALID,
"cannot strip root component off url");
return -1;
}
/* need at least 1 common path segment */
if ((p_dirsep == path->ptr || q_dirsep == parent) &&
(*p_dirsep != '/' || *q_dirsep != '/')) {
- giterr_set(GITERR_INVALID,
+ git_error_set(GIT_ERROR_INVALID,
"%s is not a parent of %s", parent, path->ptr);
return GIT_ENOTFOUND;
}
for (; (q = strchr(q, '/')) && *(q + 1); q++)
depth++;
- GITERR_CHECK_ALLOC_MULTIPLY(&newlen, depth, 3);
- GITERR_CHECK_ALLOC_ADD(&newlen, newlen, plen);
+ GIT_ERROR_CHECK_ALLOC_MULTIPLY(&newlen, depth, 3);
+ GIT_ERROR_CHECK_ALLOC_ADD(&newlen, newlen, plen);
- GITERR_CHECK_ALLOC_ADD(&alloclen, newlen, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, newlen, 1);
/* save the offset as we might realllocate the pointer */
offset = p - path->ptr;
if (ic) {
if (ic->map != (iconv_t)-1)
iconv_close(ic->map);
- git_buf_free(&ic->buf);
+ git_buf_dispose(&ic->buf);
}
}
git_buf_clear(&ic->buf);
while (1) {
- GITERR_CHECK_ALLOC_ADD(&alloclen, wantlen, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, wantlen, 1);
if (git_buf_grow(&ic->buf, alloclen) < 0)
return -1;
return 0;
fail:
- giterr_set(GITERR_OS, "unable to convert unicode path data");
+ git_error_set(GIT_ERROR_OS, "unable to convert unicode path data");
return -1;
}
(void)p_unlink(path.ptr);
done:
- git_buf_free(&path);
+ git_buf_dispose(&path);
return found_decomposed;
}
wd_len = git_buf_len(path);
if ((dir = opendir(path->ptr)) == NULL) {
- giterr_set(GITERR_OS, "failed to open directory '%s'", path->ptr);
+ git_error_set(GIT_ERROR_OS, "failed to open directory '%s'", path->ptr);
if (errno == ENOENT)
return GIT_ENOTFOUND;
if ((error = git_buf_put(path, de_path, de_len)) < 0)
break;
- giterr_clear();
+ git_error_clear();
error = fn(arg, path);
git_buf_truncate(path, wd_len); /* restore path */
/* Only set our own error if the callback did not set one already */
if (error != 0) {
- if (!giterr_last())
- giterr_set_after_callback(error);
+ if (!git_error_last())
+ git_error_set_after_callback(error);
break;
}
git_path_trim_slashes(&diriter->path_utf8);
if (diriter->path_utf8.size == 0) {
- giterr_set(GITERR_FILESYSTEM, "could not open directory '%s'", path);
+ git_error_set(GIT_ERROR_FILESYSTEM, "could not open directory '%s'", path);
return -1;
}
if ((diriter->parent_len = git_win32_path_from_utf8(diriter->path, diriter->path_utf8.ptr)) < 0 ||
!git_win32__findfirstfile_filter(path_filter, diriter->path_utf8.ptr)) {
- giterr_set(GITERR_OS, "could not parse the directory path '%s'", path);
+ git_error_set(GIT_ERROR_OS, "could not parse the directory path '%s'", path);
return -1;
}
is_win7_or_later ? FIND_FIRST_EX_LARGE_FETCH : 0);
if (diriter->handle == INVALID_HANDLE_VALUE) {
- giterr_set(GITERR_OS, "could not open directory '%s'", path);
+ git_error_set(GIT_ERROR_OS, "could not open directory '%s'", path);
return -1;
}
return -1;
if (path_len > GIT_WIN_PATH_UTF16) {
- giterr_set(GITERR_FILESYSTEM,
+ git_error_set(GIT_ERROR_FILESYSTEM,
"invalid path '%.*ls\\%ls' (path too long)",
diriter->parent_len, diriter->path, diriter->current.cFileName);
return -1;
if (diriter == NULL)
return;
- git_buf_free(&diriter->path_utf8);
+ git_buf_dispose(&diriter->path_utf8);
if (diriter->handle != INVALID_HANDLE_VALUE) {
FindClose(diriter->handle);
git_path_trim_slashes(&diriter->path);
if (diriter->path.size == 0) {
- giterr_set(GITERR_FILESYSTEM, "could not open directory '%s'", path);
+ git_error_set(GIT_ERROR_FILESYSTEM, "could not open directory '%s'", path);
return -1;
}
if ((diriter->dir = opendir(diriter->path.ptr)) == NULL) {
- git_buf_free(&diriter->path);
+ git_buf_dispose(&diriter->path);
- giterr_set(GITERR_OS, "failed to open directory '%s'", path);
+ git_error_set(GIT_ERROR_OS, "failed to open directory '%s'", path);
return -1;
}
if (!errno)
return GIT_ITEROVER;
- giterr_set(GITERR_OS,
+ git_error_set(GIT_ERROR_OS,
"could not read directory '%s'", diriter->path.ptr);
return -1;
}
git_path_iconv_clear(&diriter->ic);
#endif
- git_buf_free(&diriter->path);
+ git_buf_dispose(&diriter->path);
}
#endif
assert(name_len > prefix_len);
dup = git__strndup(name + prefix_len, name_len - prefix_len);
- GITERR_CHECK_ALLOC(dup);
+ GIT_ERROR_CHECK_ALLOC(dup);
if ((error = git_vector_insert(contents, dup)) < 0)
break;
saw_tilde = 1;
} else if (i >= 6) {
return true;
- } else if (name[i] < 0) {
+ } else if ((unsigned char)name[i] > 127) {
return true;
} else if (git__tolower(name[i]) != shortname_pfix[i]) {
return true;
if (flags & GIT_PATH_REJECT_DOT_GIT_HFS) {
if (!verify_dotgit_hfs(component, len))
return false;
- if (S_ISLNK(mode) && git_path_is_hfs_dotgit_modules(component, len))
+ if (S_ISLNK(mode) && git_path_is_gitfile(component, len, GIT_PATH_GITFILE_GITMODULES, GIT_PATH_FS_HFS))
return false;
}
if (flags & GIT_PATH_REJECT_DOT_GIT_NTFS) {
if (!verify_dotgit_ntfs(repo, component, len))
return false;
- if (S_ISLNK(mode) && git_path_is_ntfs_dotgit_modules(component, len))
+ if (S_ISLNK(mode) && git_path_is_gitfile(component, len, GIT_PATH_GITFILE_GITMODULES, GIT_PATH_FS_NTFS))
return false;
}
return 0;
}
-static int verify_dotgit_generic(const char *name, size_t len, const char *dotgit_name, size_t dotgit_len, const char *shortname_pfix)
-{
- if (!verify_dotgit_ntfs_generic(name, len, dotgit_name, dotgit_len, shortname_pfix))
- return false;
-
- return verify_dotgit_hfs_generic(name, len, dotgit_name, dotgit_len);
-}
-
-int git_path_is_ntfs_dotgit_modules(const char *name, size_t len)
-{
- return !verify_dotgit_ntfs_generic(name, len, "gitmodules", CONST_STRLEN("gitmodules"), "gi7eba");
-}
-
-int git_path_is_hfs_dotgit_modules(const char *name, size_t len)
-{
- return !verify_dotgit_hfs_generic(name, len, "gitmodules", CONST_STRLEN("gitmodules"));
-}
-
-int git_path_is_dotgit_modules(const char *name, size_t len)
-{
- if (git_path_is_hfs_dotgit_modules(name, len))
- return 1;
-
- return git_path_is_ntfs_dotgit_modules(name, len);
-}
-
-int git_path_is_ntfs_dotgit_ignore(const char *name, size_t len)
-{
- return !verify_dotgit_ntfs_generic(name, len, "gitignore", CONST_STRLEN("gitignore"), "gi250a");
-}
+static const struct {
+ const char *file;
+ const char *hash;
+ size_t filelen;
+} gitfiles[] = {
+ { "gitignore", "gi250a", CONST_STRLEN("gitignore") },
+ { "gitmodules", "gi7eba", CONST_STRLEN("gitmodules") },
+ { "gitattributes", "gi7d29", CONST_STRLEN("gitattributes") }
+};
-int git_path_is_hfs_dotgit_ignore(const char *name, size_t len)
+extern int git_path_is_gitfile(const char *path, size_t pathlen, git_path_gitfile gitfile, git_path_fs fs)
{
- return !verify_dotgit_hfs_generic(name, len, "gitignore", CONST_STRLEN("gitignore"));
-}
-
-int git_path_is_dotgit_ignore(const char *name, size_t len)
-{
- if (git_path_is_hfs_dotgit_ignore(name, len))
- return 1;
-
- return git_path_is_ntfs_dotgit_ignore(name, len);
-}
+ const char *file, *hash;
+ size_t filelen;
-int git_path_is_hfs_dotgit_attributes(const char *name, size_t len)
-{
- return !verify_dotgit_hfs_generic(name, len, "gitattributes", CONST_STRLEN("gitattributes"));
-}
-
-int git_path_is_ntfs_dotgit_attributes(const char *name, size_t len)
-{
- return !verify_dotgit_ntfs_generic(name, len, "gitattributes", CONST_STRLEN("gitattributes"), "gi7d29");
-}
-
-int git_path_is_dotgit_attributes(const char *name, size_t len)
-{
- if (git_path_is_hfs_dotgit_attributes(name, len))
- return 1;
+ if (!(gitfile >= GIT_PATH_GITFILE_GITIGNORE && gitfile < ARRAY_SIZE(gitfiles))) {
+ git_error_set(GIT_ERROR_OS, "invalid gitfile for path validation");
+ return -1;
+ }
- return git_path_is_ntfs_dotgit_attributes(name, len);
+ file = gitfiles[gitfile].file;
+ filelen = gitfiles[gitfile].filelen;
+ hash = gitfiles[gitfile].hash;
+
+ switch (fs) {
+ case GIT_PATH_FS_GENERIC:
+ return !verify_dotgit_ntfs_generic(path, pathlen, file, filelen, hash) ||
+ !verify_dotgit_hfs_generic(path, pathlen, file, filelen);
+ case GIT_PATH_FS_NTFS:
+ return !verify_dotgit_ntfs_generic(path, pathlen, file, filelen, hash);
+ case GIT_PATH_FS_HFS:
+ return !verify_dotgit_hfs_generic(path, pathlen, file, filelen);
+ default:
+ git_error_set(GIT_ERROR_OS, "invalid filesystem for path validation");
+ return -1;
+ }
}
#include "buffer.h"
#include "vector.h"
+#include "git2/sys/path.h"
+
/**
* Path manipulation utils
*
*/
int git_path_normalize_slashes(git_buf *out, const char *path);
-/**
- * Check whether a path component corresponds to a .gitmodules file
- *
- * @param name the path component to check
- * @param len the length of `name`
- */
-extern int git_path_is_dotgit_modules(const char *name, size_t len);
-
-/**
- * Check whether a path component corresponds to a .gitmodules file in NTFS
- *
- * @param name the path component to check
- * @param len the length of `name`
- */
-extern int git_path_is_ntfs_dotgit_modules(const char *name, size_t len);
-
-/**
- * Check whether a path component corresponds to a .gitmodules file in HFS+
- *
- * @param name the path component to check
- * @param len the length of `name`
- */
-extern int git_path_is_hfs_dotgit_modules(const char *name, size_t len);
-
-/**
- * Check whether a path component corresponds to a .gitignore file
- *
- * @param name the path component to check
- * @param len the length of `name`
- */
-extern int git_path_is_dotgit_ignore(const char *name, size_t len);
-
-/**
- * Check whether a path component corresponds to a .gitignore file in NTFS
- *
- * @param name the path component to check
- * @param len the length of `name`
- */
-extern int git_path_is_ntfs_dotgit_ignore(const char *name, size_t len);
-
-/**
- * Check whether a path component corresponds to a .gitignore file in HFS+
- *
- * @param name the path component to check
- * @param len the length of `name`
- */
-extern int git_path_is_hfs_dotgit_ignore(const char *name, size_t len);
-
-/**
- * Check whether a path component corresponds to a .gitignore file
- *
- * @param name the path component to check
- * @param len the length of `name`
- */
-extern int git_path_is_dotgit_attributes(const char *name, size_t len);
-
-/**
- * Check whether a path component corresponds to a .gitattributes file in NTFS
- *
- * @param name the path component to check
- * @param len the length of `name`
- */
-extern int git_path_is_ntfs_dotgit_attributes(const char *name, size_t len);
-
-/**
- * Check whether a path component corresponds to a .gitattributes file in HFS+
- *
- * @param name the path component to check
- * @param len the length of `name`
- */
-extern int git_path_is_hfs_dotgit_attributes(const char *name, size_t len);
-
#endif
git_buf_truncate(&prefix, scan - prefix.ptr);
if (prefix.size <= 0) {
- git_buf_free(&prefix);
+ git_buf_dispose(&prefix);
return NULL;
}
{
int error = 0;
git_pathspec *ps = git__malloc(sizeof(git_pathspec));
- GITERR_CHECK_ALLOC(ps);
+ GIT_ERROR_CHECK_ALLOC(ps);
if ((error = git_pathspec__init(ps, pathspec)) < 0) {
git__free(ps);
if (out) {
*out = m = pathspec_match_alloc(ps, PATHSPEC_DATATYPE_STRINGS);
- GITERR_CHECK_ALLOC(m);
+ GIT_ERROR_CHECK_ALLOC(m);
}
if ((error = git_iterator_reset_range(iter, ps->prefix, ps->prefix)) < 0)
/* if every pattern failed to match, then we have failed */
if ((flags & GIT_PATHSPEC_NO_MATCH_ERROR) != 0 && !found_files) {
- giterr_set(GITERR_INVALID, "no matching files were found");
+ git_error_set(GIT_ERROR_INVALID, "no matching files were found");
error = GIT_ENOTFOUND;
}
if (out) {
*out = m = pathspec_match_alloc(ps, PATHSPEC_DATATYPE_DIFF);
- GITERR_CHECK_ALLOC(m);
+ GIT_ERROR_CHECK_ALLOC(m);
}
pathspec_match_context_init(
/* if every pattern failed to match, then we have failed */
if ((flags & GIT_PATHSPEC_NO_MATCH_ERROR) != 0 && !found_deltas) {
- giterr_set(GITERR_INVALID, "no matching deltas were found");
+ git_error_set(GIT_ERROR_INVALID, "no matching deltas were found");
error = GIT_ENOTFOUND;
}
out->len = 0;
if ((prot & GIT_PROT_WRITE) && ((flags & GIT_MAP_TYPE) == GIT_MAP_SHARED)) {
- giterr_set(GITERR_OS, "trying to map shared-writeable");
+ git_error_set(GIT_ERROR_OS, "trying to map shared-writeable");
return -1;
}
out->data = malloc(len);
- GITERR_CHECK_ALLOC(out->data);
+ GIT_ERROR_CHECK_ALLOC(out->data);
if (!git__is_ssizet(len) ||
(p_lseek(fd, offset, SEEK_SET) < 0) ||
(p_read(fd, out->data, len) != (ssize_t)len)) {
- giterr_set(GITERR_OS, "mmap emulation failed");
+ git_error_set(GIT_ERROR_OS, "mmap emulation failed");
return -1;
}
memcpy(tgt, src, sizeof(git_proxy_options));
if (src->url) {
tgt->url = git__strdup(src->url);
- GITERR_CHECK_ALLOC(tgt->url);
+ GIT_ERROR_CHECK_ALLOC(tgt->url);
}
return 0;
*out = NULL;
p = git__calloc(1, sizeof(*p));
- GITERR_CHECK_ALLOC(p);
+ GIT_ERROR_CHECK_ALLOC(p);
p->repo = remote->repo;
p->remote = remote;
if (!push || !opts)
return -1;
- GITERR_CHECK_VERSION(opts, GIT_PUSH_OPTIONS_VERSION, "git_push_options");
+ GIT_ERROR_CHECK_VERSION(opts, GIT_PUSH_OPTIONS_VERSION, "git_push_options");
push->pb_parallelism = opts->pb_parallelism;
- push->custom_headers = &opts->custom_headers;
+ push->connection.custom_headers = &opts->custom_headers;
+ push->connection.proxy = &opts->proxy_opts;
return 0;
}
if (spec == NULL)
return;
- git_refspec__free(&spec->refspec);
+ git_refspec__dispose(&spec->refspec);
git__free(spec);
}
static int check_rref(char *ref)
{
if (git__prefixcmp(ref, "refs/")) {
- giterr_set(GITERR_INVALID, "not a valid reference '%s'", ref);
+ git_error_set(GIT_ERROR_INVALID, "not a valid reference '%s'", ref);
return -1;
}
return 0;
if (error == GIT_ENOTFOUND)
- giterr_set(GITERR_REFERENCE,
+ git_error_set(GIT_ERROR_REFERENCE,
"src refspec '%s' does not match any existing object", ref);
else
- giterr_set(GITERR_INVALID, "not a valid reference '%s'", ref);
+ git_error_set(GIT_ERROR_INVALID, "not a valid reference '%s'", ref);
return -1;
}
*spec = NULL;
s = git__calloc(1, sizeof(*s));
- GITERR_CHECK_ALLOC(s);
+ GIT_ERROR_CHECK_ALLOC(s);
if (git_refspec__parse(&s->refspec, str, false) < 0) {
- giterr_set(GITERR_INVALID, "invalid refspec %s", str);
+ git_error_set(GIT_ERROR_INVALID, "invalid refspec %s", str);
goto on_error;
}
if (error != GIT_ENOTFOUND)
goto on_error;
- giterr_clear();
+ git_error_clear();
fire_callback = 0;
}
error = 0;
on_error:
- git_buf_free(&remote_ref_name);
+ git_buf_dispose(&remote_ref_name);
return error;
}
git_object *obj = NULL, *target = NULL;
int error;
- if ((error = git_object_lookup(&obj, push->repo, id, GIT_OBJ_TAG)) < 0)
+ if ((error = git_object_lookup(&obj, push->repo, id, GIT_OBJECT_TAG)) < 0)
return error;
- while (git_object_type(obj) == GIT_OBJ_TAG) {
+ while (git_object_type(obj) == GIT_OBJECT_TAG) {
if ((error = git_packbuilder_insert(push->pb, git_object_id(obj), NULL)) < 0)
break;
git_revwalk_sorting(rw, GIT_SORT_TIME);
git_vector_foreach(&push->specs, i, spec) {
- git_otype type;
+ git_object_t type;
size_t size;
if (git_oid_iszero(&spec->loid))
if (git_odb_read_header(&size, &type, push->repo->_odb, &spec->loid) < 0)
goto on_error;
- if (type == GIT_OBJ_TAG) {
+ if (type == GIT_OBJECT_TAG) {
git_object *target;
if ((error = enqueue_tag(&target, push, &spec->loid)) < 0)
goto on_error;
- if (git_object_type(target) == GIT_OBJ_COMMIT) {
+ if (git_object_type(target) == GIT_OBJECT_COMMIT) {
if (git_revwalk_push(rw, git_object_id(target)) < 0) {
git_object_free(target);
goto on_error;
continue;
if (!git_odb_exists(push->repo->_odb, &spec->roid)) {
- giterr_set(GITERR_REFERENCE,
+ git_error_set(GIT_ERROR_REFERENCE,
"cannot push because a reference that you are trying to update on the remote contains commits that are not present locally.");
error = GIT_ENONFASTFORWARD;
goto on_error;
if (error == GIT_ENOTFOUND ||
(!error && !git_oid_equal(&base, &spec->roid))) {
- giterr_set(GITERR_REFERENCE,
+ git_error_set(GIT_ERROR_REFERENCE,
"cannot push non-fastforwardable reference");
error = GIT_ENONFASTFORWARD;
goto on_error;
static int add_update(git_push *push, push_spec *spec)
{
git_push_update *u = git__calloc(1, sizeof(git_push_update));
- GITERR_CHECK_ALLOC(u);
+ GIT_ERROR_CHECK_ALLOC(u);
u->src_refname = git__strdup(spec->refspec.src);
- GITERR_CHECK_ALLOC(u->src_refname);
+ GIT_ERROR_CHECK_ALLOC(u->src_refname);
u->dst_refname = git__strdup(spec->refspec.dst);
- GITERR_CHECK_ALLOC(u->dst_refname);
+ GIT_ERROR_CHECK_ALLOC(u->dst_refname);
git_oid_cpy(&u->src, &spec->roid);
git_oid_cpy(&u->dst, &spec->loid);
/* This is a create or update. Local ref must exist. */
if (git_reference_name_to_id(
&spec->loid, push->repo, spec->refspec.src) < 0) {
- giterr_set(GITERR_REFERENCE, "no such reference '%s'", spec->refspec.src);
+ git_error_set(GIT_ERROR_REFERENCE, "no such reference '%s'", spec->refspec.src);
return -1;
}
}
git_transport *transport = push->remote->transport;
if (!transport->push) {
- giterr_set(GITERR_NET, "remote transport doesn't support push");
+ git_error_set(GIT_ERROR_NET, "remote transport doesn't support push");
error = -1;
goto on_error;
}
int error;
if (!git_remote_connected(push->remote) &&
- (error = git_remote_connect(push->remote, GIT_DIRECTION_PUSH, callbacks, NULL, push->custom_headers)) < 0)
+ (error = git_remote__connect(push->remote, GIT_DIRECTION_PUSH, callbacks, &push->connection)) < 0)
return error;
if ((error = filter_refs(push->remote)) < 0 ||
if (!push->unpack_ok) {
error = -1;
- giterr_set(GITERR_NET, "unpacking the sent packfile failed on the remote");
+ git_error_set(GIT_ERROR_NET, "unpacking the sent packfile failed on the remote");
}
return error;
git_vector_foreach(&push->status, i, status) {
int error = cb(status->ref, status->msg, data);
if (error)
- return giterr_set_after_callback(error);
+ return git_error_set_after_callback(error);
}
return 0;
#include "git2.h"
#include "refspec.h"
+#include "remote.h"
typedef struct push_spec {
struct git_refspec refspec;
/* options */
unsigned pb_parallelism;
- const git_strarray *custom_headers;
+ git_remote_connection_opts connection;
};
/**
--- /dev/null
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#include "reader.h"
+
+#include "fileops.h"
+#include "blob.h"
+
+#include "git2/tree.h"
+#include "git2/blob.h"
+#include "git2/index.h"
+#include "git2/repository.h"
+
+/* tree reader */
+
+typedef struct {
+ git_reader reader;
+ git_tree *tree;
+} tree_reader;
+
+static int tree_reader_read(
+ git_buf *out,
+ git_oid *out_id,
+ git_filemode_t *out_filemode,
+ git_reader *_reader,
+ const char *filename)
+{
+ tree_reader *reader = (tree_reader *)_reader;
+ git_tree_entry *tree_entry = NULL;
+ git_blob *blob = NULL;
+ git_off_t blobsize;
+ int error;
+
+ if ((error = git_tree_entry_bypath(&tree_entry, reader->tree, filename)) < 0 ||
+ (error = git_blob_lookup(&blob, git_tree_owner(reader->tree), git_tree_entry_id(tree_entry))) < 0)
+ goto done;
+
+ blobsize = git_blob_rawsize(blob);
+ GIT_ERROR_CHECK_BLOBSIZE(blobsize);
+
+ if ((error = git_buf_set(out, git_blob_rawcontent(blob), (size_t)blobsize)) < 0)
+ goto done;
+
+ if (out_id)
+ git_oid_cpy(out_id, git_tree_entry_id(tree_entry));
+
+ if (out_filemode)
+ *out_filemode = git_tree_entry_filemode(tree_entry);
+
+done:
+ git_blob_free(blob);
+ git_tree_entry_free(tree_entry);
+ return error;
+}
+
+int git_reader_for_tree(git_reader **out, git_tree *tree)
+{
+ tree_reader *reader;
+
+ assert(out && tree);
+
+ reader = git__calloc(1, sizeof(tree_reader));
+ GIT_ERROR_CHECK_ALLOC(reader);
+
+ reader->reader.read = tree_reader_read;
+ reader->tree = tree;
+
+ *out = (git_reader *)reader;
+ return 0;
+}
+
+/* workdir reader */
+
+typedef struct {
+ git_reader reader;
+ git_repository *repo;
+ git_index *index;
+} workdir_reader;
+
+static int workdir_reader_read(
+ git_buf *out,
+ git_oid *out_id,
+ git_filemode_t *out_filemode,
+ git_reader *_reader,
+ const char *filename)
+{
+ workdir_reader *reader = (workdir_reader *)_reader;
+ git_buf path = GIT_BUF_INIT;
+ struct stat st;
+ git_filemode_t filemode;
+ git_filter_list *filters = NULL;
+ const git_index_entry *idx_entry;
+ git_oid id;
+ int error;
+
+ if ((error = git_buf_joinpath(&path,
+ git_repository_workdir(reader->repo), filename)) < 0)
+ goto done;
+
+ if ((error = p_lstat(path.ptr, &st)) < 0) {
+ if (error == -1 && errno == ENOENT)
+ error = GIT_ENOTFOUND;
+
+ git_error_set(GIT_ERROR_OS, "could not stat '%s'", path.ptr);
+ goto done;
+ }
+
+ filemode = git_futils_canonical_mode(st.st_mode);
+
+ /*
+ * Patch application - for example - uses the filtered version of
+ * the working directory data to match git. So we will run the
+ * workdir -> ODB filter on the contents in this workdir reader.
+ */
+ if ((error = git_filter_list_load(&filters, reader->repo, NULL, filename,
+ GIT_FILTER_TO_ODB, GIT_FILTER_DEFAULT)) < 0)
+ goto done;
+
+ if ((error = git_filter_list_apply_to_file(out,
+ filters, reader->repo, path.ptr)) < 0)
+ goto done;
+
+ if (out_id || reader->index) {
+ if ((error = git_odb_hash(&id, out->ptr, out->size, GIT_OBJECT_BLOB)) < 0)
+ goto done;
+ }
+
+ if (reader->index) {
+ if (!(idx_entry = git_index_get_bypath(reader->index, filename, 0)) ||
+ filemode != idx_entry->mode ||
+ !git_oid_equal(&id, &idx_entry->id)) {
+ error = GIT_READER_MISMATCH;
+ goto done;
+ }
+ }
+
+ if (out_id)
+ git_oid_cpy(out_id, &id);
+
+ if (out_filemode)
+ *out_filemode = filemode;
+
+done:
+ git_filter_list_free(filters);
+ git_buf_dispose(&path);
+ return error;
+}
+
+int git_reader_for_workdir(
+ git_reader **out,
+ git_repository *repo,
+ bool validate_index)
+{
+ workdir_reader *reader;
+ int error;
+
+ assert(out && repo);
+
+ reader = git__calloc(1, sizeof(workdir_reader));
+ GIT_ERROR_CHECK_ALLOC(reader);
+
+ reader->reader.read = workdir_reader_read;
+ reader->repo = repo;
+
+ if (validate_index &&
+ (error = git_repository_index__weakptr(&reader->index, repo)) < 0) {
+ git__free(reader);
+ return error;
+ }
+
+ *out = (git_reader *)reader;
+ return 0;
+}
+
+/* index reader */
+
+typedef struct {
+ git_reader reader;
+ git_repository *repo;
+ git_index *index;
+} index_reader;
+
+static int index_reader_read(
+ git_buf *out,
+ git_oid *out_id,
+ git_filemode_t *out_filemode,
+ git_reader *_reader,
+ const char *filename)
+{
+ index_reader *reader = (index_reader *)_reader;
+ const git_index_entry *entry;
+ git_blob *blob;
+ int error;
+
+ if ((entry = git_index_get_bypath(reader->index, filename, 0)) == NULL)
+ return GIT_ENOTFOUND;
+
+ if ((error = git_blob_lookup(&blob, reader->repo, &entry->id)) < 0)
+ goto done;
+
+ if (out_id)
+ git_oid_cpy(out_id, &entry->id);
+
+ if (out_filemode)
+ *out_filemode = entry->mode;
+
+ error = git_blob__getbuf(out, blob);
+
+done:
+ git_blob_free(blob);
+ return error;
+}
+
+int git_reader_for_index(
+ git_reader **out,
+ git_repository *repo,
+ git_index *index)
+{
+ index_reader *reader;
+ int error;
+
+ assert(out && repo);
+
+ reader = git__calloc(1, sizeof(index_reader));
+ GIT_ERROR_CHECK_ALLOC(reader);
+
+ reader->reader.read = index_reader_read;
+ reader->repo = repo;
+
+ if (index) {
+ reader->index = index;
+ } else if ((error = git_repository_index__weakptr(&reader->index, repo)) < 0) {
+ git__free(reader);
+ return error;
+ }
+
+ *out = (git_reader *)reader;
+ return 0;
+}
+
+/* generic */
+
+int git_reader_read(
+ git_buf *out,
+ git_oid *out_id,
+ git_filemode_t *out_filemode,
+ git_reader *reader,
+ const char *filename)
+{
+ assert(out && reader && filename);
+
+ return reader->read(out, out_id, out_filemode, reader, filename);
+}
+
+void git_reader_free(git_reader *reader)
+{
+ if (!reader)
+ return;
+
+ git__free(reader);
+}
--- /dev/null
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+#ifndef INCLUDE_reader_h__
+#define INCLUDE_reader_h__
+
+#include "common.h"
+
+/* Returned when the workdir does not match the index */
+#define GIT_READER_MISMATCH 1
+
+typedef struct git_reader git_reader;
+
+/*
+ * The `git_reader` structure is a generic interface for reading the
+ * contents of a file by its name, and implementations are provided
+ * for reading out of a tree, the index, and the working directory.
+ *
+ * Note that the reader implementation is meant to have a short
+ * lifecycle and does not increase the refcount of the object that
+ * it's reading. Callers should ensure that they do not use a
+ * reader after disposing the underlying object that it reads.
+ */
+struct git_reader {
+ int (*read)(git_buf *out, git_oid *out_oid, git_filemode_t *mode, git_reader *reader, const char *filename);
+};
+
+/**
+ * Create a `git_reader` that will allow random access to the given
+ * tree. Paths requested via `git_reader_read` will be rooted at this
+ * tree, callers are not expected to recurse through tree lookups. Thus,
+ * you can request to read `/src/foo.c` and the tree provided to this
+ * function will be searched to find another tree named `src`, which
+ * will then be opened to find `foo.c`.
+ *
+ * @param out The reader for the given tree
+ * @param tree The tree object to read
+ * @return 0 on success, or an error code < 0
+ */
+extern int git_reader_for_tree(
+ git_reader **out,
+ git_tree *tree);
+
+/**
+ * Create a `git_reader` that will allow random access to the given
+ * index, or the repository's index.
+ *
+ * @param out The reader for the given index
+ * @param repo The repository containing the index
+ * @param index The index to read, or NULL to use the repository's index
+ * @return 0 on success, or an error code < 0
+ */
+extern int git_reader_for_index(
+ git_reader **out,
+ git_repository *repo,
+ git_index *index);
+
+/**
+ * Create a `git_reader` that will allow random access to the given
+ * repository's working directory. Note that the contents are read
+ * in repository format, meaning any workdir -> odb filters are
+ * applied.
+ *
+ * If `validate_index` is set to true, reads of files will hash the
+ * on-disk contents and ensure that the resulting object ID matches
+ * the repository's index. This ensures that the working directory
+ * is unmodified from the index contents.
+ *
+ * @param out The reader for the given working directory
+ * @param repo The repository containing the working directory
+ * @param validate_index If true, the working directory contents will
+ * be compared to the index contents during read to ensure that
+ * the working directory is unmodified.
+ * @return 0 on success, or an error code < 0
+ */
+extern int git_reader_for_workdir(
+ git_reader **out,
+ git_repository *repo,
+ bool validate_index);
+
+/**
+ * Read the given filename from the reader and populate the given buffer
+ * with the contents and the given oid with the object ID.
+ *
+ * @param out The buffer to populate with the file contents
+ * @param out_id The oid to populate with the object ID
+ * @param reader The reader to read
+ * @param filename The filename to read from the reader
+ */
+extern int git_reader_read(
+ git_buf *out,
+ git_oid *out_id,
+ git_filemode_t *out_filemode,
+ git_reader *reader,
+ const char *filename);
+
+/**
+ * Free the given reader and any associated objects.
+ *
+ * @param reader The reader to free
+ */
+extern void git_reader_free(git_reader *reader);
+
+#endif
if (type != GIT_REBASE_TYPE_NONE && path_out)
*path_out = git_buf_detach(&path);
- git_buf_free(&path);
+ git_buf_dispose(&path);
return 0;
}
return error;
if (git__strntol32(&num, asc_out->ptr, asc_out->size, &eol, 10) < 0 || num < 0 || *eol) {
- giterr_set(GITERR_REBASE, "the file '%s' contains an invalid numeric value", filename);
+ git_error_set(GIT_ERROR_REBASE, "the file '%s' contains an invalid numeric value", filename);
return -1;
}
return error;
if (str_out->size != GIT_OID_HEXSZ || git_oid_fromstr(out, str_out->ptr) < 0) {
- giterr_set(GITERR_REBASE, "the file '%s' contains an invalid object ID", filename);
+ git_error_set(GIT_ERROR_REBASE, "the file '%s' contains an invalid object ID", filename);
return -1;
}
/* Read cmt.* */
git_array_init_to_size(rebase->operations, end);
- GITERR_CHECK_ARRAY(rebase->operations);
+ GIT_ERROR_CHECK_ARRAY(rebase->operations);
for (i = 0; i < end; i++) {
git_buf_clear(&cmt);
goto done;
operation = rebase_operation_alloc(rebase, GIT_REBASE_OPERATION_PICK, &id, NULL);
- GITERR_CHECK_ALLOC(operation);
+ GIT_ERROR_CHECK_ALLOC(operation);
}
/* Read 'onto_name' */
rebase->onto_name = git_buf_detach(&buf);
done:
- git_buf_free(&cmt);
- git_buf_free(&state_path);
- git_buf_free(&buf);
+ git_buf_dispose(&cmt);
+ git_buf_dispose(&state_path);
+ git_buf_dispose(&buf);
return error;
}
static int rebase_alloc(git_rebase **out, const git_rebase_options *rebase_opts)
{
git_rebase *rebase = git__calloc(1, sizeof(git_rebase));
- GITERR_CHECK_ALLOC(rebase);
+ GIT_ERROR_CHECK_ALLOC(rebase);
*out = NULL;
if (rebase_opts && rebase_opts->rewrite_notes_ref) {
rebase->options.rewrite_notes_ref = git__strdup(rebase_opts->rewrite_notes_ref);
- GITERR_CHECK_ALLOC(rebase->options.rewrite_notes_ref);
+ GIT_ERROR_CHECK_ALLOC(rebase->options.rewrite_notes_ref);
}
- if ((rebase->options.checkout_options.checkout_strategy & (GIT_CHECKOUT_SAFE | GIT_CHECKOUT_FORCE)) == 0)
- rebase->options.checkout_options.checkout_strategy = GIT_CHECKOUT_SAFE;
-
*out = rebase;
return 0;
static int rebase_check_versions(const git_rebase_options *given_opts)
{
- GITERR_CHECK_VERSION(given_opts, GIT_REBASE_OPTIONS_VERSION, "git_rebase_options");
+ GIT_ERROR_CHECK_VERSION(given_opts, GIT_REBASE_OPTIONS_VERSION, "git_rebase_options");
if (given_opts)
- GITERR_CHECK_VERSION(&given_opts->checkout_options, GIT_CHECKOUT_OPTIONS_VERSION, "git_checkout_options");
+ GIT_ERROR_CHECK_VERSION(&given_opts->checkout_options, GIT_CHECKOUT_OPTIONS_VERSION, "git_checkout_options");
return 0;
}
goto done;
if (rebase->type == GIT_REBASE_TYPE_NONE) {
- giterr_set(GITERR_REBASE, "there is no rebase in progress");
+ git_error_set(GIT_ERROR_REBASE, "there is no rebase in progress");
error = GIT_ENOTFOUND;
goto done;
}
switch (rebase->type) {
case GIT_REBASE_TYPE_INTERACTIVE:
- giterr_set(GITERR_REBASE, "interactive rebase is not supported");
+ git_error_set(GIT_ERROR_REBASE, "interactive rebase is not supported");
error = -1;
break;
case GIT_REBASE_TYPE_MERGE:
error = rebase_open_merge(rebase);
break;
case GIT_REBASE_TYPE_APPLY:
- giterr_set(GITERR_REBASE, "patch application rebase is not supported");
+ git_error_set(GIT_ERROR_REBASE, "patch application rebase is not supported");
error = -1;
break;
default:
else
git_rebase_free(rebase);
- git_buf_free(&path);
- git_buf_free(&orig_head_name);
- git_buf_free(&orig_head_id);
- git_buf_free(&onto_id);
+ git_buf_dispose(&path);
+ git_buf_dispose(&orig_head_name);
+ git_buf_dispose(&orig_head_id);
+ git_buf_dispose(&onto_id);
return error;
}
if ((error = git_buf_joinpath(&path, rebase->state_path, filename)) == 0)
error = git_futils_writebuffer(&contents, path.ptr, flags, REBASE_FILE_MODE);
- git_buf_free(&path);
- git_buf_free(&contents);
+ git_buf_dispose(&path);
+ git_buf_dispose(&contents);
return error;
}
}
done:
- git_buf_free(&commit_filename);
+ git_buf_dispose(&commit_filename);
return error;
}
git_oid_fmt(orig_head, &rebase->orig_head_id);
if (p_mkdir(rebase->state_path, REBASE_DIR_MODE) < 0) {
- giterr_set(GITERR_OS, "failed to create rebase directory '%s'", rebase->state_path);
+ git_error_set(GIT_ERROR_OS, "failed to create rebase directory '%s'", rebase->state_path);
return -1;
}
return error;
if (type != GIT_REBASE_TYPE_NONE) {
- giterr_set(GITERR_REBASE, "there is an existing rebase in progress");
+ git_error_set(GIT_ERROR_REBASE, "there is an existing rebase in progress");
return -1;
}
goto done;
if (git_diff_num_deltas(diff) > 0) {
- giterr_set(GITERR_REBASE, "uncommitted changes exist in index");
+ git_error_set(GIT_ERROR_REBASE, "uncommitted changes exist in index");
error = fail_with;
goto done;
}
goto done;
if (git_diff_num_deltas(diff) > 0) {
- giterr_set(GITERR_REBASE, "unstaged changes exist in workdir");
+ git_error_set(GIT_ERROR_REBASE, "unstaged changes exist in workdir");
error = fail_with;
goto done;
}
continue;
operation = rebase_operation_alloc(rebase, GIT_REBASE_OPERATION_PICK, &id, NULL);
- GITERR_CHECK_ALLOC(operation);
+ GIT_ERROR_CHECK_ALLOC(operation);
}
error = 0;
goto done;
rebase->state_path = git_buf_detach(&state_path);
- GITERR_CHECK_ALLOC(rebase->state_path);
+ GIT_ERROR_CHECK_ALLOC(rebase->state_path);
if (branch->ref_name && strcmp(branch->ref_name, "HEAD")) {
rebase->orig_head_name = git__strdup(branch->ref_name);
- GITERR_CHECK_ALLOC(rebase->orig_head_name);
+ GIT_ERROR_CHECK_ALLOC(rebase->orig_head_name);
} else {
rebase->head_detached = 1;
}
rebase->onto_name = git__strdup(rebase_onto_name(onto));
- GITERR_CHECK_ALLOC(rebase->onto_name);
+ GIT_ERROR_CHECK_ALLOC(rebase->onto_name);
rebase->quiet = rebase->options.quiet;
done:
git_reference_free(head_ref);
git_commit_free(onto_commit);
- git_buf_free(&reflog);
- git_buf_free(&state_path);
+ git_buf_dispose(&reflog);
+ git_buf_dispose(&state_path);
return error;
}
goto done;
if ((parent_count = git_commit_parentcount(current_commit)) > 1) {
- giterr_set(GITERR_REBASE, "cannot rebase a merge commit");
+ git_error_set(GIT_ERROR_REBASE, "cannot rebase a merge commit");
error = -1;
goto done;
} else if (parent_count) {
git_tree_free(parent_tree);
git_commit_free(parent_commit);
git_commit_free(current_commit);
- git_buf_free(&path);
+ git_buf_dispose(&path);
return error;
}
goto done;
if ((parent_count = git_commit_parentcount(current_commit)) > 1) {
- giterr_set(GITERR_REBASE, "cannot rebase a merge commit");
+ git_error_set(GIT_ERROR_REBASE, "cannot rebase a merge commit");
error = -1;
goto done;
} else if (parent_count) {
operation = git_array_get(rebase->operations, rebase->current);
if (git_index_has_conflicts(index)) {
- giterr_set(GITERR_REBASE, "conflicts have not been resolved");
+ git_error_set(GIT_ERROR_REBASE, "conflicts have not been resolved");
error = GIT_EUNMERGED;
goto done;
}
goto done;
if (git_oid_equal(&tree_id, git_tree_id(parent_tree))) {
- giterr_set(GITERR_REBASE, "this patch has already been applied");
+ git_error_set(GIT_ERROR_REBASE, "this patch has already been applied");
error = GIT_EAPPLIED;
goto done;
}
if ((error = rebase_ensure_not_dirty(rebase->repo, false, true, GIT_EUNMERGED)) < 0 ||
(error = git_repository_head(&head, rebase->repo)) < 0 ||
- (error = git_reference_peel((git_object **)&head_commit, head, GIT_OBJ_COMMIT)) < 0 ||
+ (error = git_reference_peel((git_object **)&head_commit, head, GIT_OBJECT_COMMIT)) < 0 ||
(error = git_repository_index(&index, rebase->repo)) < 0 ||
(error = rebase_commit__create(&commit, rebase, index, head_commit,
author, committer, message_encoding, message)) < 0 ||
if (error != GIT_ENOTFOUND)
goto done;
- giterr_clear();
+ git_error_clear();
do_rewrite = 1;
}
if ((error = git_note_read(¬e, rebase->repo, notes_ref, from)) < 0) {
if (error == GIT_ENOTFOUND) {
- giterr_clear();
+ git_error_clear();
error = 0;
}
(error = git_signature_now(&who, "unknown", "unknown")) < 0)
goto done;
- giterr_clear();
+ git_error_clear();
}
committer = who;
if ((error = notes_ref_lookup(¬es_ref, rebase)) < 0) {
if (error == GIT_ENOTFOUND) {
- giterr_clear();
+ git_error_clear();
error = 0;
}
goto done;
on_error:
- giterr_set(GITERR_REBASE, "invalid rewritten file at line %d", linenum);
+ git_error_set(GIT_ERROR_REBASE, "invalid rewritten file at line %d", linenum);
error = -1;
done:
- git_buf_free(&rewritten);
- git_buf_free(&path);
- git_buf_free(¬es_ref);
+ git_buf_dispose(&rewritten);
+ git_buf_dispose(&path);
+ git_buf_dispose(¬es_ref);
return error;
}
rebase->orig_head_name)) == 0 &&
(error = git_repository_head(&terminal_ref, rebase->repo)) == 0 &&
(error = git_reference_peel((git_object **)&terminal_commit,
- terminal_ref, GIT_OBJ_COMMIT)) == 0 &&
+ terminal_ref, GIT_OBJECT_COMMIT)) == 0 &&
(error = git_reference_create_matching(&branch_ref,
rebase->repo, rebase->orig_head_name,
git_commit_id(terminal_commit), 1,
rebase->repo, GIT_HEAD_FILE, rebase->orig_head_name, 1,
head_msg.ptr);
- git_buf_free(&head_msg);
- git_buf_free(&branch_msg);
+ git_buf_dispose(&head_msg);
+ git_buf_dispose(&branch_msg);
git_commit_free(terminal_commit);
git_reference_free(head_ref);
git_reference_free(branch_ref);
assert(out && repo);
db = git__calloc(1, sizeof(*db));
- GITERR_CHECK_ALLOC(db);
+ GIT_ERROR_CHECK_ALLOC(db);
db->repo = repo;
int error;
if (!db->backend || !db->backend->iterator) {
- giterr_set(GITERR_REFERENCE, "this backend doesn't support iterators");
+ git_error_set(GIT_ERROR_REFERENCE, "this backend doesn't support iterators");
return -1;
}
assert(payload && db && refname);
if (!db->backend->lock) {
- giterr_set(GITERR_REFERENCE, "backend does not support locking");
+ git_error_set(GIT_ERROR_REFERENCE, "backend does not support locking");
return -1;
}
if (error <= 0) {
if (error == GIT_ENOTFOUND) {
git_sortedcache_clear(backend->refcache, true);
- giterr_clear();
+ git_error_clear();
error = 0;
}
return error;
}
git_sortedcache_wunlock(backend->refcache);
- git_buf_free(&packedrefs);
+ git_buf_dispose(&packedrefs);
return 0;
parse_failed:
- giterr_set(GITERR_REFERENCE, "corrupted packed references file");
+ git_error_set(GIT_ERROR_REFERENCE, "corrupted packed references file");
git_sortedcache_clear(backend->refcache, false);
git_sortedcache_wunlock(backend->refcache);
- git_buf_free(&packedrefs);
+ git_buf_dispose(&packedrefs);
return -1;
}
return 0;
corrupted:
- giterr_set(GITERR_REFERENCE, "corrupted loose reference file: %s", filename);
+ git_error_set(GIT_ERROR_REFERENCE, "corrupted loose reference file: %s", filename);
return -1;
}
/* build full path to file */
if ((error = git_buf_joinpath(buf, base, path)) < 0 ||
(error = git_futils_readbuffer(buf, buf->ptr)) < 0)
- git_buf_free(buf);
+ git_buf_dispose(buf);
return error;
}
* the filesystem under us and skip it...
*/
if (loose_readbuffer(&ref_file, backend->gitpath, name) < 0) {
- giterr_clear();
+ git_error_clear();
goto done;
}
git_sortedcache_wunlock(backend->refcache);
done:
- git_buf_free(&ref_file);
+ git_buf_dispose(&ref_file);
return error;
}
full_path, backend->direach_flags, _dirent_loose_load, backend);
/* Race with the filesystem, ignore it */
if (error == GIT_ENOTFOUND) {
- giterr_clear();
+ git_error_clear();
return 0;
}
error = git_path_direach(
&refs_path, backend->direach_flags, _dirent_loose_load, backend);
- git_buf_free(&refs_path);
+ git_buf_dispose(&refs_path);
return error;
}
*exists = git_path_isfile(ref_path.ptr) ||
(git_sortedcache_lookup(backend->refcache, ref_name) != NULL);
- git_buf_free(&ref_path);
+ git_buf_dispose(&ref_path);
return 0;
}
refname_start = (const char *)file_content->ptr;
if (git_buf_len(file_content) < header_len + 1) {
- giterr_set(GITERR_REFERENCE, "corrupted loose reference file");
+ git_error_set(GIT_ERROR_REFERENCE, "corrupted loose reference file");
return NULL;
}
*out = git_reference__alloc(ref_name, &oid, NULL);
}
- git_buf_free(&ref_file);
+ git_buf_dispose(&ref_file);
return error;
}
static int ref_error_notfound(const char *name)
{
- giterr_set(GITERR_REFERENCE, "reference '%s' not found", name);
+ git_error_set(GIT_ERROR_REFERENCE, "reference '%s' not found", name);
return GIT_ENOTFOUND;
}
/* only try to lookup this reference on the packfile if it
* wasn't found on the loose refs; not if there was a critical error */
if (error == GIT_ENOTFOUND) {
- giterr_clear();
+ git_error_clear();
error = packed_lookup(out, backend, ref_name);
}
git_iterator *fsit = NULL;
git_iterator_options fsit_opts = GIT_ITERATOR_OPTIONS_INIT;
const git_index_entry *entry = NULL;
+ const char *ref_prefix = GIT_REFS_DIR;
+ size_t ref_prefix_len = strlen(ref_prefix);
if (!backend->commonpath) /* do nothing if no commonpath for loose refs */
return 0;
fsit_opts.flags = backend->iterator_flags;
- if ((error = git_buf_printf(&path, "%s/refs", backend->commonpath)) < 0 ||
- (error = git_iterator_for_filesystem(&fsit, path.ptr, &fsit_opts)) < 0) {
- git_buf_free(&path);
+ if (iter->glob) {
+ const char *last_sep = NULL;
+ const char *pos;
+ for (pos = iter->glob; *pos; ++pos) {
+ switch (*pos) {
+ case '?':
+ case '*':
+ case '[':
+ case '\\':
+ break;
+ case '/':
+ last_sep = pos;
+ /* FALLTHROUGH */
+ default:
+ continue;
+ }
+ break;
+ }
+ if (last_sep) {
+ ref_prefix = iter->glob;
+ ref_prefix_len = (last_sep - ref_prefix) + 1;
+ }
+ }
+
+ if ((error = git_buf_printf(&path, "%s/", backend->commonpath)) < 0 ||
+ (error = git_buf_put(&path, ref_prefix, ref_prefix_len)) < 0) {
+ git_buf_dispose(&path);
return error;
}
- error = git_buf_sets(&path, GIT_REFS_DIR);
+ if ((error = git_iterator_for_filesystem(&fsit, path.ptr, &fsit_opts)) < 0) {
+ git_buf_dispose(&path);
+ return (iter->glob && error == GIT_ENOTFOUND)? 0 : error;
+ }
+
+ error = git_buf_sets(&path, ref_prefix);
while (!error && !git_iterator_advance(&entry, fsit)) {
const char *ref_name;
struct packref *ref;
char *ref_dup;
- git_buf_truncate(&path, strlen(GIT_REFS_DIR));
+ git_buf_truncate(&path, ref_prefix_len);
git_buf_puts(&path, entry->path);
ref_name = git_buf_cstr(&path);
}
git_iterator_free(fsit);
- git_buf_free(&path);
+ git_buf_dispose(&path);
return error;
}
if (loose_lookup(out, backend, path) == 0)
return 0;
- giterr_clear();
+ git_error_clear();
}
if (!iter->cache) {
return 0;
}
- giterr_clear();
+ git_error_clear();
}
if (!iter->cache) {
return error;
iter = git__calloc(1, sizeof(refdb_fs_iter));
- GITERR_CHECK_ALLOC(iter);
+ GIT_ERROR_CHECK_ALLOC(iter);
git_pool_init(&iter->pool, 1);
}
if (exists) {
- giterr_set(GITERR_REFERENCE,
+ git_error_set(GIT_ERROR_REFERENCE,
"failed to write reference '%s': a reference with "
"that name already exists.", new_ref);
return GIT_EEXISTS;
if (ref && !ref_is_available(old_ref, new_ref, ref->name)) {
git_sortedcache_runlock(backend->refcache);
- giterr_set(GITERR_REFERENCE,
+ git_error_set(GIT_ERROR_REFERENCE,
"path to reference '%s' collides with existing one", new_ref);
return -1;
}
assert(file && backend && name);
if (!git_path_isvalid(backend->repo, name, 0, GIT_PATH_REJECT_FILESYSTEM_DEFAULTS)) {
- giterr_set(GITERR_INVALID, "invalid reference name '%s'", name);
+ git_error_set(GIT_ERROR_INVALID, "invalid reference name '%s'", name);
return GIT_EINVALIDSPEC;
}
error = git_filebuf_open(file, ref_path.ptr, filebuf_flags, GIT_REFS_FILE_MODE);
if (error == GIT_EDIRECTORY)
- giterr_set(GITERR_REFERENCE, "cannot lock ref '%s', there are refs beneath that folder", name);
+ git_error_set(GIT_ERROR_REFERENCE, "cannot lock ref '%s', there are refs beneath that folder", name);
- git_buf_free(&ref_path);
+ git_buf_dispose(&ref_path);
return error;
}
{
assert(file && ref);
- if (ref->type == GIT_REF_OID) {
+ if (ref->type == GIT_REFERENCE_DIRECT) {
char oid[GIT_OID_HEXSZ + 1];
git_oid_nfmt(oid, sizeof(oid), &ref->target.oid);
git_filebuf_printf(file, "%s\n", oid);
- } else if (ref->type == GIT_REF_SYMBOLIC) {
+ } else if (ref->type == GIT_REFERENCE_SYMBOLIC) {
git_filebuf_printf(file, GIT_SYMREF "%s\n", ref->target.symbolic);
} else {
assert(0); /* don't let this happen */
refdb_fs_backend *backend = (refdb_fs_backend *) _backend;
lock = git__calloc(1, sizeof(git_filebuf));
- GITERR_CHECK_ALLOC(lock);
+ GIT_ERROR_CHECK_ALLOC(lock);
if ((error = loose_lock(lock, backend, refname)) < 0) {
git__free(lock);
/*
* Find the tagged object in the repository
*/
- if (git_object_lookup(&object, backend->repo, &ref->oid, GIT_OBJ_ANY) < 0)
+ if (git_object_lookup(&object, backend->repo, &ref->oid, GIT_OBJECT_ANY) < 0)
return -1;
/*
* if the ref is actually a 'weak' ref, we don't need to resolve
* anything.
*/
- if (git_object_type(object) == GIT_OBJ_TAG) {
+ if (git_object_type(object) == GIT_OBJECT_TAG) {
git_tag *tag = (git_tag *)object;
/*
continue;
if (error < 0) {
- git_buf_free(&ref_content);
- giterr_set(GITERR_REFERENCE, "failed to lock loose reference '%s'", ref->name);
+ git_buf_dispose(&ref_content);
+ git_error_set(GIT_ERROR_REFERENCE, "failed to lock loose reference '%s'", ref->name);
return error;
}
p_unlink(lock.path_original);
}
- git_buf_free(&ref_content);
+ git_buf_dispose(&ref_content);
git_filebuf_cleanup(&lock);
return 0;
}
static int reflog_append(refdb_fs_backend *backend, const git_reference *ref, const git_oid *old, const git_oid *new, const git_signature *author, const char *message);
static int has_reflog(git_repository *repo, const char *name);
-/* We only write if it's under heads/, remotes/ or notes/ or if it already has a log */
static int should_write_reflog(int *write, git_repository *repo, const char *name)
{
int error, logall;
if (logall == GIT_LOGALLREFUPDATES_UNSET)
logall = !git_repository_is_bare(repo);
- if (!logall) {
+ *write = 0;
+ switch (logall) {
+ case GIT_LOGALLREFUPDATES_FALSE:
*write = 0;
- } else if (has_reflog(repo, name)) {
- *write = 1;
- } else if (!git__prefixcmp(name, GIT_REFS_HEADS_DIR) ||
- !git__strcmp(name, GIT_HEAD_FILE) ||
- !git__prefixcmp(name, GIT_REFS_REMOTES_DIR) ||
- !git__prefixcmp(name, GIT_REFS_NOTES_DIR)) {
+ break;
+
+ case GIT_LOGALLREFUPDATES_TRUE:
+ /* Only write if it already has a log,
+ * or if it's under heads/, remotes/ or notes/
+ */
+ *write = has_reflog(repo, name) ||
+ !git__prefixcmp(name, GIT_REFS_HEADS_DIR) ||
+ !git__strcmp(name, GIT_HEAD_FILE) ||
+ !git__prefixcmp(name, GIT_REFS_REMOTES_DIR) ||
+ !git__prefixcmp(name, GIT_REFS_NOTES_DIR);
+ break;
+
+ case GIT_LOGALLREFUPDATES_ALWAYS:
*write = 1;
- } else {
- *write = 0;
+ break;
}
return 0;
goto out;
/* If the types don't match, there's no way the values do */
- if (old_id && old_ref->type != GIT_REF_OID) {
+ if (old_id && old_ref->type != GIT_REFERENCE_DIRECT) {
*cmp = -1;
goto out;
}
- if (old_target && old_ref->type != GIT_REF_SYMBOLIC) {
+ if (old_target && old_ref->type != GIT_REFERENCE_SYMBOLIC) {
*cmp = 1;
goto out;
}
- if (old_id && old_ref->type == GIT_REF_OID)
+ if (old_id && old_ref->type == GIT_REFERENCE_DIRECT)
*cmp = git_oid_cmp(old_id, &old_ref->target.oid);
- if (old_target && old_ref->type == GIT_REF_SYMBOLIC)
+ if (old_target && old_ref->type == GIT_REFERENCE_SYMBOLIC)
*cmp = git__strcmp(old_target, old_ref->target.symbolic);
out:
git_reference *tmp = NULL, *head = NULL, *peeled = NULL;
const char *name;
- if (ref->type == GIT_REF_SYMBOLIC)
+ if (ref->type == GIT_REFERENCE_SYMBOLIC)
return 0;
/* if we can't resolve, we use {0}*40 as old id */
if ((error = git_reference_lookup(&head, backend->repo, GIT_HEAD_FILE)) < 0)
return error;
- if (git_reference_type(head) == GIT_REF_OID)
+ if (git_reference_type(head) == GIT_REFERENCE_DIRECT)
goto cleanup;
if ((error = git_reference_lookup(&tmp, backend->repo, GIT_HEAD_FILE)) < 0)
goto cleanup;
/* Go down the symref chain until we find the branch */
- while (git_reference_type(tmp) == GIT_REF_SYMBOLIC) {
+ while (git_reference_type(tmp) == GIT_REFERENCE_SYMBOLIC) {
error = git_reference_lookup(&peeled, backend->repo, git_reference_symbolic_target(tmp));
if (error < 0)
break;
goto on_error;
if (cmp) {
- giterr_set(GITERR_REFERENCE, "old reference value does not match");
+ git_error_set(GIT_ERROR_REFERENCE, "old reference value does not match");
error = GIT_EMODIFIED;
goto on_error;
}
- if (ref->type == GIT_REF_SYMBOLIC)
+ if (ref->type == GIT_REFERENCE_SYMBOLIC)
new_target = ref->target.symbolic;
else
new_id = &ref->target.oid;
return error;
}
+static void refdb_fs_backend__try_delete_empty_ref_hierarchie(
+ refdb_fs_backend *backend,
+ const char *ref_name,
+ bool reflog)
+{
+ git_buf relative_path = GIT_BUF_INIT;
+ git_buf base_path = GIT_BUF_INIT;
+ size_t commonlen;
+
+ assert(backend && ref_name);
+
+ if (git_buf_sets(&relative_path, ref_name) < 0)
+ goto cleanup;
+
+ git_path_squash_slashes(&relative_path);
+ if ((commonlen = git_path_common_dirlen("refs/heads/", git_buf_cstr(&relative_path))) == strlen("refs/heads/") ||
+ (commonlen = git_path_common_dirlen("refs/tags/", git_buf_cstr(&relative_path))) == strlen("refs/tags/") ||
+ (commonlen = git_path_common_dirlen("refs/remotes/", git_buf_cstr(&relative_path))) == strlen("refs/remotes/")) {
+
+ git_buf_truncate(&relative_path, commonlen);
+
+ if (reflog) {
+ if (git_buf_join3(&base_path, '/', backend->commonpath, GIT_REFLOG_DIR, git_buf_cstr(&relative_path)) < 0)
+ goto cleanup;
+ } else {
+ if (git_buf_joinpath(&base_path, backend->commonpath, git_buf_cstr(&relative_path)) < 0)
+ goto cleanup;
+ }
+
+ git_futils_rmdir_r(ref_name + commonlen, git_buf_cstr(&base_path), GIT_RMDIR_EMPTY_PARENTS | GIT_RMDIR_SKIP_ROOT);
+ }
+
+cleanup:
+ git_buf_dispose(&relative_path);
+ git_buf_dispose(&base_path);
+}
+
static int refdb_fs_backend__delete(
git_refdb_backend *_backend,
const char *ref_name,
goto cleanup;
if (cmp) {
- giterr_set(GITERR_REFERENCE, "old reference value does not match");
+ git_error_set(GIT_ERROR_REFERENCE, "old reference value does not match");
error = GIT_EMODIFIED;
goto cleanup;
}
/* If a loose reference exists, remove it from the filesystem */
- if (git_buf_joinpath(&loose_path, backend->gitpath, ref_name) < 0)
+ if (git_buf_joinpath(&loose_path, backend->commonpath, ref_name) < 0)
return -1;
error = packed_write(backend);
cleanup:
- git_buf_free(&loose_path);
+ git_buf_dispose(&loose_path);
git_filebuf_cleanup(file);
-
+ if (loose_deleted)
+ refdb_fs_backend__try_delete_empty_ref_hierarchie(backend, ref_name, false);
return error;
}
out = git_buf_detach(&path);
done:
- git_buf_free(&path);
+ git_buf_dispose(&path);
return out;
}
*reflog = NULL;
log = git__calloc(1, sizeof(git_reflog));
- GITERR_CHECK_ALLOC(log);
+ GIT_ERROR_CHECK_ALLOC(log);
log->ref_name = git__strdup(name);
- GITERR_CHECK_ALLOC(log->ref_name);
+ GIT_ERROR_CHECK_ALLOC(log->ref_name);
if (git_vector_init(&log->entries, 0, NULL) < 0) {
git__free(log->ref_name);
#define seek_forward(_increase) do { \
if (_increase >= buf_size) { \
- giterr_set(GITERR_INVALID, "ran out of data while parsing reflog"); \
+ git_error_set(GIT_ERROR_INVALID, "ran out of data while parsing reflog"); \
goto fail; \
} \
buf += _increase; \
while (buf_size > GIT_REFLOG_SIZE_MIN) {
entry = git__calloc(1, sizeof(git_reflog_entry));
- GITERR_CHECK_ALLOC(entry);
+ GIT_ERROR_CHECK_ALLOC(entry);
entry->committer = git__calloc(1, sizeof(git_signature));
- GITERR_CHECK_ALLOC(entry->committer);
+ GIT_ERROR_CHECK_ALLOC(entry->committer);
if (git_oid_fromstrn(&entry->oid_old, buf, GIT_OID_HEXSZ) < 0)
goto fail;
seek_forward(1);
entry->msg = git__strndup(ptr, buf - ptr);
- GITERR_CHECK_ALLOC(entry->msg);
+ GIT_ERROR_CHECK_ALLOC(entry->msg);
} else
entry->msg = NULL;
return error;
error = create_new_reflog_file(git_buf_cstr(&path));
- git_buf_free(&path);
+ git_buf_dispose(&path);
return error;
}
ret = git_path_isfile(git_buf_cstr(&path));
cleanup:
- git_buf_free(&path);
+ git_buf_dispose(&path);
return ret;
}
if ((error == GIT_ENOTFOUND) &&
((error = create_new_reflog_file(git_buf_cstr(&log_path))) < 0))
goto cleanup;
-
+
if ((error = reflog_parse(log,
git_buf_cstr(&log_file), git_buf_len(&log_file))) < 0)
goto cleanup;
git_reflog_free(log);
success:
- git_buf_free(&log_file);
- git_buf_free(&log_path);
+ git_buf_dispose(&log_file);
+ git_buf_dispose(&log_path);
return error;
}
repo = backend->repo;
if (!git_path_isvalid(backend->repo, refname, 0, GIT_PATH_REJECT_FILESYSTEM_DEFAULTS)) {
- giterr_set(GITERR_INVALID, "invalid reference name '%s'", refname);
+ git_error_set(GIT_ERROR_INVALID, "invalid reference name '%s'", refname);
return GIT_EINVALIDSPEC;
}
return -1;
if (!git_path_isfile(git_buf_cstr(&log_path))) {
- giterr_set(GITERR_INVALID,
+ git_error_set(GIT_ERROR_INVALID,
"log file for reference '%s' doesn't exist", refname);
error = -1;
goto cleanup;
error = git_filebuf_open(file, git_buf_cstr(&log_path), 0, GIT_REFLOG_FILE_MODE);
cleanup:
- git_buf_free(&log_path);
+ git_buf_dispose(&log_path);
return error;
}
git_filebuf_cleanup(&fbuf);
success:
- git_buf_free(&log);
+ git_buf_dispose(&log);
return error;
}
git_buf buf = GIT_BUF_INIT, path = GIT_BUF_INIT;
git_repository *repo = backend->repo;
- is_symbolic = ref->type == GIT_REF_SYMBOLIC;
+ is_symbolic = ref->type == GIT_REFERENCE_SYMBOLIC;
/* "normal" symbolic updates do not write */
if (is_symbolic &&
if (error == GIT_ENOTFOUND)
return 0;
- giterr_clear();
+ git_error_clear();
}
}
if (error == GIT_ENOTFOUND)
error = 0;
} else if (git_path_isdir(git_buf_cstr(&path))) {
- giterr_set(GITERR_REFERENCE, "cannot create reflog at '%s', there are reflogs beneath that folder",
+ git_error_set(GIT_ERROR_REFERENCE, "cannot create reflog at '%s', there are reflogs beneath that folder",
ref->name);
error = GIT_EDIRECTORY;
}
error = git_futils_writebuffer(&buf, git_buf_cstr(&path), open_flags, GIT_REFLOG_FILE_MODE);
cleanup:
- git_buf_free(&buf);
- git_buf_free(&path);
+ git_buf_dispose(&buf);
+ git_buf_dispose(&path);
return error;
}
repo = backend->repo;
if ((error = git_reference__normalize_name(
- &normalized, new_name, GIT_REF_FORMAT_ALLOW_ONELEVEL)) < 0)
+ &normalized, new_name, GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL)) < 0)
return error;
if (git_buf_joinpath(&temp_path, repo->gitdir, GIT_REFLOG_DIR) < 0)
p_close(fd);
if (p_rename(git_buf_cstr(&old_path), git_buf_cstr(&temp_path)) < 0) {
- giterr_set(GITERR_OS, "failed to rename reflog for %s", new_name);
+ git_error_set(GIT_ERROR_OS, "failed to rename reflog for %s", new_name);
error = -1;
goto cleanup;
}
- if (git_path_isdir(git_buf_cstr(&new_path)) &&
+ if (git_path_isdir(git_buf_cstr(&new_path)) &&
(git_futils_rmdir_r(git_buf_cstr(&new_path), NULL, GIT_RMDIR_SKIP_NONEMPTY) < 0)) {
error = -1;
goto cleanup;
}
if (p_rename(git_buf_cstr(&temp_path), git_buf_cstr(&new_path)) < 0) {
- giterr_set(GITERR_OS, "failed to rename reflog for %s", new_name);
+ git_error_set(GIT_ERROR_OS, "failed to rename reflog for %s", new_name);
error = -1;
}
cleanup:
- git_buf_free(&temp_path);
- git_buf_free(&old_path);
- git_buf_free(&new_path);
- git_buf_free(&normalized);
+ git_buf_dispose(&temp_path);
+ git_buf_dispose(&old_path);
+ git_buf_dispose(&new_path);
+ git_buf_dispose(&normalized);
return error;
}
static int refdb_reflog_fs__delete(git_refdb_backend *_backend, const char *name)
{
- int error;
+ refdb_fs_backend *backend = (refdb_fs_backend *) _backend;
git_buf path = GIT_BUF_INIT;
-
- git_repository *repo;
- refdb_fs_backend *backend;
+ int error;
assert(_backend && name);
- backend = (refdb_fs_backend *) _backend;
- repo = backend->repo;
+ if ((error = retrieve_reflog_path(&path, backend->repo, name)) < 0)
+ goto out;
+
+ if (!git_path_exists(path.ptr))
+ goto out;
- error = retrieve_reflog_path(&path, repo, name);
+ if ((error = p_unlink(path.ptr)) < 0)
+ goto out;
- if (!error && git_path_exists(path.ptr))
- error = p_unlink(path.ptr);
+ refdb_fs_backend__try_delete_empty_ref_hierarchie(backend, name, true);
- git_buf_free(&path);
+out:
+ git_buf_dispose(&path);
return error;
-
}
int git_refdb_backend_fs(
refdb_fs_backend *backend;
backend = git__calloc(1, sizeof(refdb_fs_backend));
- GITERR_CHECK_ALLOC(backend);
+ GIT_ERROR_CHECK_ALLOC(backend);
backend->repo = repository;
NULL, NULL, packref_cmp, git_buf_cstr(&gitpath)) < 0)
goto fail;
- git_buf_free(&gitpath);
+ git_buf_dispose(&gitpath);
if (!git_repository__cvar(&t, backend->repo, GIT_CVAR_IGNORECASE) && t) {
backend->iterator_flags |= GIT_ITERATOR_IGNORE_CASE;
return 0;
fail:
- git_buf_free(&gitpath);
+ git_buf_dispose(&gitpath);
git__free(backend->gitpath);
git__free(backend->commonpath);
git__free(backend);
assert(reflog && new_oid && committer);
entry = git__calloc(1, sizeof(git_reflog_entry));
- GITERR_CHECK_ALLOC(entry);
+ GIT_ERROR_CHECK_ALLOC(entry);
if ((git_signature_dup(&entry->committer, committer)) < 0)
goto cleanup;
if (newline) {
if (newline[1] != '\0') {
- giterr_set(GITERR_INVALID, "reflog message cannot contain newline");
+ git_error_set(GIT_ERROR_INVALID, "reflog message cannot contain newline");
goto cleanup;
}
entry = (git_reflog_entry *)git_reflog_entry_byindex(reflog, idx);
if (entry == NULL) {
- giterr_set(GITERR_REFERENCE, "no reflog entry at index %"PRIuZ, idx);
+ git_error_set(GIT_ERROR_REFERENCE, "no reflog entry at index %"PRIuZ, idx);
return GIT_ENOTFOUND;
}
if (!ref)
return NULL;
- ref->type = GIT_REF_SYMBOLIC;
+ ref->type = GIT_REFERENCE_SYMBOLIC;
if ((ref->target.symbolic = git__strdup(target)) == NULL) {
git__free(ref);
if (!ref)
return NULL;
- ref->type = GIT_REF_OID;
+ ref->type = GIT_REFERENCE_DIRECT;
git_oid_cpy(&ref->target.oid, oid);
if (peel != NULL)
int git_reference_dup(git_reference **dest, git_reference *source)
{
- if (source->type == GIT_REF_SYMBOLIC)
+ if (source->type == GIT_REFERENCE_SYMBOLIC)
*dest = git_reference__alloc_symbolic(source->name, source->target.symbolic);
else
*dest = git_reference__alloc(source->name, &source->target.oid, &source->peel);
- GITERR_CHECK_ALLOC(*dest);
+ GIT_ERROR_CHECK_ALLOC(*dest);
(*dest)->db = source->db;
GIT_REFCOUNT_INC((*dest)->db);
if (reference == NULL)
return;
- if (reference->type == GIT_REF_SYMBOLIC)
+ if (reference->type == GIT_REFERENCE_SYMBOLIC)
git__free(reference->target.symbolic);
if (reference->db)
const git_oid *old_id = NULL;
const char *old_target = NULL;
- if (ref->type == GIT_REF_OID)
+ if (ref->type == GIT_REFERENCE_DIRECT)
old_id = &ref->target.oid;
else
old_target = ref->target.symbolic;
bool validate)
{
int precompose;
- unsigned int flags = GIT_REF_FORMAT_ALLOW_ONELEVEL;
+ unsigned int flags = GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL;
if (!git_repository__cvar(&precompose, repo, GIT_CVAR_PRECOMPOSE) &&
precompose)
- flags |= GIT_REF_FORMAT__PRECOMPOSE_UNICODE;
+ flags |= GIT_REFERENCE_FORMAT__PRECOMPOSE_UNICODE;
if (!validate)
- flags |= GIT_REF_FORMAT__VALIDATION_DISABLE;
+ flags |= GIT_REFERENCE_FORMAT__VALIDATION_DISABLE;
return git_reference_normalize_name(out, GIT_REFNAME_MAX, name, flags);
}
int max_nesting)
{
git_refname_t scan_name;
- git_ref_t scan_type;
+ git_reference_t scan_type;
int error = 0, nesting;
git_reference *ref = NULL;
git_refdb *refdb;
else if (max_nesting < 0)
max_nesting = DEFAULT_NESTING_LEVEL;
- scan_type = GIT_REF_SYMBOLIC;
+ scan_type = GIT_REFERENCE_SYMBOLIC;
if ((error = reference_normalize_for_repo(scan_name, repo, name, true)) < 0)
return error;
return error;
for (nesting = max_nesting;
- nesting >= 0 && scan_type == GIT_REF_SYMBOLIC;
+ nesting >= 0 && scan_type == GIT_REFERENCE_SYMBOLIC;
nesting--)
{
if (nesting != max_nesting) {
scan_type = ref->type;
}
- if (scan_type != GIT_REF_OID && max_nesting != 0) {
- giterr_set(GITERR_REFERENCE,
+ if (scan_type != GIT_REFERENCE_DIRECT && max_nesting != 0) {
+ git_error_set(GIT_ERROR_REFERENCE,
"cannot resolve reference (>%u levels deep)", max_nesting);
git_reference_free(ref);
return -1;
out:
git__free(name);
- git_buf_free(&reference);
+ git_buf_dispose(&reference);
return error;
}
cleanup:
if (error && !foundvalid) {
/* never found a valid reference name */
- giterr_set(GITERR_REFERENCE,
+ git_error_set(GIT_ERROR_REFERENCE,
"could not use '%s' as valid reference name", git_buf_cstr(&name));
}
if (error == GIT_ENOTFOUND)
- giterr_set(GITERR_REFERENCE, "no reference found for shorthand '%s'", refname);
+ git_error_set(GIT_ERROR_REFERENCE, "no reference found for shorthand '%s'", refname);
- git_buf_free(&name);
- git_buf_free(&refnamebuf);
+ git_buf_dispose(&name);
+ git_buf_dispose(&refnamebuf);
return error;
}
/**
* Getters
*/
-git_ref_t git_reference_type(const git_reference *ref)
+git_reference_t git_reference_type(const git_reference *ref)
{
assert(ref);
return ref->type;
{
assert(ref);
- if (ref->type != GIT_REF_OID)
+ if (ref->type != GIT_REFERENCE_DIRECT)
return NULL;
return &ref->target.oid;
{
assert(ref);
- if (ref->type != GIT_REF_OID || git_oid_iszero(&ref->peel))
+ if (ref->type != GIT_REFERENCE_DIRECT || git_oid_iszero(&ref->peel))
return NULL;
return &ref->peel;
{
assert(ref);
- if (ref->type != GIT_REF_SYMBOLIC)
+ if (ref->type != GIT_REFERENCE_SYMBOLIC)
return NULL;
return ref->target.symbolic;
if (oid != NULL) {
assert(symbolic == NULL);
- if (!git_object__is_valid(repo, oid, GIT_OBJ_ANY)) {
- giterr_set(GITERR_REFERENCE,
+ if (!git_object__is_valid(repo, oid, GIT_OBJECT_ANY)) {
+ git_error_set(GIT_ERROR_REFERENCE,
"target OID for the reference doesn't exist on the repository");
return -1;
}
ref = git_reference__alloc_symbolic(normalized, normalized_target);
}
- GITERR_CHECK_ALLOC(ref);
+ GIT_ERROR_CHECK_ALLOC(ref);
if ((error = git_refdb_write(refdb, ref, force, signature, log_message, old_id, old_target)) < 0) {
git_reference_free(ref);
static int ensure_is_an_updatable_direct_reference(git_reference *ref)
{
- if (ref->type == GIT_REF_OID)
+ if (ref->type == GIT_REFERENCE_DIRECT)
return 0;
- giterr_set(GITERR_REFERENCE, "cannot set OID on symbolic reference");
+ git_error_set(GIT_ERROR_REFERENCE, "cannot set OID on symbolic reference");
return -1;
}
static int ensure_is_an_updatable_symbolic_reference(git_reference *ref)
{
- if (ref->type == GIT_REF_SYMBOLIC)
+ if (ref->type == GIT_REFERENCE_SYMBOLIC)
return 0;
- giterr_set(GITERR_REFERENCE, "cannot set symbolic target on a direct reference");
+ git_error_set(GIT_ERROR_REFERENCE, "cannot set symbolic target on a direct reference");
return -1;
}
int error;
if ((error = git_reference__read_head(&head, repo, path)) < 0) {
- giterr_set(GITERR_REFERENCE, "could not read HEAD when renaming references");
+ git_error_set(GIT_ERROR_REFERENCE, "could not read HEAD when renaming references");
goto out;
}
goto out;
}
- if (git_reference_type(head) != GIT_REF_SYMBOLIC ||
+ if (git_reference_type(head) != GIT_REFERENCE_SYMBOLIC ||
git__strcmp(head->target.symbolic, data->old_name) != 0) {
error = 0;
goto out;
/* Update HEAD it was pointing to the reference being renamed */
if ((error = git_repository_create_head(gitdir, data->new_name)) < 0) {
- giterr_set(GITERR_REFERENCE, "failed to update HEAD after renaming reference");
+ git_error_set(GIT_ERROR_REFERENCE, "failed to update HEAD after renaming reference");
goto out;
}
git_signature *who;
int error;
+ assert(out && ref);
+
if ((error = git_reference__log_signature(&who, ref->db->repo)) < 0)
return error;
int git_reference_resolve(git_reference **ref_out, const git_reference *ref)
{
switch (git_reference_type(ref)) {
- case GIT_REF_OID:
+ case GIT_REFERENCE_DIRECT:
return git_reference_lookup(ref_out, ref->db->repo, ref->name);
- case GIT_REF_SYMBOLIC:
+ case GIT_REFERENCE_SYMBOLIC:
return git_reference_lookup_resolved(ref_out, ref->db->repo, ref->target.symbolic, -1);
default:
- giterr_set(GITERR_REFERENCE, "invalid reference");
+ git_error_set(GIT_ERROR_REFERENCE, "invalid reference");
return -1;
}
}
while (!(error = git_reference_next(&ref, iter))) {
if ((error = callback(ref, payload)) != 0) {
- giterr_set_after_callback(error);
+ git_error_set_after_callback(error);
break;
}
}
while (!(error = git_reference_next_name(&refname, iter))) {
if ((error = callback(refname, payload)) != 0) {
- giterr_set_after_callback(error);
+ git_error_set_after_callback(error);
break;
}
}
while (!(error = git_reference_next_name(&refname, iter))) {
if ((error = callback(refname, payload)) != 0) {
- giterr_set_after_callback(error);
+ git_error_set_after_callback(error);
break;
}
}
static int cb__reflist_add(const char *ref, void *data)
{
char *name = git__strdup(ref);
- GITERR_CHECK_ALLOC(name);
+ GIT_ERROR_CHECK_ALLOC(name);
return git_vector_insert((git_vector *)data, name);
}
int segment_len, segments_count = 0, error = GIT_EINVALIDSPEC;
unsigned int process_flags;
bool normalize = (buf != NULL);
- bool validate = (flags & GIT_REF_FORMAT__VALIDATION_DISABLE) == 0;
+ bool validate = (flags & GIT_REFERENCE_FORMAT__VALIDATION_DISABLE) == 0;
#ifdef GIT_USE_ICONV
git_path_iconv_t ic = GIT_PATH_ICONV_INIT;
git_buf_clear(buf);
#ifdef GIT_USE_ICONV
- if ((flags & GIT_REF_FORMAT__PRECOMPOSE_UNICODE) != 0) {
+ if ((flags & GIT_REFERENCE_FORMAT__PRECOMPOSE_UNICODE) != 0) {
size_t namelen = strlen(current);
if ((error = git_path_iconv_init_precompose(&ic)) < 0 ||
(error = git_path_iconv(&ic, ¤t, &namelen)) < 0)
while (true) {
segment_len = ensure_segment_validity(current);
if (segment_len < 0) {
- if ((process_flags & GIT_REF_FORMAT_REFSPEC_PATTERN) &&
+ if ((process_flags & GIT_REFERENCE_FORMAT_REFSPEC_PATTERN) &&
current[0] == '*' &&
(current[1] == '\0' || current[1] == '/')) {
/* Accept one wildcard as a full refname component. */
- process_flags &= ~GIT_REF_FORMAT_REFSPEC_PATTERN;
+ process_flags &= ~GIT_REFERENCE_FORMAT_REFSPEC_PATTERN;
segment_len = 1;
} else
goto cleanup;
if (current[segment_len - 1] == '/')
goto cleanup;
- if ((segments_count == 1 ) && !(flags & GIT_REF_FORMAT_ALLOW_ONELEVEL))
+ if ((segments_count == 1 ) && !(flags & GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL))
goto cleanup;
if ((segments_count == 1 ) &&
- !(flags & GIT_REF_FORMAT_REFSPEC_SHORTHAND) &&
+ !(flags & GIT_REFERENCE_FORMAT_REFSPEC_SHORTHAND) &&
!(is_all_caps_and_underscore(name, (size_t)segment_len) ||
- ((flags & GIT_REF_FORMAT_REFSPEC_PATTERN) && !strcmp("*", name))))
+ ((flags & GIT_REFERENCE_FORMAT_REFSPEC_PATTERN) && !strcmp("*", name))))
goto cleanup;
if ((segments_count > 1)
cleanup:
if (error == GIT_EINVALIDSPEC)
- giterr_set(
- GITERR_REFERENCE,
+ git_error_set(
+ GIT_ERROR_REFERENCE,
"the given reference name '%s' is not valid", name);
if (error && normalize)
- git_buf_free(buf);
+ git_buf_dispose(buf);
#ifdef GIT_USE_ICONV
git_path_iconv_clear(&ic);
goto cleanup;
if (git_buf_len(&buf) > buffer_size - 1) {
- giterr_set(
- GITERR_REFERENCE,
+ git_error_set(
+ GIT_ERROR_REFERENCE,
"the provided buffer is too short to hold the normalization of '%s'", name);
error = GIT_EBUFS;
goto cleanup;
error = 0;
cleanup:
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return error;
}
-#define GIT_REF_TYPEMASK (GIT_REF_OID | GIT_REF_SYMBOLIC)
+#define GIT_REFERENCE_TYPEMASK (GIT_REFERENCE_DIRECT | GIT_REFERENCE_SYMBOLIC)
int git_reference_cmp(
const git_reference *ref1,
const git_reference *ref2)
{
- git_ref_t type1, type2;
+ git_reference_t type1, type2;
assert(ref1 && ref2);
type1 = git_reference_type(ref1);
/* let's put symbolic refs before OIDs */
if (type1 != type2)
- return (type1 == GIT_REF_SYMBOLIC) ? -1 : 1;
+ return (type1 == GIT_REFERENCE_SYMBOLIC) ? -1 : 1;
- if (type1 == GIT_REF_SYMBOLIC)
+ if (type1 == GIT_REFERENCE_SYMBOLIC)
return strcmp(ref1->target.symbolic, ref2->target.symbolic);
return git_oid__cmp(&ref1->target.oid, &ref2->target.oid);
int error = 0;
if (nesting > MAX_NESTING_LEVEL) {
- giterr_set(GITERR_REFERENCE, "reference chain too deep (%d)", nesting);
+ git_error_set(GIT_ERROR_REFERENCE, "reference chain too deep (%d)", nesting);
return GIT_ENOTFOUND;
}
return error;
}
- if (git_reference_type(ref) == GIT_REF_OID) {
+ if (git_reference_type(ref) == GIT_REFERENCE_DIRECT) {
*out = ref;
error = 0;
} else {
/* found a dangling symref */
if (error == GIT_ENOTFOUND && ref) {
- assert(git_reference_type(ref) == GIT_REF_SYMBOLIC);
- giterr_clear();
+ assert(git_reference_type(ref) == GIT_REFERENCE_SYMBOLIC);
+ git_error_clear();
error = reference__create(&ref2, repo, ref->target.symbolic, oid, NULL, 0, to_use,
log_message, NULL, NULL);
} else if (error == GIT_ENOTFOUND) {
- giterr_clear();
+ git_error_clear();
error = reference__create(&ref2, repo, ref_name, oid, NULL, 0, to_use,
log_message, NULL, NULL);
} else if (error == 0) {
- assert(git_reference_type(ref) == GIT_REF_OID);
+ assert(git_reference_type(ref) == GIT_REFERENCE_DIRECT);
error = reference__create(&ref2, repo, ref->name, oid, NULL, 1, to_use,
log_message, &ref->target.oid, NULL);
}
done:
git_reference_free(ref_new);
- git_buf_free(&reflog_msg);
+ git_buf_dispose(&reflog_msg);
git_commit_free(commit);
return error;
}
return git_reference__is_note(ref->name);
}
-static int peel_error(int error, git_reference *ref, const char* msg)
+static int peel_error(int error, const git_reference *ref, const char* msg)
{
- giterr_set(
- GITERR_INVALID,
+ git_error_set(
+ GIT_ERROR_INVALID,
"the reference '%s' cannot be peeled - %s", git_reference_name(ref), msg);
return error;
}
int git_reference_peel(
git_object **peeled,
- git_reference *ref,
- git_otype target_type)
+ const git_reference *ref,
+ git_object_t target_type)
{
- git_reference *resolved = NULL;
+ const git_reference *resolved = NULL;
+ git_reference *allocated = NULL;
git_object *target = NULL;
int error;
assert(ref);
- if (ref->type == GIT_REF_OID) {
+ if (ref->type == GIT_REFERENCE_DIRECT) {
resolved = ref;
} else {
- if ((error = git_reference_resolve(&resolved, ref)) < 0)
+ if ((error = git_reference_resolve(&allocated, ref)) < 0)
return peel_error(error, ref, "Cannot resolve reference");
+
+ resolved = allocated;
}
/*
* to a commit. So we only want to use the peeled value
* if it is not zero and the target is not a tag.
*/
- if (target_type != GIT_OBJ_TAG && !git_oid_iszero(&resolved->peel)) {
+ if (target_type != GIT_OBJECT_TAG && !git_oid_iszero(&resolved->peel)) {
error = git_object_lookup(&target,
- git_reference_owner(ref), &resolved->peel, GIT_OBJ_ANY);
+ git_reference_owner(ref), &resolved->peel, GIT_OBJECT_ANY);
} else {
error = git_object_lookup(&target,
- git_reference_owner(ref), &resolved->target.oid, GIT_OBJ_ANY);
+ git_reference_owner(ref), &resolved->target.oid, GIT_OBJECT_ANY);
}
if (error < 0) {
goto cleanup;
}
- if (target_type == GIT_OBJ_ANY && git_object_type(target) != GIT_OBJ_TAG)
+ if (target_type == GIT_OBJECT_ANY && git_object_type(target) != GIT_OBJECT_TAG)
error = git_object_dup(peeled, target);
else
error = git_object_peel(peeled, target, target_type);
cleanup:
git_object_free(target);
-
- if (resolved != ref)
- git_reference_free(resolved);
+ git_reference_free(allocated);
return error;
}
int git_reference__is_valid_name(const char *refname, unsigned int flags)
{
if (git_reference__normalize_name(NULL, refname, flags) < 0) {
- giterr_clear();
+ git_error_clear();
return false;
}
int git_reference_is_valid_name(const char *refname)
{
- return git_reference__is_valid_name(refname, GIT_REF_FORMAT_ALLOW_ONELEVEL);
+ return git_reference__is_valid_name(refname, GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL);
}
const char *git_reference__shorthand(const char *name)
{
return git_reference__shorthand(ref->name);
}
+
+int git_reference__is_unborn_head(bool *unborn, const git_reference *ref, git_repository *repo)
+{
+ int error;
+ git_reference *tmp_ref;
+ assert(unborn && ref && repo);
+
+ if (ref->type == GIT_REFERENCE_DIRECT) {
+ *unborn = 0;
+ return 0;
+ }
+
+ error = git_reference_lookup_resolved(&tmp_ref, repo, ref->name, -1);
+ git_reference_free(tmp_ref);
+
+ if (error != 0 && error != GIT_ENOTFOUND)
+ return error;
+ else if (error == GIT_ENOTFOUND && git__strcmp(ref->name, GIT_HEAD_FILE) == 0)
+ *unborn = true;
+ else
+ *unborn = false;
+
+ return 0;
+}
#define GIT_STASH_FILE "stash"
#define GIT_REFS_STASH_FILE GIT_REFS_DIR GIT_STASH_FILE
-#define GIT_REF_FORMAT__PRECOMPOSE_UNICODE (1u << 16)
-#define GIT_REF_FORMAT__VALIDATION_DISABLE (1u << 15)
+#define GIT_REFERENCE_FORMAT__PRECOMPOSE_UNICODE (1u << 16)
+#define GIT_REFERENCE_FORMAT__VALIDATION_DISABLE (1u << 15)
#define GIT_REFNAME_MAX 1024
struct git_reference {
git_refdb *db;
- git_ref_t type;
+ git_reference_t type;
union {
git_oid oid;
const git_oid *id,
const char *operation);
+int git_reference__is_unborn_head(bool *unborn, const git_reference *ref, git_repository *repo);
+
#endif
int git_refspec__parse(git_refspec *refspec, const char *input, bool is_fetch)
{
- // Ported from https://github.com/git/git/blob/f06d47e7e0d9db709ee204ed13a8a7486149f494/remote.c#L518-636
+ /* Ported from https://github.com/git/git/blob/f06d47e7e0d9db709ee204ed13a8a7486149f494/remote.c#L518-636 */
size_t llen;
int is_glob = 0;
if (!is_fetch && rhs == lhs && rhs[1] == '\0') {
refspec->matching = 1;
refspec->string = git__strdup(input);
- GITERR_CHECK_ALLOC(refspec->string);
+ GIT_ERROR_CHECK_ALLOC(refspec->string);
refspec->src = git__strdup("");
- GITERR_CHECK_ALLOC(refspec->src);
+ GIT_ERROR_CHECK_ALLOC(refspec->src);
refspec->dst = git__strdup("");
- GITERR_CHECK_ALLOC(refspec->dst);
+ GIT_ERROR_CHECK_ALLOC(refspec->dst);
return 0;
}
refspec->pattern = is_glob;
refspec->src = git__strndup(lhs, llen);
- flags = GIT_REF_FORMAT_ALLOW_ONELEVEL | GIT_REF_FORMAT_REFSPEC_SHORTHAND
- | (is_glob ? GIT_REF_FORMAT_REFSPEC_PATTERN : 0);
+ flags = GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL |
+ GIT_REFERENCE_FORMAT_REFSPEC_SHORTHAND |
+ (is_glob ? GIT_REFERENCE_FORMAT_REFSPEC_PATTERN : 0);
if (is_fetch) {
/*
/* if the RHS is empty, then it's a copy of the LHS */
if (!refspec->dst) {
refspec->dst = git__strdup(refspec->src);
- GITERR_CHECK_ALLOC(refspec->dst);
+ GIT_ERROR_CHECK_ALLOC(refspec->dst);
}
}
refspec->string = git__strdup(input);
- GITERR_CHECK_ALLOC(refspec->string);
+ GIT_ERROR_CHECK_ALLOC(refspec->string);
return 0;
invalid:
- giterr_set(
- GITERR_INVALID,
+ git_error_set(
+ GIT_ERROR_INVALID,
"'%s' is not a valid refspec.", input);
- git_refspec__free(refspec);
+ git_refspec__dispose(refspec);
return -1;
}
-void git_refspec__free(git_refspec *refspec)
+void git_refspec__dispose(git_refspec *refspec)
{
if (refspec == NULL)
return;
memset(refspec, 0x0, sizeof(git_refspec));
}
+int git_refspec_parse(git_refspec **out_refspec, const char *input, int is_fetch)
+{
+ git_refspec *refspec;
+ assert(out_refspec && input);
+
+ *out_refspec = NULL;
+
+ refspec = git__malloc(sizeof(git_refspec));
+ GIT_ERROR_CHECK_ALLOC(refspec);
+
+ if (git_refspec__parse(refspec, input, !!is_fetch) != 0) {
+ git__free(refspec);
+ return -1;
+ }
+
+ *out_refspec = refspec;
+ return 0;
+}
+
+void git_refspec_free(git_refspec *refspec)
+{
+ git_refspec__dispose(refspec);
+ git__free(refspec);
+}
+
const char *git_refspec_src(const git_refspec *refspec)
{
return refspec == NULL ? NULL : refspec->src;
git_buf_sanitize(out);
if (!git_refspec_src_matches(spec, name)) {
- giterr_set(GITERR_INVALID, "ref '%s' doesn't match the source", name);
+ git_error_set(GIT_ERROR_INVALID, "ref '%s' doesn't match the source", name);
return -1;
}
if (!spec->pattern)
- return git_buf_puts(out, spec->dst);
+ return git_buf_puts(out, spec->dst ? spec->dst : "");
return refspec_transform(out, spec->src, spec->dst, name);
}
git_buf_sanitize(out);
if (!git_refspec_dst_matches(spec, name)) {
- giterr_set(GITERR_INVALID, "ref '%s' doesn't match the destination", name);
+ git_error_set(GIT_ERROR_INVALID, "ref '%s' doesn't match the destination", name);
return -1;
}
assert(out && spec && refs);
cur = git__calloc(1, sizeof(git_refspec));
- GITERR_CHECK_ALLOC(cur);
+ GIT_ERROR_CHECK_ALLOC(cur);
cur->force = spec->force;
cur->push = spec->push;
for (j = 0; formatters[j]; j++) {
git_buf_clear(&buf);
git_buf_printf(&buf, formatters[j], spec->src);
- GITERR_CHECK_ALLOC_BUF(&buf);
+ GIT_ERROR_CHECK_ALLOC_BUF(&buf);
key.name = (char *) git_buf_cstr(&buf);
if (!git_vector_search(&pos, refs, &key)) {
/* No shorthands found, copy over the name */
if (cur->src == NULL && spec->src != NULL) {
cur->src = git__strdup(spec->src);
- GITERR_CHECK_ALLOC(cur->src);
+ GIT_ERROR_CHECK_ALLOC(cur->src);
}
if (spec->dst && git__prefixcmp(spec->dst, GIT_REFS_DIR)) {
}
git_buf_puts(&buf, spec->dst);
- GITERR_CHECK_ALLOC_BUF(&buf);
+ GIT_ERROR_CHECK_ALLOC_BUF(&buf);
cur->dst = git_buf_detach(&buf);
}
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
if (cur->dst == NULL && spec->dst != NULL) {
cur->dst = git__strdup(spec->dst);
- GITERR_CHECK_ALLOC(cur->dst);
+ GIT_ERROR_CHECK_ALLOC(cur->dst);
}
return git_vector_insert(out, cur);
const char *str,
bool is_fetch);
-void git_refspec__free(git_refspec *refspec);
+void git_refspec__dispose(git_refspec *refspec);
int git_refspec__serialize(git_buf *out, const git_refspec *refspec);
git_refspec *spec;
spec = git__calloc(1, sizeof(git_refspec));
- GITERR_CHECK_ALLOC(spec);
+ GIT_ERROR_CHECK_ALLOC(spec);
if (git_refspec__parse(spec, string, is_fetch) < 0) {
git__free(spec);
spec->push = !is_fetch;
if (git_vector_insert(vector, spec) < 0) {
- git_refspec__free(spec);
+ git_refspec__dispose(spec);
git__free(spec);
return -1;
}
return -1;
error = git_config__lookup_entry(&ce, cfg, git_buf_cstr(&buf), false);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
if (!error && ce && ce->value) {
if (!strcmp(ce->value, "--no-tags"))
int error = 0;
if (!git_remote_is_valid_name(name)) {
- giterr_set(
- GITERR_CONFIG,
+ git_error_set(
+ GIT_ERROR_CONFIG,
"'%s' is not a valid remote name.", name ? name : "(null)");
error = GIT_EINVALIDSPEC;
}
return error;
if ((error = git_refspec__parse(&spec, refspec, fetch)) < 0) {
- if (giterr_last()->klass != GITERR_NOMEMORY)
+ if (git_error_last()->klass != GIT_ERROR_NOMEMORY)
error = GIT_EINVALIDSPEC;
return error;
}
- git_refspec__free(&spec);
+ git_refspec__dispose(&spec);
if ((error = git_buf_printf(&var, fmt, name)) < 0)
return error;
}
cleanup:
- git_buf_free(&var);
+ git_buf_dispose(&var);
return 0;
}
static int canonicalize_url(git_buf *out, const char *in)
{
if (in == NULL || strlen(in) == 0) {
- giterr_set(GITERR_INVALID, "cannot set empty URL");
+ git_error_set(GIT_ERROR_INVALID, "cannot set empty URL");
return GIT_EINVALIDSPEC;
}
return git_buf_puts(out, in);
}
-static int create_internal(git_remote **out, git_repository *repo, const char *name, const char *url, const char *fetch)
+static int default_fetchspec_for_name(git_buf *buf, const char *name)
{
+ if (git_buf_printf(buf, "+refs/heads/*:refs/remotes/%s/*", name) < 0)
+ return -1;
+
+ return 0;
+}
+
+static int ensure_remote_doesnot_exist(git_repository *repo, const char *name)
+{
+ int error;
git_remote *remote;
+
+ error = git_remote_lookup(&remote, repo, name);
+
+ if (error == GIT_ENOTFOUND)
+ return 0;
+
+ if (error < 0)
+ return error;
+
+ git_remote_free(remote);
+
+ git_error_set(GIT_ERROR_CONFIG, "remote '%s' already exists", name);
+
+ return GIT_EEXISTS;
+}
+
+int git_remote_create_init_options(git_remote_create_options *opts, unsigned int version)
+{
+ GIT_INIT_STRUCTURE_FROM_TEMPLATE(
+ opts, version, git_remote_create_options, GIT_REMOTE_CREATE_OPTIONS_INIT);
+ return 0;
+}
+
+int git_remote_create_with_opts(git_remote **out, const char *url, const git_remote_create_options *opts)
+{
+ git_remote *remote = NULL;
git_config *config_ro = NULL, *config_rw;
git_buf canonical_url = GIT_BUF_INIT;
git_buf var = GIT_BUF_INIT;
+ git_buf specbuf = GIT_BUF_INIT;
+ const git_remote_create_options dummy_opts = GIT_REMOTE_CREATE_OPTIONS_INIT;
int error = -1;
- /* repo, name, and fetch are optional */
assert(out && url);
- if (repo && (error = git_repository_config_snapshot(&config_ro, repo)) < 0)
- return error;
+ if (!opts) {
+ opts = &dummy_opts;
+ }
+
+ GIT_ERROR_CHECK_VERSION(opts, GIT_REMOTE_CREATE_OPTIONS_VERSION, "git_remote_create_options");
+
+ if (opts->name != NULL) {
+ if ((error = ensure_remote_name_is_valid(opts->name)) < 0)
+ return error;
+
+ if (opts->repository &&
+ (error = ensure_remote_doesnot_exist(opts->repository, opts->name)) < 0)
+ return error;
+ }
+
+ if (opts->repository) {
+ if ((error = git_repository_config_snapshot(&config_ro, opts->repository)) < 0)
+ goto on_error;
+ }
remote = git__calloc(1, sizeof(git_remote));
- GITERR_CHECK_ALLOC(remote);
+ GIT_ERROR_CHECK_ALLOC(remote);
- remote->repo = repo;
+ remote->repo = opts->repository;
- if ((error = git_vector_init(&remote->refs, 32, NULL)) < 0 ||
+ if ((error = git_vector_init(&remote->refs, 8, NULL)) < 0 ||
(error = canonicalize_url(&canonical_url, url)) < 0)
goto on_error;
- if (repo) {
+ if (opts->repository && !(opts->flags & GIT_REMOTE_CREATE_SKIP_INSTEADOF)) {
remote->url = apply_insteadof(config_ro, canonical_url.ptr, GIT_DIRECTION_FETCH);
} else {
remote->url = git__strdup(canonical_url.ptr);
}
- GITERR_CHECK_ALLOC(remote->url);
-
- if (name != NULL) {
- remote->name = git__strdup(name);
- GITERR_CHECK_ALLOC(remote->name);
+ GIT_ERROR_CHECK_ALLOC(remote->url);
- if ((error = git_buf_printf(&var, CONFIG_URL_FMT, name)) < 0)
- goto on_error;
+ if (opts->name != NULL) {
+ remote->name = git__strdup(opts->name);
+ GIT_ERROR_CHECK_ALLOC(remote->name);
- if (repo &&
- ((error = git_repository_config__weakptr(&config_rw, repo)) < 0 ||
- (error = git_config_set_string(config_rw, var.ptr, canonical_url.ptr)) < 0))
+ if (opts->repository &&
+ ((error = git_buf_printf(&var, CONFIG_URL_FMT, opts->name)) < 0 ||
+ (error = git_repository_config__weakptr(&config_rw, opts->repository)) < 0 ||
+ (error = git_config_set_string(config_rw, var.ptr, canonical_url.ptr)) < 0))
goto on_error;
}
- if (fetch != NULL) {
- if ((error = add_refspec(remote, fetch, true)) < 0)
- goto on_error;
+ if (opts->fetchspec != NULL ||
+ (opts->name && !(opts->flags & GIT_REMOTE_CREATE_SKIP_DEFAULT_FETCHSPEC))) {
+ const char *fetch = NULL;
+ if (opts->fetchspec) {
+ fetch = opts->fetchspec;
+ } else {
+ if ((error = default_fetchspec_for_name(&specbuf, opts->name)) < 0)
+ goto on_error;
- /* only write for non-anonymous remotes */
- if (repo && name && (error = write_add_refspec(repo, name, fetch, true)) < 0)
+ fetch = git_buf_cstr(&specbuf);
+ }
+
+ if ((error = add_refspec(remote, fetch, true)) < 0)
goto on_error;
- if (repo && (error = lookup_remote_prune_config(remote, config_ro, name)) < 0)
+ /* only write for named remotes with a repository */
+ if (opts->repository && opts->name &&
+ ((error = write_add_refspec(opts->repository, opts->name, fetch, true)) < 0 ||
+ (error = lookup_remote_prune_config(remote, config_ro, opts->name)) < 0))
goto on_error;
/* Move the data over to where the matching functions can find them */
}
/* A remote without a name doesn't download tags */
- if (!name)
+ if (!opts->name)
remote->download_tags = GIT_REMOTE_DOWNLOAD_TAGS_NONE;
else
remote->download_tags = GIT_REMOTE_DOWNLOAD_TAGS_AUTO;
- git_buf_free(&var);
+ git_buf_dispose(&var);
*out = remote;
error = 0;
git_remote_free(remote);
git_config_free(config_ro);
- git_buf_free(&canonical_url);
- git_buf_free(&var);
+ git_buf_dispose(&specbuf);
+ git_buf_dispose(&canonical_url);
+ git_buf_dispose(&var);
return error;
}
-static int ensure_remote_doesnot_exist(git_repository *repo, const char *name)
+int git_remote_create(git_remote **out, git_repository *repo, const char *name, const char *url)
{
+ git_buf buf = GIT_BUF_INIT;
int error;
- git_remote *remote;
+ git_remote_create_options opts = GIT_REMOTE_CREATE_OPTIONS_INIT;
- error = git_remote_lookup(&remote, repo, name);
-
- if (error == GIT_ENOTFOUND)
- return 0;
-
- if (error < 0)
+ /* Those 2 tests are duplicated here because of backward-compatibility */
+ if ((error = ensure_remote_name_is_valid(name)) < 0)
return error;
- git_remote_free(remote);
-
- giterr_set(
- GITERR_CONFIG,
- "remote '%s' already exists", name);
-
- return GIT_EEXISTS;
-}
+ if (canonicalize_url(&buf, url) < 0)
+ return GIT_ERROR;
+ git_buf_clear(&buf);
-int git_remote_create(git_remote **out, git_repository *repo, const char *name, const char *url)
-{
- git_buf buf = GIT_BUF_INIT;
- int error;
+ opts.repository = repo;
+ opts.name = name;
- if (git_buf_printf(&buf, "+refs/heads/*:refs/remotes/%s/*", name) < 0)
- return -1;
+ error = git_remote_create_with_opts(out, url, &opts);
- error = git_remote_create_with_fetchspec(out, repo, name, url, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return error;
}
int git_remote_create_with_fetchspec(git_remote **out, git_repository *repo, const char *name, const char *url, const char *fetch)
{
- git_remote *remote = NULL;
int error;
+ git_remote_create_options opts = GIT_REMOTE_CREATE_OPTIONS_INIT;
if ((error = ensure_remote_name_is_valid(name)) < 0)
return error;
- if ((error = ensure_remote_doesnot_exist(repo, name)) < 0)
- return error;
-
- if (create_internal(&remote, repo, name, url, fetch) < 0)
- goto on_error;
-
- *out = remote;
+ opts.repository = repo;
+ opts.name = name;
+ opts.fetchspec = fetch;
+ opts.flags = GIT_REMOTE_CREATE_SKIP_DEFAULT_FETCHSPEC;
- return 0;
-
-on_error:
- git_remote_free(remote);
- return -1;
+ return git_remote_create_with_opts(out, url, &opts);
}
int git_remote_create_anonymous(git_remote **out, git_repository *repo, const char *url)
{
- return create_internal(out, repo, NULL, url, NULL);
+ git_remote_create_options opts = GIT_REMOTE_CREATE_OPTIONS_INIT;
+
+ opts.repository = repo;
+
+ return git_remote_create_with_opts(out, url, &opts);
}
int git_remote_create_detached(git_remote **out, const char *url)
{
- return create_internal(out, NULL, NULL, url, NULL);
+ return git_remote_create_with_opts(out, url, NULL);
}
int git_remote_dup(git_remote **dest, git_remote *source)
int error = 0;
git_refspec *spec;
git_remote *remote = git__calloc(1, sizeof(git_remote));
- GITERR_CHECK_ALLOC(remote);
+ GIT_ERROR_CHECK_ALLOC(remote);
if (source->name != NULL) {
remote->name = git__strdup(source->name);
- GITERR_CHECK_ALLOC(remote->name);
+ GIT_ERROR_CHECK_ALLOC(remote->name);
}
if (source->url != NULL) {
remote->url = git__strdup(source->url);
- GITERR_CHECK_ALLOC(remote->url);
+ GIT_ERROR_CHECK_ALLOC(remote->url);
}
if (source->pushurl != NULL) {
remote->pushurl = git__strdup(source->pushurl);
- GITERR_CHECK_ALLOC(remote->pushurl);
+ GIT_ERROR_CHECK_ALLOC(remote->pushurl);
}
remote->repo = source->repo;
*found = !error;
if (error == GIT_ENOTFOUND) {
- giterr_clear();
+ git_error_clear();
error = 0;
}
return error;
remote = git__calloc(1, sizeof(git_remote));
- GITERR_CHECK_ALLOC(remote);
+ GIT_ERROR_CHECK_ALLOC(remote);
remote->name = git__strdup(name);
- GITERR_CHECK_ALLOC(remote->name);
+ GIT_ERROR_CHECK_ALLOC(remote->name);
if (git_vector_init(&remote->refs, 32, NULL) < 0 ||
git_vector_init(&remote->refspecs, 2, NULL) < 0 ||
if (found && strlen(val) > 0) {
remote->url = apply_insteadof(config, val, GIT_DIRECTION_FETCH);
- GITERR_CHECK_ALLOC(remote->url);
+ GIT_ERROR_CHECK_ALLOC(remote->url);
}
val = NULL;
if (!optional_setting_found) {
error = GIT_ENOTFOUND;
- giterr_set(GITERR_CONFIG, "remote '%s' does not exist", name);
+ git_error_set(GIT_ERROR_CONFIG, "remote '%s' does not exist", name);
goto cleanup;
}
if (found && strlen(val) > 0) {
remote->pushurl = apply_insteadof(config, val, GIT_DIRECTION_PUSH);
- GITERR_CHECK_ALLOC(remote->pushurl);
+ GIT_ERROR_CHECK_ALLOC(remote->pushurl);
}
data.remote = remote;
cleanup:
git_config_free(config);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
if (error < 0)
git_remote_free(remote);
if ((error = git_config_get_bool(&remote->prune_refs, config, git_buf_cstr(&buf))) < 0) {
if (error == GIT_ENOTFOUND) {
- giterr_clear();
+ git_error_clear();
if ((error = git_config_get_bool(&remote->prune_refs, config, "fetch.prune")) < 0) {
if (error == GIT_ENOTFOUND) {
- giterr_clear();
+ git_error_clear();
error = 0;
}
}
}
}
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return error;
}
}
cleanup:
- git_buf_free(&canonical_url);
- git_buf_free(&buf);
+ git_buf_dispose(&canonical_url);
+ git_buf_dispose(&buf);
return error;
}
return t->set_custom_headers(t, custom_headers);
}
-int git_remote_connect(git_remote *remote, git_direction direction, const git_remote_callbacks *callbacks, const git_proxy_options *proxy, const git_strarray *custom_headers)
+int git_remote__connect(git_remote *remote, git_direction direction, const git_remote_callbacks *callbacks, const git_remote_connection_opts *conn)
{
git_transport *t;
const char *url;
assert(remote);
if (callbacks) {
- GITERR_CHECK_VERSION(callbacks, GIT_REMOTE_CALLBACKS_VERSION, "git_remote_callbacks");
+ GIT_ERROR_CHECK_VERSION(callbacks, GIT_REMOTE_CALLBACKS_VERSION, "git_remote_callbacks");
credentials = callbacks->credentials;
transport = callbacks->transport;
payload = callbacks->payload;
}
- if (proxy)
- GITERR_CHECK_VERSION(proxy, GIT_PROXY_OPTIONS_VERSION, "git_proxy_options");
+ if (conn->proxy)
+ GIT_ERROR_CHECK_VERSION(conn->proxy, GIT_PROXY_OPTIONS_VERSION, "git_proxy_options");
t = remote->transport;
url = git_remote__urlfordirection(remote, direction);
if (url == NULL) {
- giterr_set(GITERR_INVALID,
+ git_error_set(GIT_ERROR_INVALID,
"Malformed remote '%s' - missing %s URL",
remote->name ? remote->name : "(anonymous)",
direction == GIT_DIRECTION_FETCH ? "fetch" : "push");
if (!t && (error = git_transport_new(&t, remote, url)) < 0)
return error;
- if ((error = set_transport_custom_headers(t, custom_headers)) != 0)
+ if ((error = set_transport_custom_headers(t, conn->custom_headers)) != 0)
goto on_error;
if ((error = set_transport_callbacks(t, callbacks)) < 0 ||
- (error = t->connect(t, url, credentials, payload, proxy, direction, flags)) != 0)
+ (error = t->connect(t, url, credentials, payload, conn->proxy, direction, flags)) != 0)
goto on_error;
remote->transport = t;
return error;
}
+int git_remote_connect(git_remote *remote, git_direction direction, const git_remote_callbacks *callbacks, const git_proxy_options *proxy, const git_strarray *custom_headers)
+{
+ git_remote_connection_opts conn;
+
+ conn.proxy = proxy;
+ conn.custom_headers = custom_headers;
+
+ return git_remote__connect(remote, direction, callbacks, &conn);
+}
+
int git_remote_ls(const git_remote_head ***out, size_t *size, git_remote *remote)
{
assert(remote);
if (!remote->transport) {
- giterr_set(GITERR_NET, "this remote has never connected");
+ git_error_set(GIT_ERROR_NET, "this remote has never connected");
return -1;
}
return error;
error = git_config__lookup_entry(&ce, cfg, git_buf_cstr(&buf), false);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
if (error < 0)
return error;
if (error < 0) {
if (error == GIT_ENOTFOUND) {
- giterr_clear();
+ git_error_clear();
error = 0;
}
*proxy_url = git_buf_detach(&val);
found:
- GITERR_CHECK_ALLOC(*proxy_url);
+ GIT_ERROR_CHECK_ALLOC(*proxy_url);
git_config_entry_free(ce);
return 0;
git_refspec *spec;
git_vector_foreach(vec, i, spec) {
- git_refspec__free(spec);
+ git_refspec__dispose(spec);
git__free(spec);
}
assert(remote);
if (!remote->repo) {
- giterr_set(GITERR_INVALID, "cannot download detached remote");
+ git_error_set(GIT_ERROR_INVALID, "cannot download detached remote");
return -1;
}
if (opts) {
- GITERR_CHECK_VERSION(&opts->callbacks, GIT_REMOTE_CALLBACKS_VERSION, "git_remote_callbacks");
+ GIT_ERROR_CHECK_VERSION(&opts->callbacks, GIT_REMOTE_CALLBACKS_VERSION, "git_remote_callbacks");
cbs = &opts->callbacks;
custom_headers = &opts->custom_headers;
- GITERR_CHECK_VERSION(&opts->proxy_opts, GIT_PROXY_OPTIONS_VERSION, "git_proxy_options");
+ GIT_ERROR_CHECK_VERSION(&opts->proxy_opts, GIT_PROXY_OPTIONS_VERSION, "git_proxy_options");
proxy = &opts->proxy_opts;
}
bool prune = false;
git_buf reflog_msg_buf = GIT_BUF_INIT;
const git_remote_callbacks *cbs = NULL;
- const git_strarray *custom_headers = NULL;
- const git_proxy_options *proxy = NULL;
+ git_remote_connection_opts conn = GIT_REMOTE_CONNECTION_OPTIONS_INIT;
if (opts) {
- GITERR_CHECK_VERSION(&opts->callbacks, GIT_REMOTE_CALLBACKS_VERSION, "git_remote_callbacks");
+ GIT_ERROR_CHECK_VERSION(&opts->callbacks, GIT_REMOTE_CALLBACKS_VERSION, "git_remote_callbacks");
cbs = &opts->callbacks;
- custom_headers = &opts->custom_headers;
+ conn.custom_headers = &opts->custom_headers;
update_fetchhead = opts->update_fetchhead;
tagopt = opts->download_tags;
- GITERR_CHECK_VERSION(&opts->proxy_opts, GIT_PROXY_OPTIONS_VERSION, "git_proxy_options");
- proxy = &opts->proxy_opts;
+ GIT_ERROR_CHECK_VERSION(&opts->proxy_opts, GIT_PROXY_OPTIONS_VERSION, "git_proxy_options");
+ conn.proxy = &opts->proxy_opts;
}
/* Connect and download everything */
- if ((error = git_remote_connect(remote, GIT_DIRECTION_FETCH, cbs, proxy, custom_headers)) != 0)
+ if ((error = git_remote__connect(remote, GIT_DIRECTION_FETCH, cbs, &conn)) != 0)
return error;
error = git_remote_download(remote, refspecs, opts);
/* Create "remote/foo" branches for all remote branches */
error = git_remote_update_tips(remote, cbs, update_fetchhead, tagopt, git_buf_cstr(&reflog_msg_buf));
- git_buf_free(&reflog_msg_buf);
+ git_buf_dispose(&reflog_msg_buf);
if (error < 0)
return error;
(error = git_refspec_rtransform(remote_name, spec, upstream_name.ptr)) < 0) {
/* Not an error if there is no upstream */
if (error == GIT_ENOTFOUND) {
- giterr_clear();
+ git_error_clear();
error = 0;
}
*update = 1;
}
- git_buf_free(&upstream_remote);
- git_buf_free(&upstream_name);
+ git_buf_dispose(&upstream_remote);
+ git_buf_dispose(&upstream_name);
return error;
}
error = git_reference_resolve(&resolved_ref, ref);
/* If we're in an unborn branch, let's pretend nothing happened */
- if (error == GIT_ENOTFOUND && git_reference_type(ref) == GIT_REF_SYMBOLIC) {
+ if (error == GIT_ENOTFOUND && git_reference_type(ref) == GIT_REFERENCE_SYMBOLIC) {
ref_name = git_reference_symbolic_target(ref);
error = 0;
} else {
error = remote_head_for_fetchspec_src(out, update_heads, git_buf_cstr(&remote_name));
cleanup:
- git_buf_free(&remote_name);
+ git_buf_dispose(&remote_name);
git_reference_free(resolved_ref);
git_config_free(config);
return error;
continue;
refname_dup = git__strdup(refname);
- GITERR_CHECK_ALLOC(refname_dup);
+ GIT_ERROR_CHECK_ALLOC(refname_dup);
if ((error = git_vector_insert(candidates, refname_dup)) < 0)
goto out;
git_oid zero_id = {{ 0 }};
if (callbacks)
- GITERR_CHECK_VERSION(callbacks, GIT_REMOTE_CALLBACKS_VERSION, "git_remote_callbacks");
+ GIT_ERROR_CHECK_VERSION(callbacks, GIT_REMOTE_CALLBACKS_VERSION, "git_remote_callbacks");
if ((error = ls_to_vector(&remote_refs, remote)) < 0)
goto cleanup;
key.name = (char *) git_buf_cstr(&buf);
error = git_vector_bsearch(&pos, &remote_refs, &key);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
if (error < 0 && error != GIT_ENOTFOUND)
goto cleanup;
if (error < 0)
goto cleanup;
- if (git_reference_type(ref) == GIT_REF_SYMBOLIC) {
+ if (git_reference_type(ref) == GIT_REFERENCE_SYMBOLIC) {
git_reference_free(ref);
continue;
}
continue;
/* In autotag mode, don't overwrite any locally-existing tags */
- error = git_reference_create(&ref, remote->repo, refname.ptr, &head->oid, !autotag,
+ error = git_reference_create(&ref, remote->repo, refname.ptr, &head->oid, !autotag,
log_message);
if (error == GIT_EEXISTS)
goto on_error;
git_vector_free(&update_heads);
- git_refspec__free(&tagspec);
- git_buf_free(&refname);
+ git_refspec__dispose(&tagspec);
+ git_buf_dispose(&refname);
return 0;
on_error:
git_vector_free(&update_heads);
- git_refspec__free(&tagspec);
- git_buf_free(&refname);
+ git_refspec__dispose(&tagspec);
+ git_buf_dispose(&refname);
return -1;
}
error = 0;
cleanup:
- git_buf_free(&refname);
+ git_buf_dispose(&refname);
return error;
}
return error;
error = git_futils_truncate(path.ptr, GIT_REFS_FILE_MODE);
- git_buf_free(&path);
+ git_buf_dispose(&path);
return error;
}
out:
git_vector_free(&refs);
- git_refspec__free(&tagspec);
+ git_refspec__dispose(&tagspec);
return error;
}
remote_name = git__strndup(name, namelen - 4); /* strip ".url" */
else
remote_name = git__strndup(name, namelen - 8); /* strip ".pushurl" */
- GITERR_CHECK_ALLOC(remote_name);
+ GIT_ERROR_CHECK_ALLOC(remote_name);
return git_vector_insert(list, remote_name);
}
error = 0;
break;
default:
- giterr_set(GITERR_INVALID, "invalid value for the tagopt setting");
+ git_error_set(GIT_ERROR_INVALID, "invalid value for the tagopt setting");
error = -1;
}
- git_buf_free(&var);
+ git_buf_dispose(&var);
return error;
}
new_name ? git_buf_cstr(&new_section_name) : NULL);
cleanup:
- git_buf_free(&old_section_name);
- git_buf_free(&new_section_name);
+ git_buf_dispose(&old_section_name);
+ git_buf_dispose(&new_section_name);
return error;
}
git_buf_cstr(&log_message))) < 0)
goto cleanup;
- if (git_reference_type(ref) != GIT_REF_SYMBOLIC)
+ if (git_reference_type(ref) != GIT_REFERENCE_SYMBOLIC)
goto cleanup;
/* Handle refs like origin/HEAD -> origin/master */
cleanup:
git_reference_free(reference_in);
git_reference_free(ref);
- git_buf_free(&namespace);
- git_buf_free(&old_namespace);
- git_buf_free(&new_name);
- git_buf_free(&log_message);
+ git_buf_dispose(&namespace);
+ git_buf_dispose(&old_namespace);
+ git_buf_dispose(&new_name);
+ git_buf_dispose(&log_message);
return error;
}
return error;
error = git_reference_iterator_glob_new(&iter, repo, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
if (error < 0)
return error;
if ((error = git_vector_init(problems, 1, NULL)) < 0)
return error;
- if ((error = git_buf_printf(
- &base, "+refs/heads/*:refs/remotes/%s/*", remote->name)) < 0)
+ if ((error = default_fetchspec_for_name(&base, remote->name)) < 0)
return error;
git_vector_foreach(&remote->refspecs, i, spec) {
char *dup;
dup = git__strdup(spec->string);
- GITERR_CHECK_ALLOC(dup);
+ GIT_ERROR_CHECK_ALLOC(dup);
if ((error = git_vector_insert(problems, dup)) < 0)
break;
git_buf_clear(&val);
git_buf_clear(&var);
- if (git_buf_printf(
- &val, "+refs/heads/*:refs/remotes/%s/*", new_name) < 0 ||
+ if (default_fetchspec_for_name(&val, new_name) < 0 ||
git_buf_printf(&var, "remote.%s.fetch", new_name) < 0)
{
error = -1;
break;
}
- git_buf_free(&base);
- git_buf_free(&var);
- git_buf_free(&val);
+ git_buf_dispose(&base);
+ git_buf_dispose(&var);
+ git_buf_dispose(&val);
if (error < 0) {
char *str;
git_buf_printf(&buf, "refs/heads/test:refs/remotes/%s/test", remote_name);
error = git_refspec__parse(&refspec, git_buf_cstr(&buf), true);
- git_buf_free(&buf);
- git_refspec__free(&refspec);
+ git_buf_dispose(&buf);
+ git_refspec__dispose(&refspec);
- giterr_clear();
+ git_error_clear();
return error == 0;
}
if ((error = git_config_delete_entry(config, git_buf_cstr(&buf))) < 0) {
if (error != GIT_ENOTFOUND)
break;
- giterr_clear();
+ git_error_clear();
}
git_buf_clear(&buf);
if ((error = git_config_delete_entry(config, git_buf_cstr(&buf))) < 0) {
if (error != GIT_ENOTFOUND)
break;
- giterr_clear();
+ git_error_clear();
}
}
if (error == GIT_ITEROVER)
error = 0;
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_config_iterator_free(iter);
return error;
}
git_push *push;
git_refspec *spec;
const git_remote_callbacks *cbs = NULL;
- const git_strarray *custom_headers = NULL;
- const git_proxy_options *proxy = NULL;
+ git_remote_connection_opts conn = GIT_REMOTE_CONNECTION_OPTIONS_INIT;
assert(remote);
if (!remote->repo) {
- giterr_set(GITERR_INVALID, "cannot download detached remote");
+ git_error_set(GIT_ERROR_INVALID, "cannot download detached remote");
return -1;
}
if (opts) {
cbs = &opts->callbacks;
- custom_headers = &opts->custom_headers;
- proxy = &opts->proxy_opts;
+ conn.custom_headers = &opts->custom_headers;
+ conn.proxy = &opts->proxy_opts;
}
if (!git_remote_connected(remote) &&
- (error = git_remote_connect(remote, GIT_DIRECTION_PUSH, cbs, proxy, custom_headers)) < 0)
+ (error = git_remote__connect(remote, GIT_DIRECTION_PUSH, cbs, &conn)) < 0)
goto cleanup;
free_refspecs(&remote->active_refspecs);
assert(remote);
if (!remote->repo) {
- giterr_set(GITERR_INVALID, "cannot download detached remote");
+ git_error_set(GIT_ERROR_INVALID, "cannot download detached remote");
return -1;
}
if (opts) {
- GITERR_CHECK_VERSION(&opts->callbacks, GIT_REMOTE_CALLBACKS_VERSION, "git_remote_callbacks");
+ GIT_ERROR_CHECK_VERSION(&opts->callbacks, GIT_REMOTE_CALLBACKS_VERSION, "git_remote_callbacks");
cbs = &opts->callbacks;
custom_headers = &opts->custom_headers;
- GITERR_CHECK_VERSION(&opts->proxy_opts, GIT_PROXY_OPTIONS_VERSION, "git_proxy_options");
+ GIT_ERROR_CHECK_VERSION(&opts->proxy_opts, GIT_PROXY_OPTIONS_VERSION, "git_proxy_options");
proxy = &opts->proxy_opts;
}
int passed_refspecs;
};
+typedef struct git_remote_connection_opts {
+ const git_strarray *custom_headers;
+ const git_proxy_options *proxy;
+} git_remote_connection_opts;
+
+#define GIT_REMOTE_CONNECTION_OPTIONS_INIT { NULL, NULL }
+
+int git_remote__connect(git_remote *remote, git_direction direction, const git_remote_callbacks *callbacks, const git_remote_connection_opts *conn);
+
const char* git_remote__urlfordirection(struct git_remote *remote, int direction);
int git_remote__get_http_proxy(git_remote *remote, bool use_ssl, char **proxy_url);
repo->diff_drivers = NULL;
for (i = 0; i < repo->reserved_names.size; i++)
- git_buf_free(git_array_get(repo->reserved_names, i));
+ git_buf_dispose(git_array_get(repo->reserved_names, i));
git_array_clear(repo->reserved_names);
git__free(repo->gitlink);
git_buf_swap(common_path, &common_link);
}
- git_buf_free(&common_link);
+ git_buf_dispose(&common_link);
}
else {
git_buf_set(common_path, repository_path->ptr, repository_path->size);
git_repository *repo;
*out = repo = repository_alloc();
- GITERR_CHECK_ALLOC(repo);
+ GIT_ERROR_CHECK_ALLOC(repo);
repo->is_bare = 1;
repo->is_worktree = 0;
repo->workdir = git_buf_detach(&worktree);
}
- GITERR_CHECK_ALLOC(repo->workdir);
+ GIT_ERROR_CHECK_ALLOC(repo->workdir);
cleanup:
- git_buf_free(&path);
+ git_buf_dispose(&path);
git_config_entry_free(ce);
return error;
}
if (git_buf_len(&file) <= prefix_len ||
memcmp(git_buf_cstr(&file), GIT_FILE_CONTENT_PREFIX, prefix_len) != 0)
{
- giterr_set(GITERR_REPOSITORY,
+ git_error_set(GIT_ERROR_REPOSITORY,
"the `.git` file at '%s' is malformed", file_path);
error = -1;
}
path_out, gitlink, git_buf_cstr(path_out));
}
- git_buf_free(&file);
+ git_buf_dispose(&file);
return error;
}
/* If we didn't find the repository, and we don't have any other error
* to report, report that. */
if (!git_buf_len(gitdir_path) && !error) {
- giterr_set(GITERR_REPOSITORY,
+ git_error_set(GIT_ERROR_REPOSITORY,
"could not find repository from '%s'", start_path);
error = GIT_ENOTFOUND;
}
- git_buf_free(&path);
- git_buf_free(&repo_link);
- git_buf_free(&common_link);
+ git_buf_dispose(&path);
+ git_buf_dispose(&repo_link);
+ git_buf_dispose(&common_link);
return error;
}
return error;
if (!valid_repository_path(&path, &common_path)) {
- git_buf_free(&path);
- git_buf_free(&common_path);
- giterr_set(GITERR_REPOSITORY, "path is not a repository: %s", bare_path);
+ git_buf_dispose(&path);
+ git_buf_dispose(&common_path);
+ git_error_set(GIT_ERROR_REPOSITORY, "path is not a repository: %s", bare_path);
return GIT_ENOTFOUND;
}
repo = repository_alloc();
- GITERR_CHECK_ALLOC(repo);
+ GIT_ERROR_CHECK_ALLOC(repo);
repo->gitdir = git_buf_detach(&path);
- GITERR_CHECK_ALLOC(repo->gitdir);
+ GIT_ERROR_CHECK_ALLOC(repo->gitdir);
repo->commondir = git_buf_detach(&common_path);
- GITERR_CHECK_ALLOC(repo->commondir);
+ GIT_ERROR_CHECK_ALLOC(repo->commondir);
/* of course we're bare! */
repo->is_bare = 1;
if (!start_path) {
error = git__getenv(&dir_buf, "GIT_DIR");
if (error == GIT_ENOTFOUND) {
- giterr_clear();
+ git_error_clear();
start_path = ".";
} else if (error < 0)
goto error;
error = git__getenv(&ceiling_dirs_buf, "GIT_CEILING_DIRECTORIES");
if (error == GIT_ENOTFOUND)
- giterr_clear();
+ git_error_clear();
else if (error < 0)
goto error;
else
error = git__getenv(&across_fs_buf, "GIT_DISCOVERY_ACROSS_FILESYSTEM");
if (error == GIT_ENOTFOUND)
- giterr_clear();
+ git_error_clear();
else if (error < 0)
goto error;
else {
error = git__getenv(&index_file_buf, "GIT_INDEX_FILE");
if (error == GIT_ENOTFOUND)
- giterr_clear();
+ git_error_clear();
else if (error < 0)
goto error;
else {
error = git__getenv(&namespace_buf, "GIT_NAMESPACE");
if (error == GIT_ENOTFOUND)
- giterr_clear();
+ git_error_clear();
else if (error < 0)
goto error;
error = git__getenv(&object_dir_buf, "GIT_OBJECT_DIRECTORY");
if (error == GIT_ENOTFOUND)
- giterr_clear();
+ git_error_clear();
else if (error < 0)
goto error;
else {
error = git__getenv(&work_tree_buf, "GIT_WORK_TREE");
if (error == GIT_ENOTFOUND)
- giterr_clear();
+ git_error_clear();
else if (error < 0)
goto error;
else {
- giterr_set(GITERR_INVALID, "GIT_WORK_TREE unimplemented");
+ git_error_set(GIT_ERROR_INVALID, "GIT_WORK_TREE unimplemented");
error = GIT_ERROR;
goto error;
}
error = git__getenv(&work_tree_buf, "GIT_COMMON_DIR");
if (error == GIT_ENOTFOUND)
- giterr_clear();
+ git_error_clear();
else if (error < 0)
goto error;
else {
- giterr_set(GITERR_INVALID, "GIT_COMMON_DIR unimplemented");
+ git_error_set(GIT_ERROR_INVALID, "GIT_COMMON_DIR unimplemented");
error = GIT_ERROR;
goto error;
}
error = git__getenv(&alts_buf, "GIT_ALTERNATE_OBJECT_DIRECTORIES");
if (error == GIT_ENOTFOUND) {
- giterr_clear();
+ git_error_clear();
error = 0;
} else if (error < 0)
goto error;
success:
git_odb_free(odb);
git_index_free(index);
- git_buf_free(&common_dir_buf);
- git_buf_free(&work_tree_buf);
- git_buf_free(&alts_buf);
- git_buf_free(&object_dir_buf);
- git_buf_free(&namespace_buf);
- git_buf_free(&index_file_buf);
- git_buf_free(&across_fs_buf);
- git_buf_free(&ceiling_dirs_buf);
- git_buf_free(&dir_buf);
+ git_buf_dispose(&common_dir_buf);
+ git_buf_dispose(&work_tree_buf);
+ git_buf_dispose(&alts_buf);
+ git_buf_dispose(&object_dir_buf);
+ git_buf_dispose(&namespace_buf);
+ git_buf_dispose(&index_file_buf);
+ git_buf_dispose(&across_fs_buf);
+ git_buf_dispose(&ceiling_dirs_buf);
+ git_buf_dispose(&dir_buf);
return error;
}
* only used when the repository is a working tree. */
*out = !!git_path_exists(gitdir_link.ptr);
- git_buf_free(&gitdir_link);
+ git_buf_dispose(&gitdir_link);
return error;
}
return error;
repo = repository_alloc();
- GITERR_CHECK_ALLOC(repo);
+ GIT_ERROR_CHECK_ALLOC(repo);
repo->gitdir = git_buf_detach(&gitdir);
- GITERR_CHECK_ALLOC(repo->gitdir);
+ GIT_ERROR_CHECK_ALLOC(repo->gitdir);
if (gitlink.size) {
repo->gitlink = git_buf_detach(&gitlink);
- GITERR_CHECK_ALLOC(repo->gitlink);
+ GIT_ERROR_CHECK_ALLOC(repo->gitlink);
}
if (commondir.size) {
repo->commondir = git_buf_detach(&commondir);
- GITERR_CHECK_ALLOC(repo->commondir);
+ GIT_ERROR_CHECK_ALLOC(repo->commondir);
}
if ((error = repo_is_worktree(&is_worktree, repo)) < 0)
}
cleanup:
- git_buf_free(&gitdir);
- git_buf_free(&workdir);
+ git_buf_dispose(&gitdir);
+ git_buf_dispose(&workdir);
git_config_free(config);
if (error < 0)
*repo_out = repo;
out:
- git_buf_free(&path);
+ git_buf_dispose(&path);
return err;
}
git_repository *repo;
repo = repository_alloc();
- GITERR_CHECK_ALLOC(repo);
+ GIT_ERROR_CHECK_ALLOC(repo);
git_repository_set_odb(repo, odb);
*repo_out = repo;
git_buf config_path = GIT_BUF_INIT;
git_config *cfg = NULL;
- assert(repo && out);
+ assert(out);
if ((error = git_config_new(&cfg)) < 0)
return error;
- if ((error = git_repository_item_path(&config_path, repo, GIT_REPOSITORY_ITEM_CONFIG)) == 0)
- error = git_config_add_file_ondisk(cfg, config_path.ptr, GIT_CONFIG_LEVEL_LOCAL, repo, 0);
+ if (repo) {
+ if ((error = git_repository_item_path(&config_path, repo, GIT_REPOSITORY_ITEM_CONFIG)) == 0)
+ error = git_config_add_file_ondisk(cfg, config_path.ptr, GIT_CONFIG_LEVEL_LOCAL, repo, 0);
- if (error && error != GIT_ENOTFOUND)
- goto on_error;
+ if (error && error != GIT_ENOTFOUND)
+ goto on_error;
- git_buf_free(&config_path);
+ git_buf_dispose(&config_path);
+ }
if (global_config_path != NULL &&
(error = git_config_add_file_ondisk(
error != GIT_ENOTFOUND)
goto on_error;
- giterr_clear(); /* clear any lingering ENOTFOUND errors */
+ git_error_clear(); /* clear any lingering ENOTFOUND errors */
*out = cfg;
return 0;
on_error:
- git_buf_free(&config_path);
+ git_buf_dispose(&config_path);
git_config_free(cfg);
*out = NULL;
return error;
}
}
- git_buf_free(&global_buf);
- git_buf_free(&xdg_buf);
- git_buf_free(&system_buf);
- git_buf_free(&programdata_buf);
+ git_buf_dispose(&global_buf);
+ git_buf_dispose(&xdg_buf);
+ git_buf_dispose(&system_buf);
+ git_buf_dispose(&programdata_buf);
}
*out = repo->_config;
git_odb_free(odb);
}
- git_buf_free(&odb_path);
+ git_buf_dispose(&odb_path);
}
*out = repo->_odb;
git_index_free(index);
}
- error = git_index_set_caps(repo->_index, GIT_INDEXCAP_FROM_OWNER);
+ error = git_index_set_caps(repo->_index,
+ GIT_INDEX_CAPABILITY_FROM_OWNER);
}
- git_buf_free(&index_path);
+ git_buf_dispose(&index_path);
}
*out = repo->_index;
return -1;
if (GIT_REPO_VERSION < version) {
- giterr_set(GITERR_REPOSITORY,
+ git_error_set(GIT_ERROR_REPOSITORY,
"unsupported repository version %d. Only versions up to %d are supported.",
version, GIT_REPO_VERSION);
return -1;
git_filebuf_commit(&ref) < 0)
goto fail;
- git_buf_free(&ref_path);
+ git_buf_dispose(&ref_path);
return 0;
fail:
- git_buf_free(&ref_path);
+ git_buf_dispose(&ref_path);
git_filebuf_cleanup(&ref);
return -1;
}
if (!git_buf_joinpath(&path, gitdir_path, "CoNfIg"))
is_insensitive = git_path_exists(git_buf_cstr(&path));
- git_buf_free(&path);
+ git_buf_dispose(&path);
return is_insensitive;
}
static bool are_symlinks_supported(const char *wd_path)
{
+ git_config *config = NULL;
+ git_buf global_buf = GIT_BUF_INIT;
+ git_buf xdg_buf = GIT_BUF_INIT;
+ git_buf system_buf = GIT_BUF_INIT;
+ git_buf programdata_buf = GIT_BUF_INIT;
git_buf path = GIT_BUF_INIT;
int fd;
struct stat st;
- int symlinks_supported = -1;
+ int symlinks = 0;
+
+ /*
+ * To emulate Git for Windows, symlinks on Windows must be explicitly
+ * opted-in. We examine the system configuration for a core.symlinks
+ * set to true. If found, we then examine the filesystem to see if
+ * symlinks are _actually_ supported by the current user. If that is
+ * _not_ set, then we do not test or enable symlink support.
+ */
+#ifdef GIT_WIN32
+ git_config_find_global(&global_buf);
+ git_config_find_xdg(&xdg_buf);
+ git_config_find_system(&system_buf);
+ git_config_find_programdata(&programdata_buf);
+
+ if (load_config(&config, NULL,
+ path_unless_empty(&global_buf),
+ path_unless_empty(&xdg_buf),
+ path_unless_empty(&system_buf),
+ path_unless_empty(&programdata_buf)) < 0)
+ goto done;
+
+ if (git_config_get_bool(&symlinks, config, "core.symlinks") < 0 || !symlinks)
+ goto done;
+#endif
if ((fd = git_futils_mktmp(&path, wd_path, 0666)) < 0 ||
- p_close(fd) < 0 ||
- p_unlink(path.ptr) < 0 ||
- p_symlink("testing", path.ptr) < 0 ||
- p_lstat(path.ptr, &st) < 0)
- symlinks_supported = false;
- else
- symlinks_supported = (S_ISLNK(st.st_mode) != 0);
+ p_close(fd) < 0 ||
+ p_unlink(path.ptr) < 0 ||
+ p_symlink("testing", path.ptr) < 0 ||
+ p_lstat(path.ptr, &st) < 0)
+ goto done;
+
+ symlinks = (S_ISLNK(st.st_mode) != 0);
(void)p_unlink(path.ptr);
- git_buf_free(&path);
- return symlinks_supported;
+done:
+ git_buf_dispose(&global_buf);
+ git_buf_dispose(&xdg_buf);
+ git_buf_dispose(&system_buf);
+ git_buf_dispose(&programdata_buf);
+ git_buf_dispose(&path);
+ git_config_free(config);
+ return symlinks != 0;
}
static int create_empty_file(const char *path, mode_t mode)
int fd;
if ((fd = p_creat(path, mode)) < 0) {
- giterr_set(GITERR_OS, "error while creating '%s'", path);
+ git_error_set(GIT_ERROR_OS, "error while creating '%s'", path);
return -1;
}
if (p_close(fd) < 0) {
- giterr_set(GITERR_OS, "error while closing '%s'", path);
+ git_error_set(GIT_ERROR_OS, "error while closing '%s'", path);
return -1;
}
return error;
if (git_config_open_level(out, parent, GIT_CONFIG_LEVEL_LOCAL) < 0) {
- giterr_clear();
+ git_error_clear();
if (!(error = git_config_add_file_ondisk(
parent, cfg_path, GIT_CONFIG_LEVEL_LOCAL, repo, false)))
if ((error = git_config_set_bool(cfg, "core.symlinks", false)) < 0)
return error;
} else if (git_config_delete_entry(cfg, "core.symlinks") < 0)
- giterr_clear();
+ git_error_clear();
if (update_ignorecase) {
if (is_filesystem_case_insensitive(repo_dir)) {
if ((error = git_config_set_bool(cfg, "core.ignorecase", true)) < 0)
return error;
} else if (git_config_delete_entry(cfg, "core.ignorecase") < 0)
- giterr_clear();
+ git_error_clear();
}
#ifdef GIT_USE_ICONV
SET_REPO_CONFIG(string, "core.worktree", worktree_path.ptr);
} else if (is_reinit) {
if (git_config_delete_entry(config, "core.worktree") < 0)
- giterr_clear();
+ git_error_clear();
}
}
}
cleanup:
- git_buf_free(&cfg_path);
- git_buf_free(&worktree_path);
+ git_buf_dispose(&cfg_path);
+ git_buf_dispose(&worktree_path);
git_config_free(config);
return error;
if (git_submodule_open(&smrepo, sm) < 0 ||
git_repository_reinit_filesystem(smrepo, true) < 0)
- giterr_clear();
+ git_error_clear();
git_repository_free(smrepo);
return 0;
config, path.ptr, repo_dir, git_repository_workdir(repo), true);
git_config_free(config);
- git_buf_free(&path);
+ git_buf_dispose(&path);
git_repository__cvar_cache_clear(repo);
GIT_UNUSED(hidden);
#endif
- git_buf_free(&path);
+ git_buf_dispose(&path);
if (error)
- giterr_set(GITERR_OS,
+ git_error_set(GIT_ERROR_OS,
"failed to initialize repository with template '%s'", file);
return error;
goto cleanup;
if (!p_stat(buf.ptr, &st) && !S_ISREG(st.st_mode)) {
- giterr_set(GITERR_REPOSITORY,
+ git_error_set(GIT_ERROR_REPOSITORY,
"cannot overwrite gitlink file into path '%s'", in_dir);
error = GIT_EEXISTS;
goto cleanup;
error = repo_write_template(in_dir, true, DOT_GIT, 0666, true, buf.ptr);
cleanup:
- git_buf_free(&buf);
- git_buf_free(&path_to_repo);
+ git_buf_dispose(&buf);
+ git_buf_dispose(&path_to_repo);
return error;
}
#ifdef GIT_WIN32
if ((opts->flags & GIT_REPOSITORY_INIT__HAS_DOTGIT) != 0) {
if (git_win32__set_hidden(repo_dir, true) < 0) {
- giterr_set(GITERR_OS,
+ git_error_set(GIT_ERROR_OS,
"failed to mark Git repository folder as hidden");
return -1;
}
else if ((error = git_config_open_default(&cfg)) >= 0) {
if (!git_config_get_path(&template_buf, cfg, "init.templatedir"))
tdir = template_buf.ptr;
- giterr_clear();
+ git_error_clear();
}
if (!tdir) {
error = git_futils_cp_r(tdir, repo_dir, cpflags, dmode);
}
- git_buf_free(&template_buf);
+ git_buf_dispose(&template_buf);
git_config_free(cfg);
if (error < 0) {
return error;
/* if template was default, ignore error and use internal */
- giterr_clear();
+ git_error_clear();
external_tpl = false;
error = 0;
}
if (git_path_dirname_r(wd_path, repo_path->ptr) < 0)
return -1;
} else {
- giterr_set(GITERR_REPOSITORY, "cannot pick working directory"
+ git_error_set(GIT_ERROR_REPOSITORY, "cannot pick working directory"
" for non-bare repository that isn't a '.git' directory");
return -1;
}
assert(out && given_repo && opts);
- GITERR_CHECK_VERSION(opts, GIT_REPOSITORY_INIT_OPTIONS_VERSION, "git_repository_init_options");
+ GIT_ERROR_CHECK_VERSION(opts, GIT_REPOSITORY_INIT_OPTIONS_VERSION, "git_repository_init_options");
error = repo_init_directories(&repo_path, &wd_path, given_repo, opts);
if (error < 0)
if (valid_repository_path(&repo_path, &common_path)) {
if ((opts->flags & GIT_REPOSITORY_INIT_NO_REINIT) != 0) {
- giterr_set(GITERR_REPOSITORY,
+ git_error_set(GIT_ERROR_REPOSITORY,
"attempt to reinitialize '%s'", given_repo);
error = GIT_EEXISTS;
goto cleanup;
error = repo_init_create_origin(*out, opts->origin_url);
cleanup:
- git_buf_free(&common_path);
- git_buf_free(&repo_path);
- git_buf_free(&wd_path);
+ git_buf_dispose(&common_path);
+ git_buf_dispose(&repo_path);
+ git_buf_dispose(&wd_path);
return error;
}
if (git_reference_lookup(&ref, repo, GIT_HEAD_FILE) < 0)
return -1;
- if (git_reference_type(ref) == GIT_REF_SYMBOLIC) {
+ if (git_reference_type(ref) == GIT_REFERENCE_SYMBOLIC) {
git_reference_free(ref);
return 0;
}
if ((error = git_repository_head_for_worktree(&ref, repo, name)) < 0)
goto out;
- error = (git_reference_type(ref) != GIT_REF_SYMBOLIC);
+ error = (git_reference_type(ref) != GIT_REFERENCE_SYMBOLIC);
out:
git_reference_free(ref);
git_reference *head;
int error;
+ assert(head_out);
+
if ((error = git_reference_lookup(&head, repo, GIT_HEAD_FILE)) < 0)
return error;
- if (git_reference_type(head) == GIT_REF_OID) {
+ if (git_reference_type(head) == GIT_REFERENCE_DIRECT) {
*head_out = head;
return 0;
}
(error = git_reference__read_head(&head, repo, path.ptr)) < 0)
goto out;
- if (git_reference_type(head) != GIT_REF_OID) {
+ if (git_reference_type(head) != GIT_REFERENCE_DIRECT) {
git_reference *resolved;
error = git_reference_lookup_resolved(&resolved, repo, git_reference_symbolic_target(head), -1);
if (error)
git_reference_free(head);
- git_buf_free(&path);
+ git_buf_dispose(&path);
return error;
}
}
out:
- git_buf_free(&path);
+ git_buf_dispose(&path);
git_strarray_free(&worktrees);
return error;
}
git_reference_free(ref);
if (error == GIT_EUNBORNBRANCH) {
- giterr_clear();
+ git_error_clear();
return 1;
}
if (git_reference_lookup(&head, repo, GIT_HEAD_FILE) < 0)
return -1;
- if (git_reference_type(head) == GIT_REF_SYMBOLIC)
+ if (git_reference_type(head) == GIT_REFERENCE_SYMBOLIC)
is_empty =
(strcmp(git_reference_symbolic_target(head),
GIT_REFS_HEADS_DIR "master") == 0) &&
parent = git_repository_commondir(repo);
break;
default:
- giterr_set(GITERR_INVALID, "invalid item directory");
+ git_error_set(GIT_ERROR_INVALID, "invalid item directory");
return -1;
}
if (parent == NULL) {
- giterr_set(GITERR_INVALID, "path cannot exist in repository");
+ git_error_set(GIT_ERROR_INVALID, "path cannot exist in repository");
return GIT_ENOTFOUND;
}
if ((error = git_repository_head(&head, repo)) < 0)
return error;
- if ((error = git_reference_peel(&obj, head, GIT_OBJ_TREE)) < 0)
+ if ((error = git_reference_peel(&obj, head, GIT_OBJECT_TREE)) < 0)
goto cleanup;
*tree = (git_tree *)obj;
if (error < 0)
git_filebuf_cleanup(&file);
- git_buf_free(&file_path);
+ git_buf_dispose(&file_path);
return error;
}
if ((error = p_stat(git_buf_cstr(&path), &st)) < 0) {
if (errno == ENOENT)
error = GIT_ENOTFOUND;
- giterr_set(GITERR_OS, "could not access message file");
+ git_error_set(GIT_ERROR_OS, "could not access message file");
} else {
error = git_futils_readbuffer(out, git_buf_cstr(&path));
}
- git_buf_free(&path);
+ git_buf_dispose(&path);
return error;
}
return -1;
error = p_unlink(git_buf_cstr(&path));
- git_buf_free(&path);
+ git_buf_dispose(&path);
return error;
}
git_oid *out,
git_repository *repo,
const char *path,
- git_otype type,
+ git_object_t type,
const char *as_path)
{
int error;
}
if (!git__is_sizet(len)) {
- giterr_set(GITERR_OS, "file size overflow for 32-bit systems");
+ git_error_set(GIT_ERROR_OS, "file size overflow for 32-bit systems");
error = -1;
goto cleanup;
}
if (fd >= 0)
p_close(fd);
git_filter_list_free(fl);
- git_buf_free(&full_path);
+ git_buf_dispose(&full_path);
return error;
}
{
git_buf_puts(out, "checkout: moving from ");
- if (git_reference_type(old) == GIT_REF_SYMBOLIC)
+ if (git_reference_type(old) == GIT_REFERENCE_SYMBOLIC)
git_buf_puts(out, git_reference__shorthand(git_reference_symbolic_target(old)));
else
git_buf_puts(out, git_oid_tostr_s(git_reference_target(old)));
if ((error = git_reference_lookup(¤t, repo, GIT_HEAD_FILE)) < 0)
return error;
- if ((error = git_object_lookup(&object, repo, id, GIT_OBJ_ANY)) < 0)
+ if ((error = git_object_lookup(&object, repo, id, GIT_OBJECT_ANY)) < 0)
goto cleanup;
- if ((error = git_object_peel(&peeled, object, GIT_OBJ_COMMIT)) < 0)
+ if ((error = git_object_peel(&peeled, object, GIT_OBJECT_COMMIT)) < 0)
goto cleanup;
if (new == NULL)
error = git_reference_create(&new_head, repo, GIT_HEAD_FILE, git_object_id(peeled), true, git_buf_cstr(&log_message));
cleanup:
- git_buf_free(&log_message);
+ git_buf_dispose(&log_message);
git_object_free(object);
git_object_free(peeled);
git_reference_free(current);
if (error < 0 && error != GIT_ENOTFOUND)
goto cleanup;
- if (ref && current->type == GIT_REF_SYMBOLIC && git__strcmp(current->target.symbolic, ref->name) &&
+ if (ref && current->type == GIT_REFERENCE_SYMBOLIC && git__strcmp(current->target.symbolic, ref->name) &&
git_reference_is_branch(ref) && git_branch_is_checked_out(ref)) {
- giterr_set(GITERR_REPOSITORY, "cannot set HEAD to reference '%s' as it is the current HEAD "
+ git_error_set(GIT_ERROR_REPOSITORY, "cannot set HEAD to reference '%s' as it is the current HEAD "
"of a linked repository.", git_reference_name(ref));
error = -1;
goto cleanup;
}
cleanup:
- git_buf_free(&log_message);
+ git_buf_dispose(&log_message);
git_reference_free(current);
git_reference_free(ref);
git_reference_free(new_head);
if ((error = git_repository_head(&old_head, repo)) < 0)
goto cleanup;
- if ((error = git_object_lookup(&object, repo, git_reference_target(old_head), GIT_OBJ_COMMIT)) < 0)
+ if ((error = git_object_lookup(&object, repo, git_reference_target(old_head), GIT_OBJECT_COMMIT)) < 0)
goto cleanup;
if ((error = checkout_message(&log_message, current, git_oid_tostr_s(git_object_id(object)))) < 0)
1, git_buf_cstr(&log_message));
cleanup:
- git_buf_free(&log_message);
+ git_buf_dispose(&log_message);
git_object_free(object);
git_reference_free(old_head);
git_reference_free(new_head);
} else if (git_path_contains_file(&repo_path, GIT_BISECT_LOG_FILE))
state = GIT_REPOSITORY_STATE_BISECT;
- git_buf_free(&repo_path);
+ git_buf_dispose(&repo_path);
return state;
}
git_buf_clear(&buf);
}
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return error;
}
return error;
error = git_path_lstat(path.ptr, &st);
- git_buf_free(&path);
+ git_buf_dispose(&path);
if (error == GIT_ENOTFOUND) {
- giterr_clear();
+ git_error_clear();
return 0;
}
if (name) {
tmp_name = git__strdup(name);
- GITERR_CHECK_ALLOC(tmp_name);
+ GIT_ERROR_CHECK_ALLOC(tmp_name);
}
if (email) {
tmp_email = git__strdup(email);
- GITERR_CHECK_ALLOC(tmp_email);
+ GIT_ERROR_CHECK_ALLOC(tmp_email);
}
tmp_name = git__swap(repo->ident_name, tmp_name);
/* core.safecrlf */
GIT_SAFE_CRLF_DEFAULT = GIT_CVAR_FALSE,
/* core.logallrefupdates */
+ GIT_LOGALLREFUPDATES_FALSE = GIT_CVAR_FALSE,
+ GIT_LOGALLREFUPDATES_TRUE = GIT_CVAR_TRUE,
GIT_LOGALLREFUPDATES_UNSET = 2,
+ GIT_LOGALLREFUPDATES_ALWAYS = 3,
GIT_LOGALLREFUPDATES_DEFAULT = GIT_LOGALLREFUPDATES_UNSET,
/* core.protectHFS */
GIT_PROTECTHFS_DEFAULT = GIT_CVAR_FALSE,
if (!git_repository_is_bare(repo))
return 0;
- giterr_set(
- GITERR_REPOSITORY,
+ git_error_set(
+ GIT_ERROR_REPOSITORY,
"cannot %s. This operation is not allowed against bare repositories.",
operation_name);
if (target) {
if (git_object_owner(target) != repo) {
- giterr_set(GITERR_OBJECT,
+ git_error_set(GIT_ERROR_OBJECT,
"%s_default - The given target does not belong to this repository.", ERROR_MSG);
return -1;
}
- if ((error = git_object_peel(&commit, target, GIT_OBJ_COMMIT)) < 0 ||
+ if ((error = git_object_peel(&commit, target, GIT_OBJECT_COMMIT)) < 0 ||
(error = git_commit_tree(&tree, (git_commit *)commit)) < 0)
goto cleanup;
}
error = git_index_conflict_remove(index, delta->old_file.path);
if (error < 0) {
if (delta->status == GIT_DELTA_ADDED && error == GIT_ENOTFOUND)
- giterr_clear();
+ git_error_clear();
else
goto cleanup;
}
opts = *checkout_opts;
if (git_object_owner(target) != repo) {
- giterr_set(GITERR_OBJECT,
+ git_error_set(GIT_ERROR_OBJECT,
"%s - The given target does not belong to this repository.", ERROR_MSG);
return -1;
}
reset_type == GIT_RESET_MIXED ? "reset mixed" : "reset hard")) < 0)
return error;
- if ((error = git_object_peel(&commit, target, GIT_OBJ_COMMIT)) < 0 ||
+ if ((error = git_object_peel(&commit, target, GIT_OBJECT_COMMIT)) < 0 ||
(error = git_repository_index(&index, repo)) < 0 ||
(error = git_commit_tree(&tree, (git_commit *)commit)) < 0)
goto cleanup;
(git_repository_state(repo) == GIT_REPOSITORY_STATE_MERGE ||
git_index_has_conflicts(index)))
{
- giterr_set(GITERR_OBJECT, "%s (soft) in the middle of a merge", ERROR_MSG);
+ git_error_set(GIT_ERROR_OBJECT, "%s (soft) in the middle of a merge", ERROR_MSG);
error = GIT_EUNMERGED;
goto cleanup;
}
goto cleanup;
if ((error = git_repository_state_cleanup(repo)) < 0) {
- giterr_set(GITERR_INDEX, "%s - failed to clean up merge data", ERROR_MSG);
+ git_error_set(GIT_ERROR_INDEX, "%s - failed to clean up merge data", ERROR_MSG);
goto cleanup;
}
}
git_object_free(commit);
git_index_free(index);
git_tree_free(tree);
- git_buf_free(&log_message);
+ git_buf_dispose(&log_message);
return error;
}
if (error < 0)
git_filebuf_cleanup(&file);
- git_buf_free(&file_path);
+ git_buf_dispose(&file_path);
return error;
}
if (error < 0)
git_filebuf_cleanup(&file);
- git_buf_free(&file_path);
+ git_buf_dispose(&file_path);
return error;
}
git_oid_fmt(commit_oidstr, git_commit_id(commit));
commit_oidstr[GIT_OID_HEXSZ] = '\0';
- giterr_set(GITERR_REVERT, fmt, commit_oidstr);
+ git_error_set(GIT_ERROR_REVERT, fmt, commit_oidstr);
return -1;
}
assert(repo && commit);
- GITERR_CHECK_VERSION(given_opts, GIT_REVERT_OPTIONS_VERSION, "git_revert_options");
+ GIT_ERROR_CHECK_VERSION(given_opts, GIT_REVERT_OPTIONS_VERSION, "git_revert_options");
if ((error = git_repository__ensure_not_bare(repo, "revert")) < 0)
return error;
(error = write_revert_head(repo, commit_oidstr)) < 0 ||
(error = write_merge_msg(repo, commit_oidstr, commit_msg)) < 0 ||
(error = git_repository_head(&our_ref, repo)) < 0 ||
- (error = git_reference_peel((git_object **)&our_commit, our_ref, GIT_OBJ_COMMIT)) < 0 ||
+ (error = git_reference_peel((git_object **)&our_commit, our_ref, GIT_OBJECT_COMMIT)) < 0 ||
(error = git_revert_commit(&index, repo, commit, our_commit, opts.mainline, &opts.merge_opts)) < 0 ||
(error = git_merge__check_result(repo, index)) < 0 ||
(error = git_merge__append_conflicts_to_merge_msg(repo, index)) < 0 ||
git_index_free(index);
git_commit_free(our_commit);
git_reference_free(our_ref);
- git_buf_free(&their_label);
+ git_buf_dispose(&their_label);
return error;
}
if (git_oid_fromstrn(&oid, spec, speclen) < 0)
return GIT_ENOTFOUND;
- return git_object_lookup_prefix(out, repo, &oid, speclen, GIT_OBJ_ANY);
+ return git_object_lookup_prefix(out, repo, &oid, speclen, GIT_OBJECT_ANY);
}
static int maybe_sha(git_object** out, git_repository *repo, const char *spec)
int error;
if (*pattern == '\0') {
- giterr_set(GITERR_REGEX, "empty pattern");
+ git_error_set(GIT_ERROR_REGEX, "empty pattern");
return GIT_EINVALIDSPEC;
}
if (!error)
return 0;
- error = giterr_set_regex(regex, error);
+ error = git_error_set_regex(regex, error);
regfree(regex);
if (!error) {
error = git_object_lookup(
- object_out, repo, git_reference_target(ref), GIT_OBJ_ANY);
+ object_out, repo, git_reference_target(ref), GIT_OBJECT_ANY);
if (!error)
*reference_out = ref;
if ((error = maybe_describe(object_out, repo, spec)) != GIT_ENOTFOUND)
return error;
- giterr_set(GITERR_REFERENCE, "revspec '%s' not found", spec);
+ git_error_set(GIT_ERROR_REFERENCE, "revspec '%s' not found", spec);
return GIT_ENOTFOUND;
}
cleanup:
git_reference_free(ref);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
regfree(&preg);
git_reflog_free(reflog);
return error;
return 0;
notfound:
- giterr_set(
- GITERR_REFERENCE,
+ git_error_set(
+ GIT_ERROR_REFERENCE,
"reflog for '%s' has only %"PRIuZ" entries, asked for %"PRIuZ,
git_reference_name(ref), numentries, identifier);
}
if (position == 0) {
- error = git_object_lookup(out, repo, git_reference_target(ref), GIT_OBJ_ANY);
+ error = git_object_lookup(out, repo, git_reference_target(ref), GIT_OBJECT_ANY);
goto cleanup;
}
if ((error = retrieve_oid_from_reflog(&oid, ref, position)) < 0)
goto cleanup;
- error = git_object_lookup(out, repo, &oid, GIT_OBJ_ANY);
+ error = git_object_lookup(out, repo, &oid, GIT_OBJECT_ANY);
cleanup:
git_reference_free(ref);
error = retrieve_revobject_from_reflog(out, ref, repo, git_buf_cstr(&identifier), (size_t)timestamp);
cleanup:
- git_buf_free(&identifier);
+ git_buf_dispose(&identifier);
return error;
}
-static git_otype parse_obj_type(const char *str)
+static git_object_t parse_obj_type(const char *str)
{
if (!strcmp(str, "commit"))
- return GIT_OBJ_COMMIT;
+ return GIT_OBJECT_COMMIT;
if (!strcmp(str, "tree"))
- return GIT_OBJ_TREE;
+ return GIT_OBJECT_TREE;
if (!strcmp(str, "blob"))
- return GIT_OBJ_BLOB;
+ return GIT_OBJECT_BLOB;
if (!strcmp(str, "tag"))
- return GIT_OBJ_TAG;
+ return GIT_OBJECT_TAG;
- return GIT_OBJ_BAD;
+ return GIT_OBJECT_INVALID;
}
static int dereference_to_non_tag(git_object **out, git_object *obj)
{
- if (git_object_type(obj) == GIT_OBJ_TAG)
+ if (git_object_type(obj) == GIT_OBJECT_TAG)
return git_tag_peel(out, (git_tag *)obj);
return git_object_dup(out, obj);
git_object *temp_commit = NULL;
int error;
- if ((error = git_object_peel(&temp_commit, obj, GIT_OBJ_COMMIT)) < 0)
+ if ((error = git_object_peel(&temp_commit, obj, GIT_OBJECT_COMMIT)) < 0)
return (error == GIT_EAMBIGUOUS || error == GIT_ENOTFOUND) ?
GIT_EINVALIDSPEC : error;
git_object *temp_commit = NULL;
int error;
- if ((error = git_object_peel(&temp_commit, obj, GIT_OBJ_COMMIT)) < 0)
+ if ((error = git_object_peel(&temp_commit, obj, GIT_OBJECT_COMMIT)) < 0)
return (error == GIT_EAMBIGUOUS || error == GIT_ENOTFOUND) ?
GIT_EINVALIDSPEC : error;
int error = -1;
git_tree_entry *entry = NULL;
- if ((error = git_object_peel(&tree, obj, GIT_OBJ_TREE)) < 0)
+ if ((error = git_object_peel(&tree, obj, GIT_OBJECT_TREE)) < 0)
return error == GIT_ENOTFOUND ? GIT_EINVALIDSPEC : error;
if (*path == '\0') {
while (!(error = git_revwalk_next(&oid, walk))) {
- error = git_object_lookup(&obj, git_revwalk_repository(walk), &oid, GIT_OBJ_COMMIT);
+ error = git_object_lookup(&obj, git_revwalk_repository(walk), &oid, GIT_OBJECT_COMMIT);
if ((error < 0) && (error != GIT_ENOTFOUND))
return -1;
static int handle_caret_curly_syntax(git_object **out, git_object *obj, const char *curly_braces_content)
{
- git_otype expected_type;
+ git_object_t expected_type;
if (*curly_braces_content == '\0')
return dereference_to_non_tag(out, obj);
expected_type = parse_obj_type(curly_braces_content);
- if (expected_type == GIT_OBJ_BAD)
+ if (expected_type == GIT_OBJECT_INVALID)
return GIT_EINVALIDSPEC;
return git_object_peel(out, obj, expected_type);
if (git_reference_resolve(&resolved, reference) < 0)
return -1;
- error = git_object_lookup(object, reference->db->repo, git_reference_target(resolved), GIT_OBJ_ANY);
+ error = git_object_lookup(object, reference->db->repo, git_reference_target(resolved), GIT_OBJECT_ANY);
git_reference_free(resolved);
return error;
return -1;
error = revparse_lookup_object(object, reference, repo, git_buf_cstr(&identifier));
- git_buf_free(&identifier);
+ git_buf_dispose(&identifier);
return error;
}
* TODO: support merge-stage path lookup (":2:Makefile")
* and plain index blob lookup (:i-am/a/blob)
*/
- giterr_set(GITERR_INVALID, "unimplemented");
+ git_error_set(GIT_ERROR_INVALID, "unimplemented");
error = GIT_ERROR;
goto cleanup;
}
cleanup:
if (error) {
if (error == GIT_EINVALIDSPEC)
- giterr_set(GITERR_INVALID,
+ git_error_set(GIT_ERROR_INVALID,
"failed to parse revision specifier - Invalid pattern '%s'", spec);
git_object_free(base_rev);
git_reference_free(reference);
}
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return error;
}
* allowed.
*/
if (!git__strcmp(spec, "..")) {
- giterr_set(GITERR_INVALID, "Invalid pattern '..'");
+ git_error_set(GIT_ERROR_INVALID, "Invalid pattern '..'");
return GIT_EINVALIDSPEC;
}
#include "merge.h"
#include "vector.h"
+static int get_revision(git_commit_list_node **out, git_revwalk *walk, git_commit_list **list);
+
git_commit_list_node *git_revwalk__commit_lookup(
git_revwalk *walk, const git_oid *oid)
{
git_commit_list_node *commit;
- khiter_t pos;
+ size_t pos;
int ret;
/* lookup and reserve space if not already present */
git_commit_list_node *commit;
git_commit_list *list;
- if ((error = git_object_lookup(&oobj, walk->repo, oid, GIT_OBJ_ANY)) < 0)
+ if ((error = git_object_lookup(&oobj, walk->repo, oid, GIT_OBJECT_ANY)) < 0)
return error;
- error = git_object_peel(&obj, oobj, GIT_OBJ_COMMIT);
+ error = git_object_peel(&obj, oobj, GIT_OBJECT_COMMIT);
git_object_free(oobj);
if (error == GIT_ENOTFOUND || error == GIT_EINVALIDSPEC || error == GIT_EPEEL) {
if (from_glob)
return 0;
- giterr_set(GITERR_INVALID, "object is not a committish");
+ git_error_set(GIT_ERROR_INVALID, "object is not a committish");
return -1;
}
if (error < 0)
if (commit->uninteresting)
return 0;
- if (uninteresting)
+ if (uninteresting) {
+ walk->limited = 1;
walk->did_hide = 1;
- else
+ } else {
walk->did_push = 1;
+ }
commit->uninteresting = uninteresting;
list = walk->user_input;
if (git_commit_list_insert(commit, &list) == NULL) {
- giterr_set_oom();
+ git_error_set_oom();
return -1;
}
git_buf_joinpath(&buf, GIT_REFS_DIR, glob);
else
git_buf_puts(&buf, glob);
- GITERR_CHECK_ALLOC_BUF(&buf);
+ GIT_ERROR_CHECK_ALLOC_BUF(&buf);
/* If no '?', '*' or '[' exist, we append '/ *' to the glob */
wildcard = strcspn(glob, "?*[");
if (error == GIT_ITEROVER)
error = 0;
out:
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return error;
}
if (revspec.flags & GIT_REVPARSE_MERGE_BASE) {
/* TODO: support "<commit>...<commit>" */
- giterr_set(GITERR_INVALID, "symmetric differences not implemented in revwalk");
+ git_error_set(GIT_ERROR_INVALID, "symmetric differences not implemented in revwalk");
return GIT_EINVALIDSPEC;
}
}
}
- giterr_clear();
+ git_error_clear();
return GIT_ITEROVER;
}
static int revwalk_next_unsorted(git_commit_list_node **object_out, git_revwalk *walk)
{
+ int error;
git_commit_list_node *next;
- while ((next = git_commit_list_pop(&walk->iterator_rand)) != NULL) {
+ while (!(error = get_revision(&next, walk, &walk->iterator_rand))) {
/* Some commits might become uninteresting after being added to the list */
if (!next->uninteresting) {
*object_out = next;
}
}
- giterr_clear();
- return GIT_ITEROVER;
+ return error;
}
static int revwalk_next_toposort(git_commit_list_node **object_out, git_revwalk *walk)
{
+ int error;
git_commit_list_node *next;
- while ((next = git_commit_list_pop(&walk->iterator_topo)) != NULL) {
+ while (!(error = get_revision(&next, walk, &walk->iterator_topo))) {
/* Some commits might become uninteresting after being added to the list */
if (!next->uninteresting) {
*object_out = next;
}
}
- giterr_clear();
- return GIT_ITEROVER;
+ return error;
}
static int revwalk_next_reverse(git_commit_list_node **object_out, git_revwalk *walk)
break;
}
- if (!commit->uninteresting && walk->hide_cb && walk->hide_cb(&commit->oid, walk->hide_cb_payload))
- continue;
+ if (walk->hide_cb && walk->hide_cb(&commit->oid, walk->hide_cb_payload))
+ continue;
time = commit->time;
p = &git_commit_list_insert(commit, p)->next;
return 0;
}
+static int get_revision(git_commit_list_node **out, git_revwalk *walk, git_commit_list **list)
+{
+ int error;
+ git_commit_list_node *commit;
+
+ commit = git_commit_list_pop(list);
+ if (!commit) {
+ git_error_clear();
+ return GIT_ITEROVER;
+ }
+
+ /*
+ * If we did not run limit_list and we must add parents to the
+ * list ourselves.
+ */
+ if (!walk->limited) {
+ if ((error = add_parents_to_list(walk, commit, list)) < 0)
+ return error;
+ }
+
+ *out = commit;
+ return 0;
+}
+
static int sort_in_topological_order(git_commit_list **out, git_revwalk *walk, git_commit_list *list)
{
git_commit_list *ll = NULL, *newlist, **pptr;
/* If there were no pushes, we know that the walk is already over */
if (!walk->did_push) {
- giterr_clear();
+ git_error_clear();
return GIT_ITEROVER;
}
}
}
- if ((error = limit_list(&commits, walk, commits)) < 0)
+ if (walk->limited && (error = limit_list(&commits, walk, commits)) < 0)
return error;
if (walk->sorting & GIT_SORT_TOPOLOGICAL) {
int git_revwalk_new(git_revwalk **revwalk_out, git_repository *repo)
{
git_revwalk *walk = git__calloc(1, sizeof(git_revwalk));
- GITERR_CHECK_ALLOC(walk);
+ GIT_ERROR_CHECK_ALLOC(walk);
walk->commits = git_oidmap_alloc();
- GITERR_CHECK_ALLOC(walk->commits);
+ GIT_ERROR_CHECK_ALLOC(walk->commits);
if (git_pqueue_init(&walk->iterator_time, 0, 8, git_commit_list_time_cmp) < 0)
return -1;
walk->get_next = &revwalk_next_unsorted;
walk->enqueue = &revwalk_enqueue_unsorted;
}
+
+ if (walk->sorting != GIT_SORT_NONE)
+ walk->limited = 1;
}
void git_revwalk_simplify_first_parent(git_revwalk *walk)
if (error == GIT_ITEROVER) {
git_revwalk_reset(walk);
- giterr_clear();
+ git_error_clear();
return GIT_ITEROVER;
}
git_commit_list_free(&walk->user_input);
walk->first_parent = 0;
walk->walking = 0;
+ walk->limited = 0;
walk->did_push = walk->did_hide = 0;
+ walk->sorting = GIT_SORT_NONE;
}
int git_revwalk_add_hide_cb(
if (walk->walking)
git_revwalk_reset(walk);
- if (walk->hide_cb) {
- /* There is already a callback added */
- giterr_set(GITERR_INVALID, "there is already a callback added to hide commits in revwalk");
- return -1;
- }
-
walk->hide_cb = hide_cb;
walk->hide_cb_payload = payload;
+ if (hide_cb)
+ walk->limited = 1;
+
return 0;
}
unsigned walking:1,
first_parent: 1,
did_hide: 1,
- did_push: 1;
+ did_push: 1,
+ limited: 1;
unsigned int sorting;
/* the pushes and hides */
# include <openssl/err.h>
#endif
+#ifdef GIT_MBEDTLS
+# include <mbedtls/error.h>
+#endif
+
#include <git2.h>
+#include "alloc.h"
#include "sysdir.h"
#include "cache.h"
#include "global.h"
#include "object.h"
#include "odb.h"
#include "refs.h"
+#include "index.h"
#include "transports/smart.h"
#include "streams/openssl.h"
+#include "streams/mbedtls.h"
void git_libgit2_version(int *major, int *minor, int *rev)
{
/* Declarations for tuneable settings */
extern size_t git_mwindow__window_size;
extern size_t git_mwindow__mapped_limit;
+extern size_t git_indexer__max_objects;
static int config_level_to_sysdir(int config_level)
{
val = GIT_SYSDIR_PROGRAMDATA;
break;
default:
- giterr_set(
- GITERR_INVALID, "invalid config path selector %d", config_level);
+ git_error_set(
+ GIT_ERROR_INVALID, "invalid config path selector %d", config_level);
}
return val;
case GIT_OPT_SET_CACHE_OBJECT_LIMIT:
{
- git_otype type = (git_otype)va_arg(ap, int);
+ git_object_t type = (git_object_t)va_arg(ap, int);
size_t size = va_arg(ap, size_t);
error = git_cache_set_max_object_size(type, size);
break;
const char *path = va_arg(ap, const char *);
error = git_openssl__set_cert_location(file, path);
}
+#elif defined(GIT_MBEDTLS)
+ {
+ const char *file = va_arg(ap, const char *);
+ const char *path = va_arg(ap, const char *);
+ if (file)
+ error = git_mbedtls__set_cert_location(file, 0);
+ if (error && path)
+ error = git_mbedtls__set_cert_location(path, 1);
+ }
#else
- giterr_set(GITERR_SSL, "TLS backend doesn't support certificate locations");
+ git_error_set(GIT_ERROR_SSL, "TLS backend doesn't support certificate locations");
error = -1;
#endif
break;
git__free(git__user_agent);
git__user_agent = git__strdup(va_arg(ap, const char *));
if (!git__user_agent) {
- giterr_set_oom();
+ git_error_set_oom();
error = -1;
}
break;
case GIT_OPT_SET_SSL_CIPHERS:
-#ifdef GIT_OPENSSL
+#if (GIT_OPENSSL || GIT_MBEDTLS)
{
git__free(git__ssl_ciphers);
git__ssl_ciphers = git__strdup(va_arg(ap, const char *));
if (!git__ssl_ciphers) {
- giterr_set_oom();
+ git_error_set_oom();
error = -1;
}
}
#else
- giterr_set(GITERR_SSL, "TLS backend doesn't support custom ciphers");
+ git_error_set(GIT_ERROR_SSL, "TLS backend doesn't support custom ciphers");
error = -1;
#endif
break;
git_odb__strict_hash_verification = (va_arg(ap, int) != 0);
break;
+ case GIT_OPT_SET_ALLOCATOR:
+ error = git_allocator_setup(va_arg(ap, git_allocator *));
+ break;
+
+ case GIT_OPT_ENABLE_UNSAVED_INDEX_SAFETY:
+ git_index__enforce_unsaved_safety = (va_arg(ap, int) != 0);
+ break;
+
+ case GIT_OPT_SET_PACK_MAX_OBJECTS:
+ git_indexer__max_objects = va_arg(ap, size_t);
+ break;
+
+ case GIT_OPT_GET_PACK_MAX_OBJECTS:
+ *(va_arg(ap, size_t *)) = git_indexer__max_objects;
+ break;
+
default:
- giterr_set(GITERR_INVALID, "invalid option key");
+ git_error_set(GIT_ERROR_INVALID, "invalid option key");
error = -1;
}
return error;
}
-
static int signature_error(const char *msg)
{
- giterr_set(GITERR_INVALID, "failed to parse signature - %s", msg);
+ git_error_set(GIT_ERROR_INVALID, "failed to parse signature - %s", msg);
return -1;
}
}
p = git__calloc(1, sizeof(git_signature));
- GITERR_CHECK_ALLOC(p);
+ GIT_ERROR_CHECK_ALLOC(p);
p->name = extract_trimmed(name, strlen(name));
- GITERR_CHECK_ALLOC(p->name);
+ GIT_ERROR_CHECK_ALLOC(p->name);
p->email = extract_trimmed(email, strlen(email));
- GITERR_CHECK_ALLOC(p->email);
+ GIT_ERROR_CHECK_ALLOC(p->email);
if (p->name[0] == '\0' || p->email[0] == '\0') {
git_signature_free(p);
return 0;
signature = git__calloc(1, sizeof(git_signature));
- GITERR_CHECK_ALLOC(signature);
+ GIT_ERROR_CHECK_ALLOC(signature);
signature->name = git__strdup(source->name);
- GITERR_CHECK_ALLOC(signature->name);
+ GIT_ERROR_CHECK_ALLOC(signature->name);
signature->email = git__strdup(source->email);
- GITERR_CHECK_ALLOC(signature->email);
+ GIT_ERROR_CHECK_ALLOC(signature->email);
signature->when.time = source->when.time;
signature->when.offset = source->when.offset;
return 0;
signature = git_pool_mallocz(pool, sizeof(git_signature));
- GITERR_CHECK_ALLOC(signature);
+ GIT_ERROR_CHECK_ALLOC(signature);
signature->name = git_pool_strdup(pool, source->name);
- GITERR_CHECK_ALLOC(signature->name);
+ GIT_ERROR_CHECK_ALLOC(signature->name);
signature->email = git_pool_strdup(pool, source->email);
- GITERR_CHECK_ALLOC(signature->email);
+ GIT_ERROR_CHECK_ALLOC(signature->email);
signature->when.time = source->when.time;
signature->when.offset = source->when.offset;
if ((tz_start[0] != '-' && tz_start[0] != '+') ||
git__strntol32(&offset, tz_start + 1,
- buffer_end - tz_start + 1, &tz_end, 10) < 0) {
+ buffer_end - tz_start - 1, &tz_end, 10) < 0) {
/* malformed timezone, just assume it's zero */
offset = 0;
}
*out = NULL;
sig = git__calloc(1, sizeof(git_signature));
- GITERR_CHECK_ALLOC(sig);
+ GIT_ERROR_CHECK_ALLOC(sig);
buf_end = buf + strlen(buf);
error = git_signature__parse(sig, &buf, buf_end, NULL, '\0');
pathlen = path ? strlen(path) : 0;
- GITERR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_sortedcache), pathlen);
- GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_sortedcache), pathlen);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1);
sc = git__calloc(1, alloclen);
- GITERR_CHECK_ALLOC(sc);
+ GIT_ERROR_CHECK_ALLOC(sc);
git_pool_init(&sc->pool, 1);
goto fail;
if (git_rwlock_init(&sc->lock)) {
- giterr_set(GITERR_OS, "failed to initialize lock");
+ git_error_set(GIT_ERROR_OS, "failed to initialize lock");
goto fail;
}
GIT_UNUSED(sc); /* prevent warning when compiled w/o threads */
if (git_rwlock_wrlock(&sc->lock) < 0) {
- giterr_set(GITERR_OS, "unable to acquire write lock on cache");
+ git_error_set(GIT_ERROR_OS, "unable to acquire write lock on cache");
return -1;
}
return 0;
GIT_UNUSED(sc); /* prevent warning when compiled w/o threads */
if (git_rwlock_rdlock(&sc->lock) < 0) {
- giterr_set(GITERR_OS, "unable to acquire read lock on cache");
+ git_error_set(GIT_ERROR_OS, "unable to acquire read lock on cache");
return -1;
}
return 0;
}
if (p_fstat(fd, &st) < 0) {
- giterr_set(GITERR_OS, "failed to stat file");
+ git_error_set(GIT_ERROR_OS, "failed to stat file");
error = -1;
(void)p_close(fd);
goto unlock;
}
if (!git__is_sizet(st.st_size)) {
- giterr_set(GITERR_INVALID, "unable to load file larger than size_t");
+ git_error_set(GIT_ERROR_INVALID, "unable to load file larger than size_t");
error = -1;
(void)p_close(fd);
goto unlock;
/* find and/or insert item, returning pointer to item data */
int git_sortedcache_upsert(void **out, git_sortedcache *sc, const char *key)
{
+ size_t pos;
int error = 0;
- khiter_t pos;
void *item;
size_t keylen, itemlen;
char *item_key;
itemlen = (itemlen + 7) & ~7;
if ((item = git_pool_mallocz(&sc->pool, (uint32_t)itemlen)) == NULL) {
- /* don't use GITERR_CHECK_ALLOC b/c of lock */
+ /* don't use GIT_ERROR_CHECK_ALLOC b/c of lock */
error = -1;
goto done;
}
/* lookup item by key */
void *git_sortedcache_lookup(const git_sortedcache *sc, const char *key)
{
- khiter_t pos = git_strmap_lookup_index(sc->map, key);
+ size_t pos = git_strmap_lookup_index(sc->map, key);
if (git_strmap_valid_index(sc->map, pos))
return git_strmap_value_at(sc->map, pos);
return NULL;
int git_sortedcache_remove(git_sortedcache *sc, size_t pos)
{
char *item;
- khiter_t mappos;
+ size_t mappos;
/* because of pool allocation, this can't actually remove the item,
* but we can remove it from the items vector and the hash table.
*/
if ((item = git_vector_get(&sc->items, pos)) == NULL) {
- giterr_set(GITERR_INVALID, "removing item out of range");
+ git_error_set(GIT_ERROR_INVALID, "removing item out of range");
return GIT_ENOTFOUND;
}
#include "message.h"
#include "tree.h"
#include "reflog.h"
+#include "blob.h"
#include "git2/diff.h"
#include "git2/stash.h"
#include "git2/status.h"
static int create_error(int error, const char *msg)
{
- giterr_set(GITERR_STASH, "cannot stash changes - %s", msg);
+ git_error_set(GIT_ERROR_STASH, "cannot stash changes - %s", msg);
return error;
}
char *formatted_oid;
formatted_oid = git_oid_allocfmt(b_commit);
- GITERR_CHECK_ALLOC(formatted_oid);
+ GIT_ERROR_CHECK_ALLOC(formatted_oid);
git_buf_put(out, formatted_oid, 7);
git__free(formatted_oid);
static int append_commit_description(git_buf *out, git_commit* commit)
{
const char *summary = git_commit_summary(commit);
- GITERR_CHECK_ALLOC(summary);
+ GIT_ERROR_CHECK_ALLOC(summary);
if (append_abbreviated_oid(out, git_commit_id(commit)) < 0)
return -1;
return error;
}
-static int build_tree_from_index(git_tree **out, git_index *index)
+static int build_tree_from_index(
+ git_tree **out,
+ git_repository *repo,
+ git_index *index)
{
int error;
git_oid i_tree_oid;
- if ((error = git_index_write_tree(&i_tree_oid, index)) < 0)
+ if ((error = git_index_write_tree_to(&i_tree_oid, index, repo)) < 0)
return error;
- return git_tree_lookup(out, git_index_owner(index), &i_tree_oid);
+ return git_tree_lookup(out, repo, &i_tree_oid);
}
static int commit_index(
git_commit **i_commit,
+ git_repository *repo,
git_index *index,
const git_signature *stasher,
const char *message,
git_buf msg = GIT_BUF_INIT;
int error;
- if ((error = build_tree_from_index(&i_tree, index)) < 0)
+ if ((error = build_tree_from_index(&i_tree, repo, index)) < 0)
goto cleanup;
if ((error = git_buf_printf(&msg, "index on %s\n", message)) < 0)
cleanup:
git_tree_free(i_tree);
- git_buf_free(&msg);
+ git_buf_dispose(&msg);
return error;
}
bool include_ignored;
};
+/*
+ * Similar to git_index_add_bypath but able to operate on any
+ * index without making assumptions about the repository's index
+ */
+static int stash_to_index(
+ git_repository *repo,
+ git_index *index,
+ const char *path)
+{
+ git_index *repo_index;
+ git_index_entry entry = {{0}};
+ struct stat st;
+ int error;
+
+ if (!git_repository_is_bare(repo) &&
+ (error = git_repository_index__weakptr(&repo_index, repo)) < 0)
+ return error;
+
+ if ((error = git_blob__create_from_paths(
+ &entry.id, &st, repo, NULL, path, 0, true)) < 0)
+ return error;
+
+ git_index_entry__init_from_stat(&entry, &st,
+ (repo_index != NULL || !repo_index->distrust_filemode));
+
+ entry.path = path;
+
+ return git_index_add(index, &entry);
+}
+
static int stash_update_index_from_diff(
+ git_repository *repo,
git_index *index,
const git_diff *diff,
struct stash_update_rules *data)
default:
/* Unimplemented */
- giterr_set(
- GITERR_INVALID,
+ git_error_set(
+ GIT_ERROR_INVALID,
"cannot update index. Unimplemented status (%d)",
delta->status);
return -1;
}
if (add_path != NULL)
- error = git_index_add_bypath(index, add_path);
+ error = stash_to_index(repo, index, add_path);
}
return error;
static int build_untracked_tree(
git_tree **tree_out,
- git_index *index,
+ git_repository *repo,
git_commit *i_commit,
uint32_t flags)
{
+ git_index *i_index = NULL;
git_tree *i_tree = NULL;
git_diff *diff = NULL;
git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
struct stash_update_rules data = {0};
int error;
- git_index_clear(index);
+ if ((error = git_index_new(&i_index)) < 0)
+ goto cleanup;
if (flags & GIT_STASH_INCLUDE_UNTRACKED) {
opts.flags |= GIT_DIFF_INCLUDE_UNTRACKED |
if ((error = git_commit_tree(&i_tree, i_commit)) < 0)
goto cleanup;
- if ((error = git_diff_tree_to_workdir(
- &diff, git_index_owner(index), i_tree, &opts)) < 0)
+ if ((error = git_diff_tree_to_workdir(&diff, repo, i_tree, &opts)) < 0)
goto cleanup;
- if ((error = stash_update_index_from_diff(index, diff, &data)) < 0)
+ if ((error = stash_update_index_from_diff(repo, i_index, diff, &data)) < 0)
goto cleanup;
- error = build_tree_from_index(tree_out, index);
+ error = build_tree_from_index(tree_out, repo, i_index);
cleanup:
git_diff_free(diff);
git_tree_free(i_tree);
+ git_index_free(i_index);
return error;
}
static int commit_untracked(
git_commit **u_commit,
- git_index *index,
+ git_repository *repo,
const git_signature *stasher,
const char *message,
git_commit *i_commit,
git_buf msg = GIT_BUF_INIT;
int error;
- if ((error = build_untracked_tree(&u_tree, index, i_commit, flags)) < 0)
+ if ((error = build_untracked_tree(&u_tree, repo, i_commit, flags)) < 0)
goto cleanup;
if ((error = git_buf_printf(&msg, "untracked files on %s\n", message)) < 0)
if ((error = git_commit_create(
&u_commit_oid,
- git_index_owner(index),
+ repo,
NULL,
stasher,
stasher,
NULL)) < 0)
goto cleanup;
- error = git_commit_lookup(u_commit, git_index_owner(index), &u_commit_oid);
+ error = git_commit_lookup(u_commit, repo, &u_commit_oid);
cleanup:
git_tree_free(u_tree);
- git_buf_free(&msg);
+ git_buf_dispose(&msg);
return error;
}
static int build_workdir_tree(
git_tree **tree_out,
- git_index *index,
+ git_repository *repo,
+ git_index *i_index,
git_commit *b_commit)
{
- git_repository *repo = git_index_owner(index);
git_tree *b_tree = NULL;
git_diff *diff = NULL, *idx_to_wd = NULL;
git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
if ((error = git_commit_tree(&b_tree, b_commit)) < 0)
goto cleanup;
- if ((error = git_diff_tree_to_index(&diff, repo, b_tree, index, &opts)) < 0 ||
- (error = git_diff_index_to_workdir(&idx_to_wd, repo, index, &opts)) < 0 ||
+ if ((error = git_diff_tree_to_index(&diff, repo, b_tree, i_index, &opts)) < 0 ||
+ (error = git_diff_index_to_workdir(&idx_to_wd, repo, i_index, &opts)) < 0 ||
(error = git_diff__merge(diff, idx_to_wd, stash_delta_merge)) < 0)
goto cleanup;
data.include_changed = true;
- if ((error = stash_update_index_from_diff(index, diff, &data)) < 0)
+ if ((error = stash_update_index_from_diff(repo, i_index, diff, &data)) < 0)
goto cleanup;
- error = build_tree_from_index(tree_out, index);
+ error = build_tree_from_index(tree_out, repo, i_index);
cleanup:
git_diff_free(idx_to_wd);
static int commit_worktree(
git_oid *w_commit_oid,
- git_index *index,
+ git_repository *repo,
const git_signature *stasher,
const char *message,
git_commit *i_commit,
{
int error = 0;
git_tree *w_tree = NULL, *i_tree = NULL;
+ git_index *i_index = NULL;
const git_commit *parents[] = { NULL, NULL, NULL };
+ int ignorecase;
parents[0] = b_commit;
parents[1] = i_commit;
if ((error = git_commit_tree(&i_tree, i_commit)) < 0)
goto cleanup;
- if ((error = git_index_read_tree(index, i_tree)) < 0)
+ if ((error = git_index_new(&i_index)) < 0 ||
+ (error = git_repository__cvar(&ignorecase, repo, GIT_CVAR_IGNORECASE)) < 0)
+ goto cleanup;
+
+ git_index__set_ignore_case(i_index, ignorecase);
+
+ if ((error = git_index_read_tree(i_index, i_tree)) < 0)
goto cleanup;
- if ((error = build_workdir_tree(&w_tree, index, b_commit)) < 0)
+ if ((error = build_workdir_tree(&w_tree, repo, i_index, b_commit)) < 0)
goto cleanup;
error = git_commit_create(
w_commit_oid,
- git_index_owner(index),
+ repo,
NULL,
stasher,
stasher,
cleanup:
git_tree_free(i_tree);
git_tree_free(w_tree);
+ git_index_free(i_index);
return error;
}
error = (git_buf_oom(msg) || git_buf_oom(&buf)) ? -1 : 0;
cleanup:
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return error;
}
goto cleanup;
if ((error = commit_index(
- &i_commit, index, stasher, git_buf_cstr(&msg), b_commit)) < 0)
+ &i_commit, repo, index, stasher, git_buf_cstr(&msg), b_commit)) < 0)
goto cleanup;
if ((flags & (GIT_STASH_INCLUDE_UNTRACKED | GIT_STASH_INCLUDE_IGNORED)) &&
(error = commit_untracked(
- &u_commit, index, stasher, git_buf_cstr(&msg),
+ &u_commit, repo, stasher, git_buf_cstr(&msg),
i_commit, flags)) < 0)
goto cleanup;
goto cleanup;
if ((error = commit_worktree(
- out, index, stasher, git_buf_cstr(&msg),
+ out, repo, stasher, git_buf_cstr(&msg),
i_commit, b_commit, u_commit)) < 0)
goto cleanup;
cleanup:
- git_buf_free(&msg);
+ git_buf_dispose(&msg);
git_commit_free(i_commit);
git_commit_free(b_commit);
git_commit_free(u_commit);
max = git_reflog_entrycount(reflog);
if (!max || index > max - 1) {
error = GIT_ENOTFOUND;
- giterr_set(GITERR_STASH, "no stashed state at position %" PRIuZ, index);
+ git_error_set(GIT_ERROR_STASH, "no stashed state at position %" PRIuZ, index);
goto cleanup;
}
memcpy(opts, &default_apply_opts, sizeof(git_stash_apply_options));
}
- if ((opts->checkout_options.checkout_strategy & (GIT_CHECKOUT_SAFE | GIT_CHECKOUT_FORCE)) == 0)
- opts->checkout_options.checkout_strategy = GIT_CHECKOUT_SAFE;
+ opts->checkout_options.checkout_strategy |= GIT_CHECKOUT_NO_REFRESH;
if (!opts->checkout_options.our_label)
opts->checkout_options.our_label = "Updated upstream";
goto done;
if (git_diff_num_deltas(index_diff) > 0) {
- giterr_set(GITERR_STASH, "%" PRIuZ " uncommitted changes exist in the index",
+ git_error_set(GIT_ERROR_STASH, "%" PRIuZ " uncommitted changes exist in the index",
git_diff_num_deltas(index_diff));
error = GIT_EUNCOMMITTED;
}
git_index *untracked_index = NULL;
int error;
- GITERR_CHECK_VERSION(given_opts, GIT_STASH_APPLY_OPTIONS_VERSION, "git_stash_apply_options");
+ GIT_ERROR_CHECK_VERSION(given_opts, GIT_STASH_APPLY_OPTIONS_VERSION, "git_stash_apply_options");
normalize_apply_options(&opts, given_opts);
checkout_strategy = opts.checkout_options.checkout_strategy;
error = git_reference_lookup(&stash, repo, GIT_REFS_STASH_FILE);
if (error == GIT_ENOTFOUND) {
- giterr_clear();
+ git_error_clear();
return 0;
}
if (error < 0)
payload);
if (error) {
- giterr_set_after_callback(error);
+ git_error_set_after_callback(error);
break;
}
}
if (!max || index > max - 1) {
error = GIT_ENOTFOUND;
- giterr_set(GITERR_STASH, "no stashed state at position %" PRIuZ, index);
+ git_error_set(GIT_ERROR_STASH, "no stashed state at position %" PRIuZ, index);
goto cleanup;
}
return 0;
status_entry = git__malloc(sizeof(git_status_entry));
- GITERR_CHECK_ALLOC(status_entry);
+ GIT_ERROR_CHECK_ALLOC(status_entry);
status_entry->status = status_compute(status, head2idx, idx2wd);
status_entry->head_to_index = head2idx;
if (!opts)
return 0;
- GITERR_CHECK_VERSION(opts, GIT_STATUS_OPTIONS_VERSION, "git_status_options");
+ GIT_ERROR_CHECK_VERSION(opts, GIT_STATUS_OPTIONS_VERSION, "git_status_options");
if (opts->show > GIT_STATUS_SHOW_WORKDIR_ONLY) {
- giterr_set(GITERR_INVALID, "unknown status 'show' option");
+ git_error_set(GIT_ERROR_INVALID, "unknown status 'show' option");
return -1;
}
if ((opts->flags & GIT_STATUS_OPT_NO_REFRESH) != 0 &&
(opts->flags & GIT_STATUS_OPT_UPDATE_INDEX) != 0) {
- giterr_set(GITERR_INVALID, "updating index from status "
+ git_error_set(GIT_ERROR_INVALID, "updating index from status "
"is not allowed when index refresh is disabled");
return -1;
}
if ((error = git_repository_head_tree(&head, repo)) < 0) {
if (error != GIT_ENOTFOUND && error != GIT_EUNBORNBRANCH)
goto done;
- giterr_clear();
+ git_error_clear();
}
}
/* refresh index from disk unless prevented */
if ((flags & GIT_STATUS_OPT_NO_REFRESH) == 0 &&
- git_index_read(index, false) < 0)
- giterr_clear();
+ git_index_read_safely(index) < 0)
+ git_error_clear();
status = git_status_list_alloc(index);
- GITERR_CHECK_ALLOC(status);
+ GIT_ERROR_CHECK_ALLOC(status);
if (opts) {
memcpy(&status->opts, opts, sizeof(git_status_options));
status_entry->index_to_workdir->old_file.path;
if ((error = cb(path, status_entry->status, payload)) != 0) {
- giterr_set_after_callback(error);
+ git_error_set_after_callback(error);
break;
}
}
p_fnmatch(sfi->expected, path, sfi->fnm_flags) != 0))
{
sfi->ambiguous = true;
- return GIT_EAMBIGUOUS; /* giterr_set will be done by caller */
+ return GIT_EAMBIGUOUS; /* git_error_set will be done by caller */
}
return 0;
error = git_status_foreach_ext(repo, &opts, get_one_status, &sfi);
if (error < 0 && sfi.ambiguous) {
- giterr_set(GITERR_INVALID,
+ git_error_set(GIT_ERROR_INVALID,
"ambiguous path '%s' given to git_status_file", sfi.expected);
error = GIT_EAMBIGUOUS;
}
if (!error && !sfi.count) {
- giterr_set(GITERR_INVALID,
+ git_error_set(GIT_ERROR_INVALID,
"attempt to get status of nonexistent file '%s'", path);
error = GIT_ENOTFOUND;
}
git_diff_perfdata *out, const git_status_list *status)
{
assert(out);
- GITERR_CHECK_VERSION(out, GIT_DIFF_PERFDATA_VERSION, "git_diff_perfdata");
+ GIT_ERROR_CHECK_VERSION(out, GIT_DIFF_PERFDATA_VERSION, "git_diff_perfdata");
out->stat_calls = 0;
out->oid_calculations = 0;
--- /dev/null
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#include "stdalloc.h"
+
+static void *stdalloc__malloc(size_t len, const char *file, int line)
+{
+ void *ptr = malloc(len);
+
+ GIT_UNUSED(file);
+ GIT_UNUSED(line);
+
+ if (!ptr) git_error_set_oom();
+ return ptr;
+}
+
+static void *stdalloc__calloc(size_t nelem, size_t elsize, const char *file, int line)
+{
+ void *ptr = calloc(nelem, elsize);
+
+ GIT_UNUSED(file);
+ GIT_UNUSED(line);
+
+ if (!ptr) git_error_set_oom();
+ return ptr;
+}
+
+static char *stdalloc__strdup(const char *str, const char *file, int line)
+{
+ char *ptr = strdup(str);
+
+ GIT_UNUSED(file);
+ GIT_UNUSED(line);
+
+ if (!ptr) git_error_set_oom();
+ return ptr;
+}
+
+static char *stdalloc__strndup(const char *str, size_t n, const char *file, int line)
+{
+ size_t length = 0, alloclength;
+ char *ptr;
+
+ length = p_strnlen(str, n);
+
+ if (GIT_ADD_SIZET_OVERFLOW(&alloclength, length, 1) ||
+ !(ptr = stdalloc__malloc(alloclength, file, line)))
+ return NULL;
+
+ if (length)
+ memcpy(ptr, str, length);
+
+ ptr[length] = '\0';
+
+ return ptr;
+}
+
+static char *stdalloc__substrdup(const char *start, size_t n, const char *file, int line)
+{
+ char *ptr;
+ size_t alloclen;
+
+ if (GIT_ADD_SIZET_OVERFLOW(&alloclen, n, 1) ||
+ !(ptr = stdalloc__malloc(alloclen, file, line)))
+ return NULL;
+
+ memcpy(ptr, start, n);
+ ptr[n] = '\0';
+ return ptr;
+}
+
+static void *stdalloc__realloc(void *ptr, size_t size, const char *file, int line)
+{
+ void *new_ptr = realloc(ptr, size);
+
+ GIT_UNUSED(file);
+ GIT_UNUSED(line);
+
+ if (!new_ptr) git_error_set_oom();
+ return new_ptr;
+}
+
+static void *stdalloc__reallocarray(void *ptr, size_t nelem, size_t elsize, const char *file, int line)
+{
+ size_t newsize;
+
+ GIT_UNUSED(file);
+ GIT_UNUSED(line);
+
+ return GIT_MULTIPLY_SIZET_OVERFLOW(&newsize, nelem, elsize) ?
+ NULL : realloc(ptr, newsize);
+}
+
+static void *stdalloc__mallocarray(size_t nelem, size_t elsize, const char *file, int line)
+{
+ return stdalloc__reallocarray(NULL, nelem, elsize, file, line);
+}
+
+static void stdalloc__free(void *ptr)
+{
+ free(ptr);
+}
+
+int git_stdalloc_init_allocator(git_allocator *allocator)
+{
+ allocator->gmalloc = stdalloc__malloc;
+ allocator->gcalloc = stdalloc__calloc;
+ allocator->gstrdup = stdalloc__strdup;
+ allocator->gstrndup = stdalloc__strndup;
+ allocator->gsubstrdup = stdalloc__substrdup;
+ allocator->grealloc = stdalloc__realloc;
+ allocator->greallocarray = stdalloc__reallocarray;
+ allocator->gmallocarray = stdalloc__mallocarray;
+ allocator->gfree = stdalloc__free;
+ return 0;
+}
--- /dev/null
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#ifndef INCLUDE_stdalloc_h__
+#define INCLUDE_stdalloc_h__
+
+#include "alloc.h"
+
+#include "common.h"
+
+int git_stdalloc_init_allocator(git_allocator *allocator);
+
+#endif
GIT_INLINE(int) git_stream_certificate(git_cert **out, git_stream *st)
{
if (!st->encrypted) {
- giterr_set(GITERR_INVALID, "an unencrypted stream does not have a certificate");
+ git_error_set(GIT_ERROR_INVALID, "an unencrypted stream does not have a certificate");
return -1;
}
GIT_INLINE(int) git_stream_set_proxy(git_stream *st, const git_proxy_options *proxy_opts)
{
if (!st->proxy_support) {
- giterr_set(GITERR_INVALID, "proxy not supported on this stream");
+ git_error_set(GIT_ERROR_INVALID, "proxy not supported on this stream");
return -1;
}
return st->write(st, data, len, flags);
}
+GIT_INLINE(int) git_stream__write_full(git_stream *st, const char *data, size_t len, int flags)
+{
+ size_t total_written = 0;
+
+ while (total_written < len) {
+ ssize_t written = git_stream_write(st, data + total_written, len - total_written, flags);
+ if (written <= 0)
+ return -1;
+
+ total_written += written;
+ }
+
+ return 0;
+}
+
GIT_INLINE(int) git_stream_close(git_stream *st)
{
return st->close(st);
+++ /dev/null
-/*
- * Copyright (C) the libgit2 contributors. All rights reserved.
- *
- * This file is part of libgit2, distributed under the GNU GPL v2 with
- * a Linking Exception. For full terms see the included COPYING file.
- */
-
-#include "streams/curl.h"
-
-#ifdef GIT_CURL
-
-#include <curl/curl.h>
-
-#include "stream.h"
-#include "git2/transport.h"
-#include "buffer.h"
-#include "global.h"
-#include "vector.h"
-#include "proxy.h"
-
-/* This is for backwards compatibility with curl<7.45.0. */
-#ifndef CURLINFO_ACTIVESOCKET
-# define CURLINFO_ACTIVESOCKET CURLINFO_LASTSOCKET
-# define GIT_CURL_BADSOCKET -1
-# define git_activesocket_t long
-#else
-# define GIT_CURL_BADSOCKET CURL_SOCKET_BAD
-# define git_activesocket_t curl_socket_t
-#endif
-
-typedef struct {
- git_stream parent;
- CURL *handle;
- curl_socket_t socket;
- char curl_error[CURL_ERROR_SIZE + 1];
- git_cert_x509 cert_info;
- git_strarray cert_info_strings;
- git_proxy_options proxy;
- git_cred *proxy_cred;
-} curl_stream;
-
-int git_curl_stream_global_init(void)
-{
- if (curl_global_init(CURL_GLOBAL_ALL) != 0) {
- giterr_set(GITERR_NET, "could not initialize curl");
- return -1;
- }
-
- /* `curl_global_cleanup` is provided by libcurl */
- git__on_shutdown(curl_global_cleanup);
- return 0;
-}
-
-static int seterr_curl(curl_stream *s)
-{
- giterr_set(GITERR_NET, "curl error: %s\n", s->curl_error);
- return -1;
-}
-
-GIT_INLINE(int) error_no_credentials(void)
-{
- giterr_set(GITERR_NET, "proxy authentication required, but no callback provided");
- return GIT_EAUTH;
-}
-
-static int apply_proxy_creds(curl_stream *s)
-{
- CURLcode res;
- git_cred_userpass_plaintext *userpass;
-
- if (!s->proxy_cred)
- return GIT_ENOTFOUND;
-
- userpass = (git_cred_userpass_plaintext *) s->proxy_cred;
- if ((res = curl_easy_setopt(s->handle, CURLOPT_PROXYUSERNAME, userpass->username)) != CURLE_OK)
- return seterr_curl(s);
- if ((res = curl_easy_setopt(s->handle, CURLOPT_PROXYPASSWORD, userpass->password)) != CURLE_OK)
- return seterr_curl(s);
-
- return 0;
-}
-
-static int ask_and_apply_proxy_creds(curl_stream *s)
-{
- int error;
- git_proxy_options *opts = &s->proxy;
-
- if (!opts->credentials)
- return error_no_credentials();
-
- /* TODO: see if PROXYAUTH_AVAIL helps us here */
- git_cred_free(s->proxy_cred);
- s->proxy_cred = NULL;
- giterr_clear();
- error = opts->credentials(&s->proxy_cred, opts->url, NULL, GIT_CREDTYPE_USERPASS_PLAINTEXT, opts->payload);
- if (error == GIT_PASSTHROUGH)
- return error_no_credentials();
- if (error < 0) {
- if (!giterr_last())
- giterr_set(GITERR_NET, "proxy authentication was aborted by the user");
- return error;
- }
-
- if (s->proxy_cred->credtype != GIT_CREDTYPE_USERPASS_PLAINTEXT) {
- giterr_set(GITERR_NET, "credentials callback returned invalid credential type");
- return -1;
- }
-
- return apply_proxy_creds(s);
-}
-
-static int curls_connect(git_stream *stream)
-{
- curl_stream *s = (curl_stream *) stream;
- git_activesocket_t sockextr;
- long connect_last = 0;
- int failed_cert = 0, error;
- bool retry_connect;
- CURLcode res;
-
- /* Apply any credentials we've already established */
- error = apply_proxy_creds(s);
- if (error < 0 && error != GIT_ENOTFOUND)
- return seterr_curl(s);
-
- do {
- retry_connect = 0;
- res = curl_easy_perform(s->handle);
-
- curl_easy_getinfo(s->handle, CURLINFO_HTTP_CONNECTCODE, &connect_last);
-
- /* HTTP 407 Proxy Authentication Required */
- if (connect_last == 407) {
- if ((error = ask_and_apply_proxy_creds(s)) < 0)
- return error;
-
- retry_connect = true;
- }
- } while (retry_connect);
-
- if (res != CURLE_OK && res != CURLE_PEER_FAILED_VERIFICATION)
- return seterr_curl(s);
- if (res == CURLE_PEER_FAILED_VERIFICATION)
- failed_cert = 1;
-
- if ((res = curl_easy_getinfo(s->handle, CURLINFO_ACTIVESOCKET, &sockextr)) != CURLE_OK) {
- return seterr_curl(s);
- }
-
- if (sockextr == GIT_CURL_BADSOCKET) {
- giterr_set(GITERR_NET, "curl socket is no longer valid");
- return -1;
- }
-
- s->socket = sockextr;
-
- if (s->parent.encrypted && failed_cert)
- return GIT_ECERTIFICATE;
-
- return 0;
-}
-
-static int curls_certificate(git_cert **out, git_stream *stream)
-{
- int error;
- CURLcode res;
- struct curl_slist *slist;
- struct curl_certinfo *certinfo;
- git_vector strings = GIT_VECTOR_INIT;
- curl_stream *s = (curl_stream *) stream;
-
- if ((res = curl_easy_getinfo(s->handle, CURLINFO_CERTINFO, &certinfo)) != CURLE_OK)
- return seterr_curl(s);
-
- /* No information is available, can happen with SecureTransport */
- if (certinfo->num_of_certs == 0) {
- s->cert_info.parent.cert_type = GIT_CERT_NONE;
- s->cert_info.data = NULL;
- s->cert_info.len = 0;
- return 0;
- }
-
- if ((error = git_vector_init(&strings, 8, NULL)) < 0)
- return error;
-
- for (slist = certinfo->certinfo[0]; slist; slist = slist->next) {
- char *str = git__strdup(slist->data);
- GITERR_CHECK_ALLOC(str);
- git_vector_insert(&strings, str);
- }
-
- /* Copy the contents of the vector into a strarray so we can expose them */
- s->cert_info_strings.strings = (char **) strings.contents;
- s->cert_info_strings.count = strings.length;
-
- s->cert_info.parent.cert_type = GIT_CERT_STRARRAY;
- s->cert_info.data = &s->cert_info_strings;
- s->cert_info.len = strings.length;
-
- *out = &s->cert_info.parent;
-
- return 0;
-}
-
-static int curls_set_proxy(git_stream *stream, const git_proxy_options *proxy_opts)
-{
- int error;
- CURLcode res;
- curl_stream *s = (curl_stream *) stream;
-
- git_proxy_options_clear(&s->proxy);
- if ((error = git_proxy_options_dup(&s->proxy, proxy_opts)) < 0)
- return error;
-
- if ((res = curl_easy_setopt(s->handle, CURLOPT_PROXY, s->proxy.url)) != CURLE_OK)
- return seterr_curl(s);
-
- if ((res = curl_easy_setopt(s->handle, CURLOPT_PROXYAUTH, CURLAUTH_ANY)) != CURLE_OK)
- return seterr_curl(s);
-
- return 0;
-}
-
-static int wait_for(curl_socket_t fd, bool reading)
-{
- int ret;
- fd_set infd, outfd, errfd;
-
- FD_ZERO(&infd);
- FD_ZERO(&outfd);
- FD_ZERO(&errfd);
-
- assert(fd >= 0);
- FD_SET(fd, &errfd);
- if (reading)
- FD_SET(fd, &infd);
- else
- FD_SET(fd, &outfd);
-
- if ((ret = select(fd + 1, &infd, &outfd, &errfd, NULL)) < 0) {
- giterr_set(GITERR_OS, "error in select");
- return -1;
- }
-
- return 0;
-}
-
-static ssize_t curls_write(git_stream *stream, const char *data, size_t len, int flags)
-{
- int error;
- size_t off = 0, sent;
- CURLcode res;
- curl_stream *s = (curl_stream *) stream;
-
- GIT_UNUSED(flags);
-
- do {
- if ((error = wait_for(s->socket, false)) < 0)
- return error;
-
- res = curl_easy_send(s->handle, data + off, len - off, &sent);
- if (res == CURLE_OK)
- off += sent;
- } while ((res == CURLE_OK || res == CURLE_AGAIN) && off < len);
-
- if (res != CURLE_OK)
- return seterr_curl(s);
-
- return len;
-}
-
-static ssize_t curls_read(git_stream *stream, void *data, size_t len)
-{
- int error;
- size_t read;
- CURLcode res;
- curl_stream *s = (curl_stream *) stream;
-
- do {
- if ((error = wait_for(s->socket, true)) < 0)
- return error;
-
- res = curl_easy_recv(s->handle, data, len, &read);
- } while (res == CURLE_AGAIN);
-
- if (res != CURLE_OK)
- return seterr_curl(s);
-
- return read;
-}
-
-static int curls_close(git_stream *stream)
-{
- curl_stream *s = (curl_stream *) stream;
-
- if (!s->handle)
- return 0;
-
- curl_easy_cleanup(s->handle);
- s->handle = NULL;
- s->socket = 0;
-
- return 0;
-}
-
-static void curls_free(git_stream *stream)
-{
- curl_stream *s = (curl_stream *) stream;
-
- curls_close(stream);
- git_strarray_free(&s->cert_info_strings);
- git_proxy_options_clear(&s->proxy);
- git_cred_free(s->proxy_cred);
- git__free(s);
-}
-
-int git_curl_stream_new(git_stream **out, const char *host, const char *port)
-{
- curl_stream *st;
- CURL *handle;
- int iport = 0, error;
-
- st = git__calloc(1, sizeof(curl_stream));
- GITERR_CHECK_ALLOC(st);
-
- handle = curl_easy_init();
- if (handle == NULL) {
- giterr_set(GITERR_NET, "failed to create curl handle");
- git__free(st);
- return -1;
- }
-
- if ((error = git__strntol32(&iport, port, strlen(port), NULL, 10)) < 0) {
- git__free(st);
- return error;
- }
-
- curl_easy_setopt(handle, CURLOPT_URL, host);
- curl_easy_setopt(handle, CURLOPT_ERRORBUFFER, st->curl_error);
- curl_easy_setopt(handle, CURLOPT_PORT, iport);
- curl_easy_setopt(handle, CURLOPT_CONNECT_ONLY, 1);
- curl_easy_setopt(handle, CURLOPT_SSL_VERIFYPEER, 1);
- curl_easy_setopt(handle, CURLOPT_CERTINFO, 1);
- curl_easy_setopt(handle, CURLOPT_HTTPPROXYTUNNEL, 1);
- curl_easy_setopt(handle, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
-
- /* curl_easy_setopt(handle, CURLOPT_VERBOSE, 1); */
-
- st->parent.version = GIT_STREAM_VERSION;
- st->parent.encrypted = 0; /* we don't encrypt ourselves */
- st->parent.proxy_support = 1;
- st->parent.connect = curls_connect;
- st->parent.certificate = curls_certificate;
- st->parent.set_proxy = curls_set_proxy;
- st->parent.read = curls_read;
- st->parent.write = curls_write;
- st->parent.close = curls_close;
- st->parent.free = curls_free;
- st->handle = handle;
-
- *out = (git_stream *) st;
- return 0;
-}
-
-#else
-
-#include "stream.h"
-
-int git_curl_stream_global_init(void)
-{
- return 0;
-}
-
-int git_curl_stream_new(git_stream **out, const char *host, const char *port)
-{
- GIT_UNUSED(out);
- GIT_UNUSED(host);
- GIT_UNUSED(port);
-
- giterr_set(GITERR_NET, "curl is not supported in this version");
- return -1;
-}
-
-
-#endif
+++ /dev/null
-/*
- * Copyright (C) the libgit2 contributors. All rights reserved.
- *
- * This file is part of libgit2, distributed under the GNU GPL v2 with
- * a Linking Exception. For full terms see the included COPYING file.
- */
-#ifndef INCLUDE_streams_curl_h__
-#define INCLUDE_streams_curl_h__
-
-#include "common.h"
-
-#include "git2/sys/stream.h"
-
-extern int git_curl_stream_global_init(void);
-extern int git_curl_stream_new(git_stream **out, const char *host, const char *port);
-
-#endif
--- /dev/null
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#include "streams/mbedtls.h"
+
+#ifdef GIT_MBEDTLS
+
+#include <ctype.h>
+
+#include "global.h"
+#include "stream.h"
+#include "streams/socket.h"
+#include "netops.h"
+#include "git2/transport.h"
+#include "util.h"
+
+#ifndef GIT_DEFAULT_CERT_LOCATION
+#define GIT_DEFAULT_CERT_LOCATION NULL
+#endif
+
+/* Work around C90-conformance issues */
+#if defined(_MSC_VER)
+# define inline __inline
+#elif defined(__GNUC__)
+# define inline __inline__
+#else
+# define inline
+#endif
+
+#include <mbedtls/config.h>
+#include <mbedtls/ssl.h>
+#include <mbedtls/error.h>
+#include <mbedtls/entropy.h>
+#include <mbedtls/ctr_drbg.h>
+
+#undef inline
+
+#define GIT_SSL_DEFAULT_CIPHERS "TLS-ECDHE-ECDSA-WITH-AES-128-GCM-SHA256:TLS-ECDHE-RSA-WITH-AES-128-GCM-SHA256:TLS-ECDHE-ECDSA-WITH-AES-256-GCM-SHA384:TLS-ECDHE-RSA-WITH-AES-256-GCM-SHA384:TLS-DHE-RSA-WITH-AES-128-GCM-SHA256:TLS-DHE-DSS-WITH-AES-128-GCM-SHA256:TLS-DHE-RSA-WITH-AES-256-GCM-SHA384:TLS-DHE-DSS-WITH-AES-256-GCM-SHA384:TLS-ECDHE-ECDSA-WITH-AES-128-CBC-SHA256:TLS-ECDHE-RSA-WITH-AES-128-CBC-SHA256:TLS-ECDHE-ECDSA-WITH-AES-128-CBC-SHA:TLS-ECDHE-RSA-WITH-AES-128-CBC-SHA:TLS-ECDHE-ECDSA-WITH-AES-256-CBC-SHA384:TLS-ECDHE-RSA-WITH-AES-256-CBC-SHA384:TLS-ECDHE-ECDSA-WITH-AES-256-CBC-SHA:TLS-ECDHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-RSA-WITH-AES-128-CBC-SHA256:TLS-DHE-RSA-WITH-AES-256-CBC-SHA256:TLS-DHE-RSA-WITH-AES-128-CBC-SHA:TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-128-CBC-SHA256:TLS-DHE-DSS-WITH-AES-256-CBC-SHA256:TLS-DHE-DSS-WITH-AES-128-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-128-GCM-SHA256:TLS-RSA-WITH-AES-256-GCM-SHA384:TLS-RSA-WITH-AES-128-CBC-SHA256:TLS-RSA-WITH-AES-256-CBC-SHA256:TLS-RSA-WITH-AES-128-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA"
+#define GIT_SSL_DEFAULT_CIPHERS_COUNT 30
+
+static mbedtls_ssl_config *git__ssl_conf;
+static int ciphers_list[GIT_SSL_DEFAULT_CIPHERS_COUNT];
+static mbedtls_entropy_context *mbedtls_entropy;
+
+/**
+ * This function aims to clean-up the SSL context which
+ * we allocated.
+ */
+static void shutdown_ssl(void)
+{
+ if (git__ssl_conf) {
+ mbedtls_x509_crt_free(git__ssl_conf->ca_chain);
+ git__free(git__ssl_conf->ca_chain);
+ mbedtls_ctr_drbg_free(git__ssl_conf->p_rng);
+ git__free(git__ssl_conf->p_rng);
+ mbedtls_ssl_config_free(git__ssl_conf);
+ git__free(git__ssl_conf);
+ git__ssl_conf = NULL;
+ }
+ if (mbedtls_entropy) {
+ mbedtls_entropy_free(mbedtls_entropy);
+ git__free(mbedtls_entropy);
+ mbedtls_entropy = NULL;
+ }
+}
+
+int git_mbedtls__set_cert_location(const char *path, int is_dir);
+
+int git_mbedtls_stream_global_init(void)
+{
+ int loaded = 0;
+ char *crtpath = GIT_DEFAULT_CERT_LOCATION;
+ struct stat statbuf;
+ mbedtls_ctr_drbg_context *ctr_drbg = NULL;
+
+ size_t ciphers_known = 0;
+ char *cipher_name = NULL;
+ char *cipher_string = NULL;
+ char *cipher_string_tmp = NULL;
+
+ git__ssl_conf = git__malloc(sizeof(mbedtls_ssl_config));
+ GIT_ERROR_CHECK_ALLOC(git__ssl_conf);
+
+ mbedtls_ssl_config_init(git__ssl_conf);
+ if (mbedtls_ssl_config_defaults(git__ssl_conf,
+ MBEDTLS_SSL_IS_CLIENT,
+ MBEDTLS_SSL_TRANSPORT_STREAM,
+ MBEDTLS_SSL_PRESET_DEFAULT) != 0) {
+ git_error_set(GIT_ERROR_SSL, "failed to initialize mbedTLS");
+ goto cleanup;
+ }
+
+ /* configure TLSv1 */
+ mbedtls_ssl_conf_min_version(git__ssl_conf, MBEDTLS_SSL_MAJOR_VERSION_3, MBEDTLS_SSL_MINOR_VERSION_0);
+
+ /* verify_server_cert is responsible for making the check.
+ * OPTIONAL because REQUIRED drops the certificate as soon as the check
+ * is made, so we can never see the certificate and override it. */
+ mbedtls_ssl_conf_authmode(git__ssl_conf, MBEDTLS_SSL_VERIFY_OPTIONAL);
+
+ /* set the list of allowed ciphersuites */
+ ciphers_known = 0;
+ cipher_string = cipher_string_tmp = git__strdup(GIT_SSL_DEFAULT_CIPHERS);
+ GIT_ERROR_CHECK_ALLOC(cipher_string);
+
+ while ((cipher_name = git__strtok(&cipher_string_tmp, ":")) != NULL) {
+ int cipherid = mbedtls_ssl_get_ciphersuite_id(cipher_name);
+ if (cipherid == 0) continue;
+
+ if (ciphers_known >= ARRAY_SIZE(ciphers_list)) {
+ git_error_set(GIT_ERROR_SSL, "out of cipher list space");
+ goto cleanup;
+ }
+
+ ciphers_list[ciphers_known++] = cipherid;
+ }
+ git__free(cipher_string);
+
+ if (!ciphers_known) {
+ git_error_set(GIT_ERROR_SSL, "no cipher could be enabled");
+ goto cleanup;
+ }
+ mbedtls_ssl_conf_ciphersuites(git__ssl_conf, ciphers_list);
+
+ /* Seeding the random number generator */
+ mbedtls_entropy = git__malloc(sizeof(mbedtls_entropy_context));
+ GIT_ERROR_CHECK_ALLOC(mbedtls_entropy);
+
+ mbedtls_entropy_init(mbedtls_entropy);
+
+ ctr_drbg = git__malloc(sizeof(mbedtls_ctr_drbg_context));
+ GIT_ERROR_CHECK_ALLOC(ctr_drbg);
+
+ mbedtls_ctr_drbg_init(ctr_drbg);
+
+ if (mbedtls_ctr_drbg_seed(ctr_drbg,
+ mbedtls_entropy_func,
+ mbedtls_entropy, NULL, 0) != 0) {
+ git_error_set(GIT_ERROR_SSL, "failed to initialize mbedTLS entropy pool");
+ goto cleanup;
+ }
+
+ mbedtls_ssl_conf_rng(git__ssl_conf, mbedtls_ctr_drbg_random, ctr_drbg);
+
+ /* load default certificates */
+ if (crtpath != NULL && stat(crtpath, &statbuf) == 0 && S_ISREG(statbuf.st_mode))
+ loaded = (git_mbedtls__set_cert_location(crtpath, 0) == 0);
+ if (!loaded && crtpath != NULL && stat(crtpath, &statbuf) == 0 && S_ISDIR(statbuf.st_mode))
+ loaded = (git_mbedtls__set_cert_location(crtpath, 1) == 0);
+
+ git__on_shutdown(shutdown_ssl);
+
+ return 0;
+
+cleanup:
+ mbedtls_ctr_drbg_free(ctr_drbg);
+ git__free(ctr_drbg);
+ mbedtls_ssl_config_free(git__ssl_conf);
+ git__free(git__ssl_conf);
+ git__ssl_conf = NULL;
+
+ return -1;
+}
+
+static int bio_read(void *b, unsigned char *buf, size_t len)
+{
+ git_stream *io = (git_stream *) b;
+ return (int) git_stream_read(io, buf, min(len, INT_MAX));
+}
+
+static int bio_write(void *b, const unsigned char *buf, size_t len)
+{
+ git_stream *io = (git_stream *) b;
+ return (int) git_stream_write(io, (const char *)buf, min(len, INT_MAX), 0);
+}
+
+static int ssl_set_error(mbedtls_ssl_context *ssl, int error)
+{
+ char errbuf[512];
+ int ret = -1;
+
+ assert(error != MBEDTLS_ERR_SSL_WANT_READ);
+ assert(error != MBEDTLS_ERR_SSL_WANT_WRITE);
+
+ if (error != 0)
+ mbedtls_strerror( error, errbuf, 512 );
+
+ switch(error) {
+ case 0:
+ git_error_set(GIT_ERROR_SSL, "SSL error: unknown error");
+ break;
+
+ case MBEDTLS_ERR_X509_CERT_VERIFY_FAILED:
+ git_error_set(GIT_ERROR_SSL, "SSL error: %#04x [%x] - %s", error, ssl->session_negotiate->verify_result, errbuf);
+ ret = GIT_ECERTIFICATE;
+ break;
+
+ default:
+ git_error_set(GIT_ERROR_SSL, "SSL error: %#04x - %s", error, errbuf);
+ }
+
+ return ret;
+}
+
+static int ssl_teardown(mbedtls_ssl_context *ssl)
+{
+ int ret = 0;
+
+ ret = mbedtls_ssl_close_notify(ssl);
+ if (ret < 0)
+ ret = ssl_set_error(ssl, ret);
+
+ mbedtls_ssl_free(ssl);
+ return ret;
+}
+
+static int verify_server_cert(mbedtls_ssl_context *ssl)
+{
+ int ret = -1;
+
+ if ((ret = mbedtls_ssl_get_verify_result(ssl)) != 0) {
+ char vrfy_buf[512];
+ int len = mbedtls_x509_crt_verify_info(vrfy_buf, sizeof(vrfy_buf), "", ret);
+ if (len >= 1) vrfy_buf[len - 1] = '\0'; /* Remove trailing \n */
+ git_error_set(GIT_ERROR_SSL, "the SSL certificate is invalid: %#04x - %s", ret, vrfy_buf);
+ return GIT_ECERTIFICATE;
+ }
+
+ return 0;
+}
+
+typedef struct {
+ git_stream parent;
+ git_stream *io;
+ int owned;
+ bool connected;
+ char *host;
+ mbedtls_ssl_context *ssl;
+ git_cert_x509 cert_info;
+} mbedtls_stream;
+
+
+static int mbedtls_connect(git_stream *stream)
+{
+ int ret;
+ mbedtls_stream *st = (mbedtls_stream *) stream;
+
+ if (st->owned && (ret = git_stream_connect(st->io)) < 0)
+ return ret;
+
+ st->connected = true;
+
+ mbedtls_ssl_set_hostname(st->ssl, st->host);
+
+ mbedtls_ssl_set_bio(st->ssl, st->io, bio_write, bio_read, NULL);
+
+ if ((ret = mbedtls_ssl_handshake(st->ssl)) != 0)
+ return ssl_set_error(st->ssl, ret);
+
+ return verify_server_cert(st->ssl);
+}
+
+static int mbedtls_certificate(git_cert **out, git_stream *stream)
+{
+ unsigned char *encoded_cert;
+ mbedtls_stream *st = (mbedtls_stream *) stream;
+
+ const mbedtls_x509_crt *cert = mbedtls_ssl_get_peer_cert(st->ssl);
+ if (!cert) {
+ git_error_set(GIT_ERROR_SSL, "the server did not provide a certificate");
+ return -1;
+ }
+
+ /* Retrieve the length of the certificate first */
+ if (cert->raw.len == 0) {
+ git_error_set(GIT_ERROR_NET, "failed to retrieve certificate information");
+ return -1;
+ }
+
+ encoded_cert = git__malloc(cert->raw.len);
+ GIT_ERROR_CHECK_ALLOC(encoded_cert);
+ memcpy(encoded_cert, cert->raw.p, cert->raw.len);
+
+ st->cert_info.parent.cert_type = GIT_CERT_X509;
+ st->cert_info.data = encoded_cert;
+ st->cert_info.len = cert->raw.len;
+
+ *out = &st->cert_info.parent;
+
+ return 0;
+}
+
+static int mbedtls_set_proxy(git_stream *stream, const git_proxy_options *proxy_options)
+{
+ mbedtls_stream *st = (mbedtls_stream *) stream;
+
+ return git_stream_set_proxy(st->io, proxy_options);
+}
+
+static ssize_t mbedtls_stream_write(git_stream *stream, const char *data, size_t len, int flags)
+{
+ mbedtls_stream *st = (mbedtls_stream *) stream;
+ int written;
+
+ GIT_UNUSED(flags);
+
+ /*
+ * `mbedtls_ssl_write` can only represent INT_MAX bytes
+ * written via its return value. We thus need to clamp
+ * the maximum number of bytes written.
+ */
+ len = min(len, INT_MAX);
+
+ if ((written = mbedtls_ssl_write(st->ssl, (const unsigned char *)data, len)) <= 0)
+ return ssl_set_error(st->ssl, written);
+
+ return written;
+}
+
+static ssize_t mbedtls_stream_read(git_stream *stream, void *data, size_t len)
+{
+ mbedtls_stream *st = (mbedtls_stream *) stream;
+ int ret;
+
+ if ((ret = mbedtls_ssl_read(st->ssl, (unsigned char *)data, len)) <= 0)
+ ssl_set_error(st->ssl, ret);
+
+ return ret;
+}
+
+static int mbedtls_stream_close(git_stream *stream)
+{
+ mbedtls_stream *st = (mbedtls_stream *) stream;
+ int ret = 0;
+
+ if (st->connected && (ret = ssl_teardown(st->ssl)) != 0)
+ return -1;
+
+ st->connected = false;
+
+ return st->owned ? git_stream_close(st->io) : 0;
+}
+
+static void mbedtls_stream_free(git_stream *stream)
+{
+ mbedtls_stream *st = (mbedtls_stream *) stream;
+
+ if (st->owned)
+ git_stream_free(st->io);
+
+ git__free(st->host);
+ git__free(st->cert_info.data);
+ mbedtls_ssl_free(st->ssl);
+ git__free(st->ssl);
+ git__free(st);
+}
+
+static int mbedtls_stream_wrap(
+ git_stream **out,
+ git_stream *in,
+ const char *host,
+ int owned)
+{
+ mbedtls_stream *st;
+ int error;
+
+ st = git__calloc(1, sizeof(mbedtls_stream));
+ GIT_ERROR_CHECK_ALLOC(st);
+
+ st->io = in;
+ st->owned = owned;
+
+ st->ssl = git__malloc(sizeof(mbedtls_ssl_context));
+ GIT_ERROR_CHECK_ALLOC(st->ssl);
+ mbedtls_ssl_init(st->ssl);
+ if (mbedtls_ssl_setup(st->ssl, git__ssl_conf)) {
+ git_error_set(GIT_ERROR_SSL, "failed to create ssl object");
+ error = -1;
+ goto out_err;
+ }
+
+ st->host = git__strdup(host);
+ GIT_ERROR_CHECK_ALLOC(st->host);
+
+ st->parent.version = GIT_STREAM_VERSION;
+ st->parent.encrypted = 1;
+ st->parent.proxy_support = git_stream_supports_proxy(st->io);
+ st->parent.connect = mbedtls_connect;
+ st->parent.certificate = mbedtls_certificate;
+ st->parent.set_proxy = mbedtls_set_proxy;
+ st->parent.read = mbedtls_stream_read;
+ st->parent.write = mbedtls_stream_write;
+ st->parent.close = mbedtls_stream_close;
+ st->parent.free = mbedtls_stream_free;
+
+ *out = (git_stream *) st;
+ return 0;
+
+out_err:
+ mbedtls_ssl_free(st->ssl);
+ git_stream_close(st->io);
+ git_stream_free(st->io);
+ git__free(st);
+
+ return error;
+}
+
+int git_mbedtls_stream_wrap(
+ git_stream **out,
+ git_stream *in,
+ const char *host)
+{
+ return mbedtls_stream_wrap(out, in, host, 0);
+}
+
+int git_mbedtls_stream_new(
+ git_stream **out,
+ const char *host,
+ const char *port)
+{
+ git_stream *stream;
+ int error;
+
+ assert(out && host && port);
+
+ if ((error = git_socket_stream_new(&stream, host, port)) < 0)
+ return error;
+
+ if ((error = mbedtls_stream_wrap(out, stream, host, 1)) < 0) {
+ git_stream_close(stream);
+ git_stream_free(stream);
+ }
+
+ return error;
+}
+
+int git_mbedtls__set_cert_location(const char *path, int is_dir)
+{
+ int ret = 0;
+ char errbuf[512];
+ mbedtls_x509_crt *cacert;
+
+ assert(path != NULL);
+
+ cacert = git__malloc(sizeof(mbedtls_x509_crt));
+ GIT_ERROR_CHECK_ALLOC(cacert);
+
+ mbedtls_x509_crt_init(cacert);
+ if (is_dir) {
+ ret = mbedtls_x509_crt_parse_path(cacert, path);
+ } else {
+ ret = mbedtls_x509_crt_parse_file(cacert, path);
+ }
+ /* mbedtls_x509_crt_parse_path returns the number of invalid certs on success */
+ if (ret < 0) {
+ mbedtls_x509_crt_free(cacert);
+ git__free(cacert);
+ mbedtls_strerror( ret, errbuf, 512 );
+ git_error_set(GIT_ERROR_SSL, "failed to load CA certificates: %#04x - %s", ret, errbuf);
+ return -1;
+ }
+
+ mbedtls_x509_crt_free(git__ssl_conf->ca_chain);
+ git__free(git__ssl_conf->ca_chain);
+ mbedtls_ssl_conf_ca_chain(git__ssl_conf, cacert, NULL);
+
+ return 0;
+}
+
+#else
+
+#include "stream.h"
+
+int git_mbedtls_stream_global_init(void)
+{
+ return 0;
+}
+
+#endif
--- /dev/null
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+#ifndef INCLUDE_steams_mbedtls_h__
+#define INCLUDE_steams_mbedtls_h__
+
+#include "common.h"
+
+#include "git2/sys/stream.h"
+
+extern int git_mbedtls_stream_global_init(void);
+
+#ifdef GIT_MBEDTLS
+extern int git_mbedtls__set_cert_location(const char *path, int is_dir);
+
+extern int git_mbedtls_stream_new(git_stream **out, const char *host, const char *port);
+extern int git_mbedtls_stream_wrap(git_stream **out, git_stream *in, const char *host);
+#endif
+
+#endif
#include "git2/transport.h"
#include "git2/sys/openssl.h"
-#ifdef GIT_CURL
-# include "streams/curl.h"
-#endif
-
#ifndef GIT_WIN32
# include <sys/types.h>
# include <sys/socket.h>
#define GIT_SSL_DEFAULT_CIPHERS "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-DSS-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA:DHE-DSS-AES128-SHA256:DHE-DSS-AES256-SHA256:DHE-DSS-AES128-SHA:DHE-DSS-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA"
-#if defined(GIT_THREADS) && OPENSSL_VERSION_NUMBER < 0x10100000L
+#if (defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x10100000L) || \
+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+# define OPENSSL_LEGACY_API
+#endif
+
+/*
+ * OpenSSL 1.1 made BIO opaque so we have to use functions to interact with it
+ * which do not exist in previous versions. We define these inline functions so
+ * we can program against the interface instead of littering the implementation
+ * with ifdefs. We do the same for OPENSSL_init_ssl.
+ */
+#if defined(OPENSSL_LEGACY_API)
+static int OPENSSL_init_ssl(int opts, void *settings)
+{
+ GIT_UNUSED(opts);
+ GIT_UNUSED(settings);
+ SSL_load_error_strings();
+ OpenSSL_add_ssl_algorithms();
+ return 0;
+}
+
+static BIO_METHOD* BIO_meth_new(int type, const char *name)
+{
+ BIO_METHOD *meth = git__calloc(1, sizeof(BIO_METHOD));
+ if (!meth) {
+ return NULL;
+ }
+
+ meth->type = type;
+ meth->name = name;
+
+ return meth;
+}
+
+static void BIO_meth_free(BIO_METHOD *biom)
+{
+ git__free(biom);
+}
+
+static int BIO_meth_set_write(BIO_METHOD *biom, int (*write) (BIO *, const char *, int))
+{
+ biom->bwrite = write;
+ return 1;
+}
+
+static int BIO_meth_set_read(BIO_METHOD *biom, int (*read) (BIO *, char *, int))
+{
+ biom->bread = read;
+ return 1;
+}
+
+static int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *))
+{
+ biom->bputs = puts;
+ return 1;
+}
+
+static int BIO_meth_set_gets(BIO_METHOD *biom, int (*gets) (BIO *, char *, int))
+
+{
+ biom->bgets = gets;
+ return 1;
+}
+
+static int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *))
+{
+ biom->ctrl = ctrl;
+ return 1;
+}
+
+static int BIO_meth_set_create(BIO_METHOD *biom, int (*create) (BIO *))
+{
+ biom->create = create;
+ return 1;
+}
+
+static int BIO_meth_set_destroy(BIO_METHOD *biom, int (*destroy) (BIO *))
+{
+ biom->destroy = destroy;
+ return 1;
+}
+
+static int BIO_get_new_index(void)
+{
+ /* This exists as of 1.1 so before we'd just have 0 */
+ return 0;
+}
+
+static void BIO_set_init(BIO *b, int init)
+{
+ b->init = init;
+}
+
+static void BIO_set_data(BIO *a, void *ptr)
+{
+ a->ptr = ptr;
+}
+
+static void *BIO_get_data(BIO *a)
+{
+ return a->ptr;
+}
+
+static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *x)
+{
+ return ASN1_STRING_data((ASN1_STRING *)x);
+}
+# if defined(GIT_THREADS)
static git_mutex *openssl_locks;
static void openssl_locking_function(
git_mutex_free(&openssl_locks[i]);
git__free(openssl_locks);
}
-
-#endif /* GIT_THREADS && OPENSSL_VERSION_NUMBER < 0x10100000L */
+# endif /* GIT_THREADS */
+#endif /* OPENSSL_LEGACY_API */
static BIO_METHOD *git_stream_bio_method;
static int init_bio_method(void);
int git_openssl_stream_global_init(void)
{
-#ifdef GIT_OPENSSL
long ssl_opts = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
const char *ciphers = git_libgit2__ssl_ciphers();
ssl_opts |= SSL_OP_NO_COMPRESSION;
#endif
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
- (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
- SSL_load_error_strings();
- OpenSSL_add_ssl_algorithms();
-#else
OPENSSL_init_ssl(0, NULL);
-#endif
/*
* Load SSLv{2,3} and TLSv1 so that we can talk with servers
* compatibility. We then disable SSL so we only allow OpenSSL
* to speak TLSv1 to perform the encryption itself.
*/
- git__ssl_ctx = SSL_CTX_new(SSLv23_method());
+ if (!(git__ssl_ctx = SSL_CTX_new(SSLv23_method())))
+ goto error;
+
SSL_CTX_set_options(git__ssl_ctx, ssl_opts);
SSL_CTX_set_mode(git__ssl_ctx, SSL_MODE_AUTO_RETRY);
SSL_CTX_set_verify(git__ssl_ctx, SSL_VERIFY_NONE, NULL);
- if (!SSL_CTX_set_default_verify_paths(git__ssl_ctx)) {
- SSL_CTX_free(git__ssl_ctx);
- git__ssl_ctx = NULL;
- return -1;
- }
+ if (!SSL_CTX_set_default_verify_paths(git__ssl_ctx))
+ goto error;
- if (!ciphers) {
+ if (!ciphers)
ciphers = GIT_SSL_DEFAULT_CIPHERS;
- }
- if(!SSL_CTX_set_cipher_list(git__ssl_ctx, ciphers)) {
- SSL_CTX_free(git__ssl_ctx);
- git__ssl_ctx = NULL;
- return -1;
- }
+ if(!SSL_CTX_set_cipher_list(git__ssl_ctx, ciphers))
+ goto error;
- if (init_bio_method() < 0) {
- SSL_CTX_free(git__ssl_ctx);
- git__ssl_ctx = NULL;
- return -1;
- }
-
-#endif
+ if (init_bio_method() < 0)
+ goto error;
git__on_shutdown(shutdown_ssl);
return 0;
+
+error:
+ git_error_set(GIT_ERROR_NET, "could not initialize openssl: %s",
+ ERR_error_string(ERR_get_error(), NULL));
+ SSL_CTX_free(git__ssl_ctx);
+ git__ssl_ctx = NULL;
+ return -1;
}
-#if defined(GIT_THREADS)
+#if defined(GIT_THREADS) && defined(OPENSSL_LEGACY_API)
static void threadid_cb(CRYPTO_THREADID *threadid)
{
- CRYPTO_THREADID_set_numeric(threadid, git_thread_currentid());
+ GIT_UNUSED(threadid);
+ CRYPTO_THREADID_set_numeric(threadid, git_thread_currentid());
}
#endif
int git_openssl_set_locking(void)
{
-#if defined(GIT_THREADS) && OPENSSL_VERSION_NUMBER < 0x10100000L
+#if defined(GIT_THREADS) && defined(OPENSSL_LEGACY_API)
int num_locks, i;
CRYPTO_THREADID_set_callback(threadid_cb);
num_locks = CRYPTO_num_locks();
openssl_locks = git__calloc(num_locks, sizeof(git_mutex));
- GITERR_CHECK_ALLOC(openssl_locks);
+ GIT_ERROR_CHECK_ALLOC(openssl_locks);
for (i = 0; i < num_locks; i++) {
if (git_mutex_init(&openssl_locks[i]) != 0) {
- giterr_set(GITERR_SSL, "failed to initialize openssl locks");
+ git_error_set(GIT_ERROR_SSL, "failed to initialize openssl locks");
return -1;
}
}
CRYPTO_set_locking_callback(openssl_locking_function);
git__on_shutdown(shutdown_ssl_locking);
return 0;
-#elif OPENSSL_VERSION_NUMBER >= 0x10100000L
+#elif !defined(OPENSSL_LEGACY_API)
return 0;
#else
- giterr_set(GITERR_THREAD, "libgit2 was not built with threads");
+ git_error_set(GIT_ERROR_THREAD, "libgit2 was not built with threads");
return -1;
#endif
}
{
/* Set up the BIO_METHOD we use for wrapping our own stream implementations */
git_stream_bio_method = BIO_meth_new(BIO_TYPE_SOURCE_SINK | BIO_get_new_index(), "git_stream");
- GITERR_CHECK_ALLOC(git_stream_bio_method);
+ GIT_ERROR_CHECK_ALLOC(git_stream_bio_method);
BIO_meth_set_write(git_stream_bio_method, bio_write);
BIO_meth_set_read(git_stream_bio_method, bio_read);
switch (err) {
case SSL_ERROR_WANT_CONNECT:
case SSL_ERROR_WANT_ACCEPT:
- giterr_set(GITERR_NET, "SSL error: connection failure");
+ git_error_set(GIT_ERROR_SSL, "SSL error: connection failure");
break;
case SSL_ERROR_WANT_X509_LOOKUP:
- giterr_set(GITERR_NET, "SSL error: x509 error");
+ git_error_set(GIT_ERROR_SSL, "SSL error: x509 error");
break;
case SSL_ERROR_SYSCALL:
e = ERR_get_error();
if (e > 0) {
char errmsg[256];
ERR_error_string_n(e, errmsg, sizeof(errmsg));
- giterr_set(GITERR_NET, "SSL error: %s", errmsg);
+ git_error_set(GIT_ERROR_NET, "SSL error: %s", errmsg);
break;
} else if (error < 0) {
- giterr_set(GITERR_OS, "SSL error: syscall failure");
+ git_error_set(GIT_ERROR_OS, "SSL error: syscall failure");
break;
}
- giterr_set(GITERR_NET, "SSL error: received early EOF");
+ git_error_set(GIT_ERROR_SSL, "SSL error: received early EOF");
return GIT_EEOF;
break;
case SSL_ERROR_SSL:
char errmsg[256];
e = ERR_get_error();
ERR_error_string_n(e, errmsg, sizeof(errmsg));
- giterr_set(GITERR_NET, "SSL error: %s", errmsg);
+ git_error_set(GIT_ERROR_SSL, "SSL error: %s", errmsg);
break;
}
case SSL_ERROR_NONE:
case SSL_ERROR_ZERO_RETURN:
default:
- giterr_set(GITERR_NET, "SSL error: unknown error");
+ git_error_set(GIT_ERROR_SSL, "SSL error: unknown error");
break;
}
return -1;
int i = -1, j, error = 0;
if (SSL_get_verify_result(ssl) != X509_V_OK) {
- giterr_set(GITERR_SSL, "the SSL certificate is invalid");
+ git_error_set(GIT_ERROR_SSL, "the SSL certificate is invalid");
return GIT_ECERTIFICATE;
}
cert = SSL_get_peer_certificate(ssl);
if (!cert) {
error = -1;
- giterr_set(GITERR_SSL, "the server did not provide a certificate");
+ git_error_set(GIT_ERROR_SSL, "the server did not provide a certificate");
goto cleanup;
}
if (size > 0) {
peer_cn = OPENSSL_malloc(size + 1);
- GITERR_CHECK_ALLOC(peer_cn);
+ GIT_ERROR_CHECK_ALLOC(peer_cn);
memcpy(peer_cn, ASN1_STRING_get0_data(str), size);
peer_cn[size] = '\0';
} else {
}
} else {
int size = ASN1_STRING_to_UTF8(&peer_cn, str);
- GITERR_CHECK_ALLOC(peer_cn);
+ GIT_ERROR_CHECK_ALLOC(peer_cn);
if (memchr(peer_cn, '\0', size))
goto cert_fail_name;
}
cert_fail_name:
error = GIT_ECERTIFICATE;
- giterr_set(GITERR_SSL, "hostname does not match certificate");
+ git_error_set(GIT_ERROR_SSL, "hostname does not match certificate");
goto cleanup;
on_error:
typedef struct {
git_stream parent;
git_stream *io;
+ int owned;
bool connected;
char *host;
SSL *ssl;
git_cert_x509 cert_info;
} openssl_stream;
-int openssl_close(git_stream *stream);
-
-int openssl_connect(git_stream *stream)
+static int openssl_connect(git_stream *stream)
{
int ret;
BIO *bio;
openssl_stream *st = (openssl_stream *) stream;
- if ((ret = git_stream_connect(st->io)) < 0)
+ if (st->owned && (ret = git_stream_connect(st->io)) < 0)
return ret;
- st->connected = true;
-
bio = BIO_new(git_stream_bio_method);
- GITERR_CHECK_ALLOC(bio);
+ GIT_ERROR_CHECK_ALLOC(bio);
BIO_set_data(bio, st->io);
SSL_set_bio(st->ssl, bio, bio);
if ((ret = SSL_connect(st->ssl)) <= 0)
return ssl_set_error(st->ssl, ret);
+ st->connected = true;
+
return verify_server_cert(st->ssl, st->host);
}
-int openssl_certificate(git_cert **out, git_stream *stream)
+static int openssl_certificate(git_cert **out, git_stream *stream)
{
openssl_stream *st = (openssl_stream *) stream;
int len;
/* Retrieve the length of the certificate first */
len = i2d_X509(cert, NULL);
if (len < 0) {
- giterr_set(GITERR_NET, "failed to retrieve certificate information");
+ git_error_set(GIT_ERROR_NET, "failed to retrieve certificate information");
return -1;
}
encoded_cert = git__malloc(len);
- GITERR_CHECK_ALLOC(encoded_cert);
+ GIT_ERROR_CHECK_ALLOC(encoded_cert);
/* i2d_X509 makes 'guard' point to just after the data */
guard = encoded_cert;
len = i2d_X509(cert, &guard);
if (len < 0) {
git__free(encoded_cert);
- giterr_set(GITERR_NET, "failed to retrieve certificate information");
+ git_error_set(GIT_ERROR_NET, "failed to retrieve certificate information");
return -1;
}
return git_stream_set_proxy(st->io, proxy_opts);
}
-ssize_t openssl_write(git_stream *stream, const char *data, size_t len, int flags)
+static ssize_t openssl_write(git_stream *stream, const char *data, size_t data_len, int flags)
{
openssl_stream *st = (openssl_stream *) stream;
- int ret;
+ int ret, len = min(data_len, INT_MAX);
GIT_UNUSED(flags);
- if ((ret = SSL_write(st->ssl, data, len)) <= 0) {
+ if ((ret = SSL_write(st->ssl, data, len)) <= 0)
return ssl_set_error(st->ssl, ret);
- }
return ret;
}
-ssize_t openssl_read(git_stream *stream, void *data, size_t len)
+static ssize_t openssl_read(git_stream *stream, void *data, size_t len)
{
openssl_stream *st = (openssl_stream *) stream;
int ret;
return ret;
}
-int openssl_close(git_stream *stream)
+static int openssl_close(git_stream *stream)
{
openssl_stream *st = (openssl_stream *) stream;
int ret;
st->connected = false;
- return git_stream_close(st->io);
+ return st->owned ? git_stream_close(st->io) : 0;
}
-void openssl_free(git_stream *stream)
+static void openssl_free(git_stream *stream)
{
openssl_stream *st = (openssl_stream *) stream;
+ if (st->owned)
+ git_stream_free(st->io);
+
SSL_free(st->ssl);
git__free(st->host);
git__free(st->cert_info.data);
- git_stream_free(st->io);
git__free(st);
}
-int git_openssl_stream_new(git_stream **out, const char *host, const char *port)
+static int openssl_stream_wrap(
+ git_stream **out,
+ git_stream *in,
+ const char *host,
+ int owned)
{
- int error;
openssl_stream *st;
- st = git__calloc(1, sizeof(openssl_stream));
- GITERR_CHECK_ALLOC(st);
+ assert(out && in && host);
- st->io = NULL;
-#ifdef GIT_CURL
- error = git_curl_stream_new(&st->io, host, port);
-#else
- error = git_socket_stream_new(&st->io, host, port);
-#endif
+ st = git__calloc(1, sizeof(openssl_stream));
+ GIT_ERROR_CHECK_ALLOC(st);
- if (error < 0)
- goto out_err;
+ st->io = in;
+ st->owned = owned;
st->ssl = SSL_new(git__ssl_ctx);
if (st->ssl == NULL) {
- giterr_set(GITERR_SSL, "failed to create ssl object");
- error = -1;
- goto out_err;
+ git_error_set(GIT_ERROR_SSL, "failed to create ssl object");
+ git__free(st);
+ return -1;
}
st->host = git__strdup(host);
- GITERR_CHECK_ALLOC(st->host);
+ GIT_ERROR_CHECK_ALLOC(st->host);
st->parent.version = GIT_STREAM_VERSION;
st->parent.encrypted = 1;
*out = (git_stream *) st;
return 0;
+}
-out_err:
- git_stream_free(st->io);
- git__free(st);
+int git_openssl_stream_wrap(git_stream **out, git_stream *in, const char *host)
+{
+ return openssl_stream_wrap(out, in, host, 0);
+}
+
+int git_openssl_stream_new(git_stream **out, const char *host, const char *port)
+{
+ git_stream *stream = NULL;
+ int error;
+
+ assert(out && host && port);
+
+ if ((error = git_socket_stream_new(&stream, host, port)) < 0)
+ return error;
+
+ if ((error = openssl_stream_wrap(out, stream, host, 1)) < 0) {
+ git_stream_close(stream);
+ git_stream_free(stream);
+ }
return error;
}
char errmsg[256];
ERR_error_string_n(ERR_get_error(), errmsg, sizeof(errmsg));
- giterr_set(GITERR_SSL, "OpenSSL error: failed to load certificates: %s",
+ git_error_set(GIT_ERROR_SSL, "OpenSSL error: failed to load certificates: %s",
errmsg);
return -1;
int git_openssl_set_locking(void)
{
- giterr_set(GITERR_SSL, "libgit2 was not built with OpenSSL support");
- return -1;
-}
-
-int git_openssl_stream_new(git_stream **out, const char *host, const char *port)
-{
- GIT_UNUSED(out);
- GIT_UNUSED(host);
- GIT_UNUSED(port);
-
- giterr_set(GITERR_SSL, "openssl is not supported in this version");
- return -1;
-}
-
-int git_openssl__set_cert_location(const char *file, const char *path)
-{
- GIT_UNUSED(file);
- GIT_UNUSED(path);
-
- giterr_set(GITERR_SSL, "openssl is not supported in this version");
+ git_error_set(GIT_ERROR_SSL, "libgit2 was not built with OpenSSL support");
return -1;
}
extern int git_openssl_stream_global_init(void);
-extern int git_openssl_stream_new(git_stream **out, const char *host, const char *port);
-
-extern int git_openssl__set_cert_location(const char *file, const char *path);
-
-/*
- * OpenSSL 1.1 made BIO opaque so we have to use functions to interact with it
- * which do not exist in previous versions. We define these inline functions so
- * we can program against the interface instead of littering the implementation
- * with ifdefs.
- */
#ifdef GIT_OPENSSL
-# include <openssl/ssl.h>
-# include <openssl/err.h>
-# include <openssl/x509v3.h>
-# include <openssl/bio.h>
-
-
-
-# if OPENSSL_VERSION_NUMBER < 0x10100000L || \
- (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
-
-GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name)
-{
- BIO_METHOD *meth = git__calloc(1, sizeof(BIO_METHOD));
- if (!meth) {
- return NULL;
- }
-
- meth->type = type;
- meth->name = name;
-
- return meth;
-}
-
-GIT_INLINE(void) BIO_meth_free(BIO_METHOD *biom)
-{
- git__free(biom);
-}
-
-GIT_INLINE(int) BIO_meth_set_write(BIO_METHOD *biom, int (*write) (BIO *, const char *, int))
-{
- biom->bwrite = write;
- return 1;
-}
-
-GIT_INLINE(int) BIO_meth_set_read(BIO_METHOD *biom, int (*read) (BIO *, char *, int))
-{
- biom->bread = read;
- return 1;
-}
-
-GIT_INLINE(int) BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *))
-{
- biom->bputs = puts;
- return 1;
-}
-
-GIT_INLINE(int) BIO_meth_set_gets(BIO_METHOD *biom, int (*gets) (BIO *, char *, int))
-
-{
- biom->bgets = gets;
- return 1;
-}
-
-GIT_INLINE(int) BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *))
-{
- biom->ctrl = ctrl;
- return 1;
-}
-
-GIT_INLINE(int) BIO_meth_set_create(BIO_METHOD *biom, int (*create) (BIO *))
-{
- biom->create = create;
- return 1;
-}
-
-GIT_INLINE(int) BIO_meth_set_destroy(BIO_METHOD *biom, int (*destroy) (BIO *))
-{
- biom->destroy = destroy;
- return 1;
-}
-
-GIT_INLINE(int) BIO_get_new_index(void)
-{
- /* This exists as of 1.1 so before we'd just have 0 */
- return 0;
-}
-
-GIT_INLINE(void) BIO_set_init(BIO *b, int init)
-{
- b->init = init;
-}
-
-GIT_INLINE(void) BIO_set_data(BIO *a, void *ptr)
-{
- a->ptr = ptr;
-}
-
-GIT_INLINE(void*) BIO_get_data(BIO *a)
-{
- return a->ptr;
-}
-
-GIT_INLINE(const unsigned char *) ASN1_STRING_get0_data(const ASN1_STRING *x)
-{
- return ASN1_STRING_data((ASN1_STRING *)x);
-}
+extern int git_openssl__set_cert_location(const char *file, const char *path);
-# endif // OpenSSL < 1.1
-#endif // GIT_OPENSSL
+extern int git_openssl_stream_new(git_stream **out, const char *host, const char *port);
+extern int git_openssl_stream_wrap(git_stream **out, git_stream *in, const char *host);
+#endif
#endif
--- /dev/null
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#include "git2/errors.h"
+
+#include "common.h"
+#include "global.h"
+#include "streams/tls.h"
+#include "streams/mbedtls.h"
+#include "streams/openssl.h"
+#include "streams/stransport.h"
+
+struct stream_registry {
+ git_rwlock lock;
+ git_stream_registration callbacks;
+ git_stream_registration tls_callbacks;
+};
+
+static struct stream_registry stream_registry;
+
+static void shutdown_stream_registry(void)
+{
+ git_rwlock_free(&stream_registry.lock);
+}
+
+int git_stream_registry_global_init(void)
+{
+ if (git_rwlock_init(&stream_registry.lock) < 0)
+ return -1;
+
+ git__on_shutdown(shutdown_stream_registry);
+ return 0;
+}
+
+GIT_INLINE(void) stream_registration_cpy(
+ git_stream_registration *target,
+ git_stream_registration *src)
+{
+ if (src)
+ memcpy(target, src, sizeof(git_stream_registration));
+ else
+ memset(target, 0, sizeof(git_stream_registration));
+}
+
+int git_stream_registry_lookup(git_stream_registration *out, git_stream_t type)
+{
+ git_stream_registration *target;
+ int error = GIT_ENOTFOUND;
+
+ assert(out);
+
+ switch(type) {
+ case GIT_STREAM_STANDARD:
+ target = &stream_registry.callbacks;
+ break;
+ case GIT_STREAM_TLS:
+ target = &stream_registry.tls_callbacks;
+ break;
+ default:
+ assert(0);
+ return -1;
+ }
+
+ if (git_rwlock_rdlock(&stream_registry.lock) < 0) {
+ git_error_set(GIT_ERROR_OS, "failed to lock stream registry");
+ return -1;
+ }
+
+ if (target->init) {
+ stream_registration_cpy(out, target);
+ error = 0;
+ }
+
+ git_rwlock_rdunlock(&stream_registry.lock);
+ return error;
+}
+
+int git_stream_register(git_stream_t type, git_stream_registration *registration)
+{
+ assert(!registration || registration->init);
+
+ GIT_ERROR_CHECK_VERSION(registration, GIT_STREAM_VERSION, "stream_registration");
+
+ if (git_rwlock_wrlock(&stream_registry.lock) < 0) {
+ git_error_set(GIT_ERROR_OS, "failed to lock stream registry");
+ return -1;
+ }
+
+ if ((type & GIT_STREAM_STANDARD) == GIT_STREAM_STANDARD)
+ stream_registration_cpy(&stream_registry.callbacks, registration);
+
+ if ((type & GIT_STREAM_TLS) == GIT_STREAM_TLS)
+ stream_registration_cpy(&stream_registry.tls_callbacks, registration);
+
+ git_rwlock_wrunlock(&stream_registry.lock);
+ return 0;
+}
+
+
+int git_stream_register_tls(
+ int GIT_CALLBACK(ctor)(git_stream **out, const char *host, const char *port))
+{
+ git_stream_registration registration = {0};
+
+ if (ctor) {
+ registration.version = GIT_STREAM_VERSION;
+ registration.init = ctor;
+ registration.wrap = NULL;
+
+ return git_stream_register(GIT_STREAM_TLS, ®istration);
+ } else {
+ return git_stream_register(GIT_STREAM_TLS, NULL);
+ }
+}
--- /dev/null
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+#ifndef INCLUDE_streams_registry_h__
+#define INCLUDE_streams_registry_h__
+
+#include "common.h"
+#include "git2/sys/stream.h"
+
+/** Configure stream registry. */
+int git_stream_registry_global_init(void);
+
+/** Lookup a stream registration. */
+extern int git_stream_registry_lookup(git_stream_registration *out, git_stream_t type);
+
+#endif
#include "posix.h"
#include "netops.h"
+#include "registry.h"
#include "stream.h"
#ifndef _WIN32
char * win32_error = git_win32_get_error_message(error);
if (win32_error) {
- giterr_set(GITERR_NET, "%s: %s", str, win32_error);
+ git_error_set(GIT_ERROR_NET, "%s: %s", str, win32_error);
git__free(win32_error);
} else {
- giterr_set(GITERR_NET, str);
+ git_error_set(GIT_ERROR_NET, "%s", str);
}
}
#else
static void net_set_error(const char *str)
{
- giterr_set(GITERR_NET, "%s: %s", str, strerror(errno));
+ git_error_set(GIT_ERROR_NET, "%s: %s", str, strerror(errno));
}
#endif
return -1;
if (0 != WSACleanup()) {
- giterr_set(GITERR_OS, "winsock cleanup failed");
+ git_error_set(GIT_ERROR_OS, "winsock cleanup failed");
return -1;
}
}
-int socket_connect(git_stream *stream)
+static int socket_connect(git_stream *stream)
{
struct addrinfo *info = NULL, *p;
struct addrinfo hints;
WSADATA wsd;
if (WSAStartup(MAKEWORD(2,2), &wsd) != 0) {
- giterr_set(GITERR_OS, "winsock init failed");
+ git_error_set(GIT_ERROR_OS, "winsock init failed");
return -1;
}
if (LOBYTE(wsd.wVersion) != 2 || HIBYTE(wsd.wVersion) != 2) {
WSACleanup();
- giterr_set(GITERR_OS, "winsock init failed");
+ git_error_set(GIT_ERROR_OS, "winsock init failed");
return -1;
}
#endif
hints.ai_family = AF_UNSPEC;
if ((ret = p_getaddrinfo(st->host, st->port, &hints, &info)) != 0) {
- giterr_set(GITERR_NET,
+ git_error_set(GIT_ERROR_NET,
"failed to resolve address for %s: %s", st->host, p_gai_strerror(ret));
return -1;
}
/* Oops, we couldn't connect to any address */
if (s == INVALID_SOCKET && p == NULL) {
- giterr_set(GITERR_OS, "failed to connect to %s", st->host);
+ git_error_set(GIT_ERROR_OS, "failed to connect to %s", st->host);
p_freeaddrinfo(info);
return -1;
}
return 0;
}
-ssize_t socket_write(git_stream *stream, const char *data, size_t len, int flags)
+static ssize_t socket_write(git_stream *stream, const char *data, size_t len, int flags)
{
- ssize_t ret;
- size_t off = 0;
git_socket_stream *st = (git_socket_stream *) stream;
+ ssize_t written;
- while (off < len) {
- errno = 0;
- ret = p_send(st->s, data + off, len - off, flags);
- if (ret < 0) {
- net_set_error("Error sending data");
- return -1;
- }
+ errno = 0;
- off += ret;
+ if ((written = p_send(st->s, data, len, flags)) < 0) {
+ net_set_error("Error sending data");
+ return -1;
}
- return off;
+ return written;
}
-ssize_t socket_read(git_stream *stream, void *data, size_t len)
+static ssize_t socket_read(git_stream *stream, void *data, size_t len)
{
ssize_t ret;
git_socket_stream *st = (git_socket_stream *) stream;
return ret;
}
-int socket_close(git_stream *stream)
+static int socket_close(git_stream *stream)
{
git_socket_stream *st = (git_socket_stream *) stream;
int error;
return error;
}
-void socket_free(git_stream *stream)
+static void socket_free(git_stream *stream)
{
git_socket_stream *st = (git_socket_stream *) stream;
git__free(st);
}
-int git_socket_stream_new(git_stream **out, const char *host, const char *port)
+static int default_socket_stream_new(
+ git_stream **out,
+ const char *host,
+ const char *port)
{
git_socket_stream *st;
- assert(out && host);
+ assert(out && host && port);
st = git__calloc(1, sizeof(git_socket_stream));
- GITERR_CHECK_ALLOC(st);
+ GIT_ERROR_CHECK_ALLOC(st);
st->host = git__strdup(host);
- GITERR_CHECK_ALLOC(st->host);
+ GIT_ERROR_CHECK_ALLOC(st->host);
if (port) {
st->port = git__strdup(port);
- GITERR_CHECK_ALLOC(st->port);
+ GIT_ERROR_CHECK_ALLOC(st->port);
}
st->parent.version = GIT_STREAM_VERSION;
*out = (git_stream *) st;
return 0;
}
+
+int git_socket_stream_new(
+ git_stream **out,
+ const char *host,
+ const char *port)
+{
+ int (*init)(git_stream **, const char *, const char *) = NULL;
+ git_stream_registration custom = {0};
+ int error;
+
+ assert(out && host && port);
+
+ if ((error = git_stream_registry_lookup(&custom, GIT_STREAM_STANDARD)) == 0)
+ init = custom.init;
+ else if (error == GIT_ENOTFOUND)
+ init = default_socket_stream_new;
+ else
+ return error;
+
+ if (!init) {
+ git_error_set(GIT_ERROR_NET, "there is no socket stream available");
+ return -1;
+ }
+
+ return init(out, host, port);
+}
#include "git2/transport.h"
#include "streams/socket.h"
-#include "streams/curl.h"
static int stransport_error(OSStatus ret)
{
CFStringRef message;
if (ret == noErr || ret == errSSLClosedGraceful) {
- giterr_clear();
+ git_error_clear();
return 0;
}
#if !TARGET_OS_IPHONE
message = SecCopyErrorMessageString(ret, NULL);
- GITERR_CHECK_ALLOC(message);
+ GIT_ERROR_CHECK_ALLOC(message);
- giterr_set(GITERR_NET, "SecureTransport error: %s", CFStringGetCStringPtr(message, kCFStringEncodingUTF8));
+ git_error_set(GIT_ERROR_NET, "SecureTransport error: %s", CFStringGetCStringPtr(message, kCFStringEncodingUTF8));
CFRelease(message);
#else
- giterr_set(GITERR_NET, "SecureTransport error: OSStatus %d", (unsigned int)ret);
- GIT_UNUSED(message);
+ git_error_set(GIT_ERROR_NET, "SecureTransport error: OSStatus %d", (unsigned int)ret);
+ GIT_UNUSED(message);
#endif
return -1;
typedef struct {
git_stream parent;
git_stream *io;
+ int owned;
SSLContextRef ctx;
CFDataRef der_data;
git_cert_x509 cert_info;
SecTrustResultType sec_res;
OSStatus ret;
- if ((error = git_stream_connect(st->io)) < 0)
+ if (st->owned && (error = git_stream_connect(st->io)) < 0)
return error;
ret = SSLHandshake(st->ctx);
if (ret != errSSLServerAuthCompleted) {
- giterr_set(GITERR_SSL, "unexpected return value from ssl handshake %d", ret);
+ git_error_set(GIT_ERROR_SSL, "unexpected return value from ssl handshake %d", (int)ret);
return -1;
}
CFRelease(trust);
if (sec_res == kSecTrustResultInvalid || sec_res == kSecTrustResultOtherError) {
- giterr_set(GITERR_SSL, "internal security trust error");
+ git_error_set(GIT_ERROR_SSL, "internal security trust error");
return -1;
}
if (sec_res == kSecTrustResultDeny || sec_res == kSecTrustResultRecoverableTrustFailure ||
sec_res == kSecTrustResultFatalTrustFailure) {
- giterr_set(GITERR_SSL, "untrusted connection error");
+ git_error_set(GIT_ERROR_SSL, "untrusted connection error");
return GIT_ECERTIFICATE;
}
CFRelease(trust);
if (st->der_data == NULL) {
- giterr_set(GITERR_SSL, "retrieved invalid certificate data");
+ git_error_set(GIT_ERROR_SSL, "retrieved invalid certificate data");
return -1;
}
{
git_stream *io = (git_stream *) conn;
- if (git_stream_write(io, data, *len, 0) < 0) {
+ if (git_stream__write_full(io, data, *len, 0) < 0)
return -36; /* "ioErr" from MacErrors.h which is not available on iOS */
- }
return noErr;
}
GIT_UNUSED(flags);
- data_len = len;
+ data_len = min(len, SSIZE_MAX);
if ((ret = SSLWrite(st->ctx, data, data_len, &processed)) != noErr)
return stransport_error(ret);
- return processed;
+ assert(processed < SSIZE_MAX);
+ return (ssize_t)processed;
}
/*
if (ret != noErr && ret != errSSLClosedGraceful)
return stransport_error(ret);
- return git_stream_close(st->io);
+ return st->owned ? git_stream_close(st->io) : 0;
}
static void stransport_free(git_stream *stream)
{
stransport_stream *st = (stransport_stream *) stream;
- git_stream_free(st->io);
+ if (st->owned)
+ git_stream_free(st->io);
+
CFRelease(st->ctx);
if (st->der_data)
CFRelease(st->der_data);
git__free(st);
}
-int git_stransport_stream_new(git_stream **out, const char *host, const char *port)
+static int stransport_wrap(
+ git_stream **out,
+ git_stream *in,
+ const char *host,
+ int owned)
{
stransport_stream *st;
- int error;
OSStatus ret;
- assert(out && host);
+ assert(out && in && host);
st = git__calloc(1, sizeof(stransport_stream));
- GITERR_CHECK_ALLOC(st);
-
-#ifdef GIT_CURL
- error = git_curl_stream_new(&st->io, host, port);
-#else
- error = git_socket_stream_new(&st->io, host, port);
-#endif
+ GIT_ERROR_CHECK_ALLOC(st);
- if (error < 0){
- git__free(st);
- return error;
- }
+ st->io = in;
+ st->owned = owned;
st->ctx = SSLCreateContext(NULL, kSSLClientSide, kSSLStreamType);
if (!st->ctx) {
- giterr_set(GITERR_NET, "failed to create SSL context");
+ git_error_set(GIT_ERROR_NET, "failed to create SSL context");
git__free(st);
return -1;
}
return 0;
}
+int git_stransport_stream_wrap(
+ git_stream **out,
+ git_stream *in,
+ const char *host)
+{
+ return stransport_wrap(out, in, host, 0);
+}
+
+int git_stransport_stream_new(git_stream **out, const char *host, const char *port)
+{
+ git_stream *stream = NULL;
+ int error;
+
+ assert(out && host);
+
+ error = git_socket_stream_new(&stream, host, port);
+
+ if (!error)
+ error = stransport_wrap(out, stream, host, 1);
+
+ if (error < 0 && stream) {
+ git_stream_close(stream);
+ git_stream_free(stream);
+ }
+
+ return error;
+}
+
#endif
#include "git2/sys/stream.h"
+#ifdef GIT_SECURE_TRANSPORT
+
extern int git_stransport_stream_new(git_stream **out, const char *host, const char *port);
+extern int git_stransport_stream_wrap(git_stream **out, git_stream *in, const char *host);
+
+#endif
#endif
* a Linking Exception. For full terms see the included COPYING file.
*/
-#include "streams/tls.h"
-
#include "git2/errors.h"
+#include "common.h"
+#include "global.h"
+#include "streams/registry.h"
+#include "streams/tls.h"
+#include "streams/mbedtls.h"
#include "streams/openssl.h"
#include "streams/stransport.h"
-static git_stream_cb tls_ctor;
-
-int git_stream_register_tls(git_stream_cb ctor)
+int git_tls_stream_new(git_stream **out, const char *host, const char *port)
{
- tls_ctor = ctor;
+ int (*init)(git_stream **, const char *, const char *) = NULL;
+ git_stream_registration custom = {0};
+ int error;
+
+ assert(out && host && port);
+
+ if ((error = git_stream_registry_lookup(&custom, GIT_STREAM_TLS)) == 0) {
+ init = custom.init;
+ } else if (error == GIT_ENOTFOUND) {
+#ifdef GIT_SECURE_TRANSPORT
+ init = git_stransport_stream_new;
+#elif defined(GIT_OPENSSL)
+ init = git_openssl_stream_new;
+#elif defined(GIT_MBEDTLS)
+ init = git_mbedtls_stream_new;
+#endif
+ } else {
+ return error;
+ }
+
+ if (!init) {
+ git_error_set(GIT_ERROR_SSL, "there is no TLS stream available");
+ return -1;
+ }
- return 0;
+ return init(out, host, port);
}
-int git_tls_stream_new(git_stream **out, const char *host, const char *port)
+int git_tls_stream_wrap(git_stream **out, git_stream *in, const char *host)
{
+ int (*wrap)(git_stream **, git_stream *, const char *) = NULL;
+ git_stream_registration custom = {0};
- if (tls_ctor)
- return tls_ctor(out, host, port);
+ assert(out && in);
+ if (git_stream_registry_lookup(&custom, GIT_STREAM_TLS) == 0) {
+ wrap = custom.wrap;
+ } else {
#ifdef GIT_SECURE_TRANSPORT
- return git_stransport_stream_new(out, host, port);
+ wrap = git_stransport_stream_wrap;
#elif defined(GIT_OPENSSL)
- return git_openssl_stream_new(out, host, port);
-#else
- GIT_UNUSED(out);
- GIT_UNUSED(host);
- GIT_UNUSED(port);
-
- giterr_set(GITERR_SSL, "there is no TLS stream available");
- return -1;
+ wrap = git_openssl_stream_wrap;
+#elif defined(GIT_MBEDTLS)
+ wrap = git_mbedtls_stream_wrap;
#endif
+ }
+
+ if (!wrap) {
+ git_error_set(GIT_ERROR_SSL, "there is no TLS stream available");
+ return -1;
+ }
+
+ return wrap(out, in, host);
}
/**
* Create a TLS stream with the most appropriate backend available for
- * the current platform.
- *
- * This allows us to ask for a SecureTransport or OpenSSL stream
- * according to being on general Unix vs OS X.
+ * the current platform, whether that's SecureTransport on macOS,
+ * OpenSSL or mbedTLS on other Unixes, or something else entirely.
*/
extern int git_tls_stream_new(git_stream **out, const char *host, const char *port);
+/**
+ * Create a TLS stream on top of an existing insecure stream, using
+ * the most appropriate backend available for the current platform.
+ *
+ * This allows us to create a CONNECT stream on top of a proxy;
+ * using SecureTransport on macOS, OpenSSL or mbedTLS on other
+ * Unixes, or something else entirely.
+ */
+extern int git_tls_stream_wrap(git_stream **out, git_stream *in, const char *host);
+
#endif
#include "strmap.h"
+#define kmalloc git__malloc
+#define kcalloc git__calloc
+#define krealloc git__realloc
+#define kreallocarray git__reallocarray
+#define kfree git__free
+#include "khash.h"
+
+__KHASH_TYPE(str, const char *, void *)
+
__KHASH_IMPL(str, static kh_inline, const char *, void *, 1, kh_str_hash_func, kh_str_hash_equal)
int git_strmap_alloc(git_strmap **map)
{
if ((*map = kh_init(str)) == NULL) {
- giterr_set_oom();
+ git_error_set_oom();
return -1;
}
git_strmap_delete_at(map, idx);
}
+size_t git_strmap_begin(git_strmap *map)
+{
+ GIT_UNUSED(map);
+ return 0;
+}
+
+size_t git_strmap_end(git_strmap *map)
+{
+ return map->n_buckets;
+}
+
int git_strmap_next(
void **data,
- git_strmap_iter* iter,
+ size_t* iter,
git_strmap *map)
{
if (!map)
#include "common.h"
-#define kmalloc git__malloc
-#define kcalloc git__calloc
-#define krealloc git__realloc
-#define kreallocarray git__reallocarray
-#define kfree git__free
-#include "khash.h"
-
-__KHASH_TYPE(str, const char *, void *)
-typedef khash_t(str) git_strmap;
-typedef khiter_t git_strmap_iter;
+typedef struct kh_str_s git_strmap;
int git_strmap_alloc(git_strmap **map);
void git_strmap_free(git_strmap *map);
void git_strmap_insert(git_strmap *map, const char *key, void *value, int *rval);
void git_strmap_delete(git_strmap *map, const char *key);
-#define git_strmap_foreach kh_foreach
-#define git_strmap_foreach_value kh_foreach_value
+#define git_strmap_foreach(h, kvar, vvar, code) { size_t __i; \
+ for (__i = git_strmap_begin(h); __i != git_strmap_end(h); ++__i) { \
+ if (!git_strmap_has_data(h,__i)) continue; \
+ (kvar) = git_strmap_key(h,__i); \
+ (vvar) = git_strmap_value_at(h,__i); \
+ code; \
+ } }
+
+#define git_strmap_foreach_value(h, vvar, code) { size_t __i; \
+ for (__i = git_strmap_begin(h); __i != git_strmap_end(h); ++__i) { \
+ if (!git_strmap_has_data(h,__i)) continue; \
+ (vvar) = git_strmap_value_at(h,__i); \
+ code; \
+ } }
-#define git_strmap_begin kh_begin
-#define git_strmap_end kh_end
+size_t git_strmap_begin(git_strmap *map);
+size_t git_strmap_end(git_strmap *map);
int git_strmap_next(
void **data,
- git_strmap_iter* iter,
+ size_t *iter,
git_strmap *map);
#endif
#include "buf_text.h"
#include "vector.h"
#include "posix.h"
-#include "config_file.h"
+#include "config_backend.h"
#include "config.h"
#include "repository.h"
#include "tree.h"
GITMODULES_CREATE = 1,
};
-static kh_inline khint_t str_hash_no_trailing_slash(const char *s)
-{
- khint_t h;
-
- for (h = 0; *s; ++s)
- if (s[1] != '\0' || *s != '/')
- h = (h << 5) - h + *s;
-
- return h;
-}
-
-static kh_inline int str_equal_no_trailing_slash(const char *a, const char *b)
-{
- size_t alen = a ? strlen(a) : 0;
- size_t blen = b ? strlen(b) : 0;
-
- if (alen > 0 && a[alen - 1] == '/')
- alen--;
- if (blen > 0 && b[blen - 1] == '/')
- blen--;
-
- return (alen == 0 && blen == 0) ||
- (alen == blen && strncmp(a, b, alen) == 0);
-}
-
-__KHASH_IMPL(
- str, static kh_inline, const char *, void *, 1,
- str_hash_no_trailing_slash, str_equal_no_trailing_slash)
-
static int submodule_alloc(git_submodule **out, git_repository *repo, const char *name);
static git_config_backend *open_gitmodules(git_repository *repo, int gitmod);
static int gitmodules_snapshot(git_config **snap, git_repository *repo);
if (!error)
return;
- giterr_set(GITERR_SUBMODULE, (error == GIT_ENOTFOUND) ?
+ git_error_set(GIT_ERROR_SUBMODULE, (error == GIT_ENOTFOUND) ?
"no submodule named '%s'" :
"submodule '%s' has not been added yet", name);
}
fdot = strchr(entry->name, '.');
ldot = strrchr(entry->name, '.');
data->name = git__strndup(fdot + 1, ldot - fdot - 1);
- GITERR_CHECK_ALLOC(data->name);
+ GIT_ERROR_CHECK_ALLOC(data->name);
}
return 0;
}
+/*
+ * Checks to see if the submodule shares its name with a file or directory that
+ * already exists on the index. If so, the submodule cannot be added.
+ */
+static int is_path_occupied(bool *occupied, git_repository *repo, const char *path)
+{
+ int error = 0;
+ git_index *index;
+ git_buf dir = GIT_BUF_INIT;
+ *occupied = false;
+
+ if ((error = git_repository_index__weakptr(&index, repo)) < 0)
+ goto out;
+
+ if ((error = git_index_find(NULL, index, path)) != GIT_ENOTFOUND) {
+ if (!error) {
+ git_error_set(GIT_ERROR_SUBMODULE,
+ "File '%s' already exists in the index", path);
+ *occupied = true;
+ }
+ goto out;
+ }
+
+ if ((error = git_buf_sets(&dir, path)) < 0)
+ goto out;
+
+ if ((error = git_path_to_dir(&dir)) < 0)
+ goto out;
+
+ if ((error = git_index_find_prefix(NULL, index, dir.ptr)) != GIT_ENOTFOUND) {
+ if (!error) {
+ git_error_set(GIT_ERROR_SUBMODULE,
+ "Directory '%s' already exists in the index", path);
+ *occupied = true;
+ }
+ goto out;
+ }
+
+ error = 0;
+
+out:
+ git_buf_dispose(&dir);
+ return error;
+}
+
/**
* Release the name map returned by 'load_submodule_names'.
*/
static void free_submodule_names(git_strmap *names)
{
- git_buf *name = 0;
+ const char *key;
+ char *value;
+
if (names == NULL)
return;
- git_strmap_foreach_value(names, name, {
- git__free(name);
+
+ git_strmap_foreach(names, key, value, {
+ git__free((char *) key);
+ git__free(value);
});
git_strmap_free(names);
+
return;
}
* TODO: for some use-cases, this might need case-folding on a
* case-insensitive filesystem
*/
-static int load_submodule_names(git_strmap *out, git_repository *repo, git_config *cfg)
+static int load_submodule_names(git_strmap **out, git_repository *repo, git_config *cfg)
{
const char *key = "submodule\\..*\\.path";
- git_config_iterator *iter;
+ git_config_iterator *iter = NULL;
git_config_entry *entry;
git_buf buf = GIT_BUF_INIT;
+ git_strmap *names;
int rval, isvalid;
int error = 0;
+ *out = NULL;
+
+ if ((error = git_strmap_alloc(&names)) < 0)
+ goto out;
+
if ((error = git_config_iterator_glob_new(&iter, cfg, key)) < 0)
- return error;
+ goto out;
- while (git_config_next(&entry, iter) == 0) {
+ while ((error = git_config_next(&entry, iter)) == 0) {
const char *fdot, *ldot;
fdot = strchr(entry->name, '.');
ldot = strrchr(entry->name, '.');
- if (git_strmap_exists(out, entry->value)) {
- giterr_set(GITERR_SUBMODULE,
+ if (git_strmap_exists(names, entry->value)) {
+ git_error_set(GIT_ERROR_SUBMODULE,
"duplicated submodule path '%s'", entry->value);
error = -1;
goto out;
if (!isvalid)
continue;
- git_strmap_insert(out, entry->value, git_buf_detach(&buf), &rval);
+ git_strmap_insert(names, git__strdup(entry->value), git_buf_detach(&buf), &rval);
if (rval < 0) {
- giterr_set(GITERR_NOMEMORY, "error inserting submodule into hash table");
- return -1;
+ git_error_set(GIT_ERROR_NOMEMORY, "error inserting submodule into hash table");
+ error = -1;
+ goto out;
}
}
if (error == GIT_ITEROVER)
error = 0;
+ *out = names;
+ names = NULL;
+
out:
- git_buf_free(&buf);
+ free_submodule_names(names);
+ git_buf_dispose(&buf);
git_config_iterator_free(iter);
return error;
}
assert(repo && name);
if (repo->is_bare) {
- giterr_set(GITERR_SUBMODULE, "cannot get submodules without a working tree");
+ git_error_set(GIT_ERROR_SUBMODULE, "cannot get submodules without a working tree");
return -1;
}
if (repo->submodule_cache != NULL) {
- khiter_t pos = git_strmap_lookup_index(repo->submodule_cache, name);
+ size_t pos = git_strmap_lookup_index(repo->submodule_cache, name);
if (git_strmap_valid_index(repo->submodule_cache, pos)) {
if (out) {
*out = git_strmap_value_at(repo->submodule_cache, pos);
mods = open_gitmodules(repo, GITMODULES_EXISTING);
if (mods)
- error = git_config_file_foreach_match(mods, pattern, find_by_path, &data);
+ error = git_config_backend_foreach_match(mods, pattern, find_by_path, &data);
- git_config_file_free(mods);
+ git_config_backend_free(mods);
if (error < 0) {
git_submodule_free(sm);
- git_buf_free(&path);
+ git_buf_dispose(&path);
return error;
}
}
}
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
if ((error = git_submodule_location(&location, sm)) < 0) {
if (git_path_exists(path.ptr))
error = GIT_EEXISTS;
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
submodule_set_lookup_error(error, name);
}
isvalid = git_path_isvalid(repo, buf.ptr, 0, flags);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return isvalid;
}
static int submodule_get_or_create(git_submodule **out, git_repository *repo, git_strmap *map, const char *name)
{
int error = 0;
- khiter_t pos;
+ size_t pos;
git_submodule *sm = NULL;
pos = git_strmap_lookup_index(map, name);
int error;
git_iterator *i = NULL;
const git_index_entry *entry;
- git_strmap *names = 0;
+ git_strmap *names;
- git_strmap_alloc(&names);
- if ((error = load_submodule_names(names, git_index_owner(idx), cfg)))
+ if ((error = load_submodule_names(&names, git_index_owner(idx), cfg)))
goto done;
if ((error = git_iterator_for_index(&i, git_index_owner(idx), idx, NULL)) < 0)
goto done;
while (!(error = git_iterator_advance(&entry, i))) {
- khiter_t pos = git_strmap_lookup_index(map, entry->path);
+ size_t pos = git_strmap_lookup_index(map, entry->path);
git_submodule *sm;
if (git_strmap_valid_index(map, pos)) {
else
sm->flags |= GIT_SUBMODULE_STATUS__INDEX_NOT_SUBMODULE;
} else if (S_ISGITLINK(entry->mode)) {
- khiter_t name_pos;
+ size_t name_pos;
const char *name;
name_pos = git_strmap_lookup_index(names, entry->path);
int error;
git_iterator *i = NULL;
const git_index_entry *entry;
- git_strmap *names = 0;
- git_strmap_alloc(&names);
- if ((error = load_submodule_names(names, git_tree_owner(head), cfg)))
+ git_strmap *names;
+
+ if ((error = load_submodule_names(&names, git_tree_owner(head), cfg)))
goto done;
if ((error = git_iterator_for_tree(&i, head, NULL)) < 0)
goto done;
while (!(error = git_iterator_advance(&entry, i))) {
- khiter_t pos = git_strmap_lookup_index(map, entry->path);
+ size_t pos = git_strmap_lookup_index(map, entry->path);
git_submodule *sm;
if (git_strmap_valid_index(map, pos)) {
else
sm->flags |= GIT_SUBMODULE_STATUS__HEAD_NOT_SUBMODULE;
} else if (S_ISGITLINK(entry->mode)) {
- khiter_t name_pos;
+ size_t name_pos;
const char *name;
name_pos = git_strmap_lookup_index(names, entry->path);
git_buf path = GIT_BUF_INIT;
git_submodule *sm;
git_config *mods = NULL;
- uint32_t mask;
assert(repo && map);
/* get sources that we will need to check */
if (git_repository_index(&idx, repo) < 0)
- giterr_clear();
+ git_error_clear();
if (git_repository_head_tree(&head, repo) < 0)
- giterr_clear();
+ git_error_clear();
wd = git_repository_workdir(repo);
if (wd && (error = git_buf_joinpath(&path, wd, GIT_MODULES_FILE)) < 0)
goto cleanup;
- /* clear submodule flags that are to be refreshed */
- mask = 0;
- mask |= GIT_SUBMODULE_STATUS_IN_INDEX |
- GIT_SUBMODULE_STATUS__INDEX_FLAGS |
- GIT_SUBMODULE_STATUS__INDEX_OID_VALID |
- GIT_SUBMODULE_STATUS__INDEX_MULTIPLE_ENTRIES;
-
- mask |= GIT_SUBMODULE_STATUS_IN_HEAD |
- GIT_SUBMODULE_STATUS__HEAD_OID_VALID;
- mask |= GIT_SUBMODULE_STATUS_IN_CONFIG;
- if (mask != 0)
- mask |= GIT_SUBMODULE_STATUS_IN_WD |
- GIT_SUBMODULE_STATUS__WD_SCANNED |
- GIT_SUBMODULE_STATUS__WD_FLAGS |
- GIT_SUBMODULE_STATUS__WD_OID_VALID;
-
/* add submodule information from .gitmodules */
if (wd) {
lfc_data data = { 0 };
goto cleanup;
}
/* shallow scan submodules in work tree as needed */
- if (wd && mask != 0) {
+ if (wd) {
git_strmap_foreach_value(map, sm, {
submodule_load_from_wd_lite(sm);
});
/* TODO: if we got an error, mark submodule config as invalid? */
git_index_free(idx);
git_tree_free(head);
- git_buf_free(&path);
+ git_buf_dispose(&path);
return error;
}
size_t i;
if (repo->is_bare) {
- giterr_set(GITERR_SUBMODULE, "cannot get submodules without a working tree");
+ git_error_set(GIT_ERROR_SUBMODULE, "cannot get submodules without a working tree");
return -1;
}
git_vector_foreach(&snapshot, i, sm) {
if ((error = callback(sm, sm->name, payload)) != 0) {
- giterr_set_after_callback(error);
+ git_error_set_after_callback(error);
break;
}
}
error = git_repository_init_ext(&subrepo, workdir.ptr, &initopt);
cleanup:
- git_buf_free(&workdir);
- git_buf_free(&repodir);
+ git_buf_dispose(&workdir);
+ git_buf_dispose(&repodir);
*out = subrepo;
git_submodule *sm = NULL;
git_buf name = GIT_BUF_INIT, real_url = GIT_BUF_INIT;
git_repository *subrepo = NULL;
+ bool path_occupied;
assert(repo && url && path);
/* see if there is already an entry for this submodule */
if (git_submodule_lookup(NULL, repo, path) < 0)
- giterr_clear();
+ git_error_clear();
else {
- giterr_set(GITERR_SUBMODULE,
+ git_error_set(GIT_ERROR_SUBMODULE,
"attempt to add submodule '%s' that already exists", path);
return GIT_EEXISTS;
}
path += strlen(git_repository_workdir(repo));
if (git_path_root(path) >= 0) {
- giterr_set(GITERR_SUBMODULE, "submodule path must be a relative path");
+ git_error_set(GIT_ERROR_SUBMODULE, "submodule path must be a relative path");
error = -1;
goto cleanup;
}
+ if ((error = is_path_occupied(&path_occupied, repo, path)) < 0)
+ goto cleanup;
+
+ if (path_occupied) {
+ error = GIT_EEXISTS;
+ goto cleanup;
+ }
+
/* update .gitmodules */
if (!(mods = open_gitmodules(repo, GITMODULES_CREATE))) {
- giterr_set(GITERR_SUBMODULE,
+ git_error_set(GIT_ERROR_SUBMODULE,
"adding submodules to a bare repository is not supported");
return -1;
}
if ((error = git_buf_printf(&name, "submodule.%s.path", path)) < 0 ||
- (error = git_config_file_set_string(mods, name.ptr, path)) < 0)
+ (error = git_config_backend_set_string(mods, name.ptr, path)) < 0)
goto cleanup;
if ((error = submodule_config_key_trunc_puts(&name, "url")) < 0 ||
- (error = git_config_file_set_string(mods, name.ptr, url)) < 0)
+ (error = git_config_backend_set_string(mods, name.ptr, url)) < 0)
goto cleanup;
git_buf_clear(&name);
if (out != NULL)
*out = sm;
- git_config_file_free(mods);
+ git_config_backend_free(mods);
git_repository_free(subrepo);
- git_buf_free(&real_url);
- git_buf_free(&name);
+ git_buf_dispose(&real_url);
+ git_buf_dispose(&name);
return error;
}
done:
git_config_free(cfg);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return error;
}
/* read stat information for submodule working directory */
if (p_stat(path.ptr, &st) < 0) {
- giterr_set(GITERR_SUBMODULE,
+ git_error_set(GIT_ERROR_SUBMODULE,
"cannot add submodule without working directory");
error = -1;
goto cleanup;
memset(&entry, 0, sizeof(entry));
entry.path = sm->path;
git_index_entry__init_from_stat(
- &entry, &st, !(git_index_caps(index) & GIT_INDEXCAP_NO_FILEMODE));
+ &entry, &st, !(git_index_caps(index) & GIT_INDEX_CAPABILITY_NO_FILEMODE));
/* calling git_submodule_open will have set sm->wd_oid if possible */
if ((sm->flags & GIT_SUBMODULE_STATUS__WD_OID_VALID) == 0) {
- giterr_set(GITERR_SUBMODULE,
+ git_error_set(GIT_ERROR_SUBMODULE,
"cannot add submodule without HEAD to index");
error = -1;
goto cleanup;
cleanup:
git_repository_free(sm_repo);
- git_buf_free(&path);
+ git_buf_dispose(&path);
return error;
}
} else if (strchr(url, ':') != NULL || url[0] == '/') {
error = git_buf_sets(out, url);
} else {
- giterr_set(GITERR_SUBMODULE, "invalid format for submodule URL");
+ git_error_set(GIT_ERROR_SUBMODULE, "invalid format for submodule URL");
error = -1;
}
- git_buf_free(&normalized);
+ git_buf_dispose(&normalized);
return error;
}
goto cleanup;
if (val)
- error = git_config_file_set_string(mods, key.ptr, val);
+ error = git_config_backend_set_string(mods, key.ptr, val);
else
- error = git_config_file_delete(mods, key.ptr);
+ error = git_config_backend_delete(mods, key.ptr);
- git_buf_free(&key);
+ git_buf_dispose(&key);
cleanup:
- git_config_file_free(mods);
+ git_config_backend_free(mods);
return error;
}
const char *val;
if (git_config_lookup_map_enum(&type, &val, maps, nmaps, ival) < 0) {
- giterr_set(GITERR_SUBMODULE, "invalid value for %s", var);
+ git_error_set(GIT_ERROR_SUBMODULE, "invalid value for %s", var);
return -1;
}
if (!git_submodule_open_bare(&subrepo, submodule))
git_repository_free(subrepo);
else
- giterr_clear();
+ git_error_clear();
}
if (submodule->flags & GIT_SUBMODULE_STATUS__WD_OID_VALID)
error = git_repository_init_ext(&subrepo, repodir.ptr, &initopt);
cleanup:
- git_buf_free(&workdir);
- git_buf_free(&repodir);
+ git_buf_dispose(&workdir);
+ git_buf_dispose(&repodir);
*out = subrepo;
if (_update_options)
memcpy(&update_options, _update_options, sizeof(git_submodule_update_options));
- GITERR_CHECK_VERSION(&update_options, GIT_SUBMODULE_UPDATE_OPTIONS_VERSION, "git_submodule_update_options");
+ GIT_ERROR_CHECK_VERSION(&update_options, GIT_SUBMODULE_UPDATE_OPTIONS_VERSION, "git_submodule_update_options");
/* Copy over the remote callbacks */
memcpy(&clone_options.fetch_opts, &update_options.fetch_opts, sizeof(git_fetch_options));
goto done;
if (!init) {
- giterr_set(GITERR_SUBMODULE, "submodule is not initialized");
+ git_error_set(GIT_ERROR_SUBMODULE, "submodule is not initialized");
error = GIT_ERROR;
goto done;
}
goto done;
if ((oid = git_submodule_index_id(sm)) == NULL) {
- giterr_set(GITERR_SUBMODULE, "could not get ID of submodule in index");
+ git_error_set(GIT_ERROR_SUBMODULE, "could not get ID of submodule in index");
error = -1;
goto done;
}
/* Look up the target commit in the submodule. */
- if ((error = git_object_lookup(&target_commit, sub_repo, oid, GIT_OBJ_COMMIT)) < 0) {
+ if ((error = git_object_lookup(&target_commit, sub_repo, oid, GIT_OBJECT_COMMIT)) < 0) {
/* If it isn't found then fetch and try again. */
if (error != GIT_ENOTFOUND || !update_options.allow_fetch ||
(error = lookup_default_remote(&remote, sub_repo)) < 0 ||
(error = git_remote_fetch(remote, NULL, &update_options.fetch_opts, NULL)) < 0 ||
- (error = git_object_lookup(&target_commit, sub_repo, git_submodule_index_id(sm), GIT_OBJ_COMMIT)) < 0)
+ (error = git_object_lookup(&target_commit, sub_repo, git_submodule_index_id(sm), GIT_OBJECT_COMMIT)) < 0)
goto done;
}
}
done:
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_config_free(config);
git_object_free(target_commit);
git_remote_free(remote);
git_config *cfg = NULL;
if (!sm->url) {
- giterr_set(GITERR_SUBMODULE,
+ git_error_set(GIT_ERROR_SUBMODULE,
"no URL configured for submodule '%s'", sm->name);
return -1;
}
cleanup:
git_config_free(cfg);
- git_buf_free(&key);
- git_buf_free(&effective_submodule_url);
+ git_buf_dispose(&key);
+ git_buf_dispose(&effective_submodule_url);
return error;
}
git_repository *smrepo = NULL;
if (!sm->url) {
- giterr_set(GITERR_SUBMODULE,
+ git_error_set(GIT_ERROR_SUBMODULE,
"no URL configured for submodule '%s'", sm->name);
return -1;
}
if ((error = git_repository_config__weakptr(&cfg, smrepo)) < 0)
/* return error from reading submodule config */;
else if ((error = lookup_head_remote_key(&remote_name, smrepo)) < 0) {
- giterr_clear();
+ git_error_clear();
error = git_buf_sets(&key, "remote.origin.url");
} else {
error = git_buf_join3(
&key, '.', "remote", remote_name.ptr, "url");
- git_buf_free(&remote_name);
+ git_buf_dispose(&remote_name);
}
if (!error)
git_repository_free(smrepo);
}
- git_buf_free(&key);
+ git_buf_dispose(&key);
return error;
}
if (!git_reference_name_to_id(&sm->wd_oid, *subrepo, GIT_HEAD_FILE))
sm->flags |= GIT_SUBMODULE_STATUS__WD_OID_VALID;
else
- giterr_clear();
+ git_error_clear();
} else if (git_path_exists(path.ptr)) {
sm->flags |= GIT_SUBMODULE_STATUS__WD_SCANNED |
GIT_SUBMODULE_STATUS_IN_WD;
sm->flags |= GIT_SUBMODULE_STATUS__WD_SCANNED;
}
- git_buf_free(&path);
+ git_buf_dispose(&path);
return error;
}
/* if we can't look up file in current head, then done */
if (git_repository_head_tree(&head, submodule->repo) < 0 ||
git_tree_entry_bypath(&te, head, submodule->path) < 0)
- giterr_clear();
+ git_error_clear();
else
submodule_update_from_head_data(submodule, te->attr, git_tree_entry_id(te));
if (ign == GIT_SUBMODULE_IGNORE_DIRTY) {
/* git_submodule_open_bare will load WD OID data */
if (git_submodule_open_bare(&smrepo, sm) < 0)
- giterr_clear();
+ git_error_clear();
else
git_repository_free(smrepo);
smrepo = NULL;
} else if (git_submodule_open(&smrepo, sm) < 0) {
- giterr_clear();
+ git_error_clear();
smrepo = NULL;
}
git_submodule *sm;
if (!name || !(namelen = strlen(name))) {
- giterr_set(GITERR_SUBMODULE, "invalid submodule name");
+ git_error_set(GIT_ERROR_SUBMODULE, "invalid submodule name");
return -1;
}
sm = git__calloc(1, sizeof(git_submodule));
- GITERR_CHECK_ALLOC(sm);
+ GIT_ERROR_CHECK_ALLOC(sm);
sm->name = sm->path = git__strdup(name);
if (!sm->name) {
static int submodule_config_error(const char *property, const char *value)
{
- giterr_set(GITERR_INVALID,
+ git_error_set(GIT_ERROR_INVALID,
"invalid value for submodule '%s' property: '%s'", property, value);
return -1;
}
if (sm->path != sm->name)
git__free(sm->path);
sm->path = git__strdup(value);
- GITERR_CHECK_ALLOC(sm->path);
+ GIT_ERROR_CHECK_ALLOC(sm->path);
}
}
if (!looks_like_command_line_option(value)) {
in_config = 1;
sm->url = git__strdup(value);
- GITERR_CHECK_ALLOC(sm->url);
+ GIT_ERROR_CHECK_ALLOC(sm->url);
}
} else if (error != GIT_ENOTFOUND) {
goto cleanup;
if ((error = get_value(&value, cfg, &key, sm->name, "branch")) == 0) {
in_config = 1;
sm->branch = git__strdup(value);
- GITERR_CHECK_ALLOC(sm->branch);
+ GIT_ERROR_CHECK_ALLOC(sm->branch);
} else if (error != GIT_ENOTFOUND) {
goto cleanup;
}
error = 0;
cleanup:
- git_buf_free(&key);
+ git_buf_dispose(&key);
return error;
}
{
lfc_data *data = payload;
const char *namestart, *property;
- git_strmap_iter pos;
+ size_t pos;
git_strmap *map = data->map;
git_buf name = GIT_BUF_INIT;
git_submodule *sm;
error = 0;
done:
- git_buf_free(&name);
+ git_buf_dispose(&name);
return error;
}
if (git_path_contains(&path, DOT_GIT))
sm->flags |= GIT_SUBMODULE_STATUS_IN_WD;
- git_buf_free(&path);
+ git_buf_dispose(&path);
return 0;
}
if ((error = git_config_open_ondisk(&mods, path.ptr)) < 0)
goto cleanup;
+ git_buf_dispose(&path);
if ((error = git_config_snapshot(snap, mods)) < 0)
goto cleanup;
cleanup:
if (mods)
git_config_free(mods);
- git_buf_free(&path);
+ git_buf_dispose(&path);
return error;
}
return NULL;
if (okay_to_create || git_path_isfile(path.ptr)) {
- /* git_config_file__ondisk should only fail if OOM */
- if (git_config_file__ondisk(&mods, path.ptr) < 0)
+ /* git_config_backend_from_file should only fail if OOM */
+ if (git_config_backend_from_file(&mods, path.ptr) < 0)
mods = NULL;
/* open should only fail here if the file is malformed */
- else if (git_config_file_open(mods, GIT_CONFIG_LEVEL_LOCAL, repo) < 0) {
- git_config_file_free(mods);
+ else if (git_config_backend_open(mods, GIT_CONFIG_LEVEL_LOCAL, repo) < 0) {
+ git_config_backend_free(mods);
mods = NULL;
}
}
}
- git_buf_free(&path);
+ git_buf_dispose(&path);
return mods;
}
* a remote key for the local tracking branch HEAD points to.
**/
if (!git_reference_is_branch(head)) {
- giterr_set(GITERR_INVALID,
+ git_error_set(GIT_ERROR_INVALID,
"HEAD does not refer to a branch.");
error = GIT_ENOTFOUND;
goto done;
goto done;
done:
- git_buf_free(&upstream_name);
+ git_buf_dispose(&upstream_name);
git_reference_free(head);
return error;
if (!(error = lookup_head_remote_key(&remote_name, repo)))
error = git_remote_lookup(remote, repo, remote_name.ptr);
- git_buf_free(&remote_name);
+ git_buf_dispose(&remote_name);
return error;
}
error = git_remote_lookup(remote, repo, "origin");
if (error == GIT_ENOTFOUND)
- giterr_set(
- GITERR_SUBMODULE,
+ git_error_set(
+ GIT_ERROR_SUBMODULE,
"cannot get default remote for submodule - no local tracking "
"branch for HEAD and origin does not exist");
} else if (error != GIT_ENOTFOUND)
goto out;
else
- giterr_clear();
+ git_error_clear();
/* if repository does not have a default remote, use workdir instead */
if (git_repository_is_worktree(repo)) {
/* if we don't have an unborn head, check diff with index */
if (git_repository_head_tree(&sm_head, sm_repo) < 0)
- giterr_clear();
+ git_error_clear();
else {
/* perform head to index diff on submodule */
if (git_diff_tree_to_index(&diff, sm_repo, sm_head, index, &opt) < 0)
- giterr_clear();
+ git_error_clear();
else {
if (git_diff_num_deltas(diff) > 0)
*status |= GIT_SUBMODULE_STATUS_WD_INDEX_MODIFIED;
/* perform index-to-workdir diff on submodule */
if (git_diff_index_to_workdir(&diff, sm_repo, index, &opt) < 0)
- giterr_clear();
+ git_error_clear();
else {
size_t untracked =
git_diff_num_deltas_of_type(diff, GIT_DELTA_UNTRACKED);
} while (error == ERANGE && buflen <= 8192);
if (error) {
- giterr_set(GITERR_OS, "failed to get passwd entry");
+ git_error_set(GIT_ERROR_OS, "failed to get passwd entry");
goto out;
}
if (!pwdptr) {
- giterr_set(GITERR_OS, "no passwd entry found for user");
+ git_error_set(GIT_ERROR_OS, "no passwd entry found for user");
goto out;
}
error = get_passwd_home(out, euid);
if (error == GIT_ENOTFOUND) {
- giterr_clear();
+ git_error_clear();
error = 0;
}
}
if (error == GIT_ENOTFOUND) {
- giterr_clear();
+ git_error_clear();
error = 0;
}
- git_buf_free(&env);
+ git_buf_dispose(&env);
return error;
#endif
}
size_t i;
for (i = 0; i < ARRAY_SIZE(git_sysdir__dirs); ++i)
- git_buf_free(&git_sysdir__dirs[i].buf);
+ git_buf_dispose(&git_sysdir__dirs[i].buf);
}
int git_sysdir_global_init(void)
if (which < ARRAY_SIZE(git_sysdir__dirs))
return 0;
- giterr_set(GITERR_INVALID, "config directory selector out of range");
+ git_error_set(GIT_ERROR_INVALID, "config directory selector out of range");
return -1;
}
*out = NULL;
- GITERR_CHECK_ERROR(git_sysdir_check_selector(which));
+ GIT_ERROR_CHECK_ERROR(git_sysdir_check_selector(which));
*out = &git_sysdir__dirs[which].buf;
return 0;
{
const git_buf *path = NULL;
- GITERR_CHECK_ERROR(git_sysdir_check_selector(which));
- GITERR_CHECK_ERROR(git_sysdir_get(&path, which));
+ GIT_ERROR_CHECK_ERROR(git_sysdir_check_selector(which));
+ GIT_ERROR_CHECK_ERROR(git_sysdir_get(&path, which));
if (!out || path->size >= outlen) {
- giterr_set(GITERR_NOMEMORY, "buffer is too short for the path");
+ git_error_set(GIT_ERROR_NOMEMORY, "buffer is too short for the path");
return GIT_EBUFS;
}
const char *expand_path = NULL;
git_buf merge = GIT_BUF_INIT;
- GITERR_CHECK_ERROR(git_sysdir_check_selector(which));
+ GIT_ERROR_CHECK_ERROR(git_sysdir_check_selector(which));
if (search_path != NULL)
expand_path = strstr(search_path, PATH_MAGIC);
git_buf_join(&merge, GIT_PATH_LIST_SEPARATOR, merge.ptr, expand_path);
git_buf_swap(&git_sysdir__dirs[which].buf, &merge);
- git_buf_free(&merge);
+ git_buf_dispose(&merge);
done:
if (git_buf_oom(&git_sysdir__dirs[which].buf))
const char *scan, *next = NULL;
const git_buf *syspath;
- GITERR_CHECK_ERROR(git_sysdir_get(&syspath, which));
+ GIT_ERROR_CHECK_ERROR(git_sysdir_get(&syspath, which));
if (!syspath || !git_buf_len(syspath))
goto done;
if (!len)
continue;
- GITERR_CHECK_ERROR(git_buf_set(path, scan, len));
+ GIT_ERROR_CHECK_ERROR(git_buf_set(path, scan, len));
if (name)
- GITERR_CHECK_ERROR(git_buf_joinpath(path, path->ptr, name));
+ GIT_ERROR_CHECK_ERROR(git_buf_joinpath(path, path->ptr, name));
if (git_path_exists(path->ptr))
return 0;
}
done:
- git_buf_free(path);
- giterr_set(GITERR_OS, "the %s file '%s' doesn't exist", label, name);
+ git_buf_dispose(path);
+ git_error_set(GIT_ERROR_OS, "the %s file '%s' doesn't exist", label, name);
return GIT_ENOTFOUND;
}
return &t->target;
}
-git_otype git_tag_target_type(const git_tag *t)
+git_object_t git_tag_target_type(const git_tag *t)
{
assert(t);
return t->type;
static int tag_error(const char *str)
{
- giterr_set(GITERR_TAG, "failed to parse tag: %s", str);
+ git_error_set(GIT_ERROR_TAG, "failed to parse tag: %s", str);
return -1;
}
return tag_error("type field not found");
buffer += 5;
- tag->type = GIT_OBJ_BAD;
+ tag->type = GIT_OBJECT_INVALID;
for (i = 1; i < ARRAY_SIZE(tag_types); ++i) {
size_t type_length = strlen(tag_types[i]);
}
}
- if (tag->type == GIT_OBJ_BAD)
+ if (tag->type == GIT_OBJECT_INVALID)
return tag_error("invalid object type");
if (buffer + 4 >= buffer_end)
text_len = search - buffer;
- GITERR_CHECK_ALLOC_ADD(&alloc_len, text_len, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, text_len, 1);
tag->tag_name = git__malloc(alloc_len);
- GITERR_CHECK_ALLOC(tag->tag_name);
+ GIT_ERROR_CHECK_ALLOC(tag->tag_name);
memcpy(tag->tag_name, buffer, text_len);
tag->tag_name[text_len] = '\0';
tag->tagger = NULL;
if (buffer < buffer_end && *buffer != '\n') {
tag->tagger = git__malloc(sizeof(git_signature));
- GITERR_CHECK_ALLOC(tag->tagger);
+ GIT_ERROR_CHECK_ALLOC(tag->tagger);
if (git_signature__parse(tag->tagger, &buffer, buffer_end, "tagger ", '\n') < 0)
return -1;
text_len = buffer_end - ++buffer;
- GITERR_CHECK_ALLOC_ADD(&alloc_len, text_len, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, text_len, 1);
tag->message = git__malloc(alloc_len);
- GITERR_CHECK_ALLOC(tag->message);
+ GIT_ERROR_CHECK_ALLOC(tag->message);
memcpy(tag->message, buffer, text_len);
tag->message[text_len] = '\0';
return 0;
}
+int git_tag__parse_raw(void *_tag, const char *data, size_t size)
+{
+ return tag_parse(_tag, data, data + size);
+}
+
int git_tag__parse(void *_tag, git_odb_object *odb_obj)
{
git_tag *tag = _tag;
if (git_repository_odb__weakptr(&odb, repo) < 0)
goto on_error;
- if (git_odb_write(oid, odb, tag.ptr, tag.size, GIT_OBJ_TAG) < 0)
+ if (git_odb_write(oid, odb, tag.ptr, tag.size, GIT_OBJECT_TAG) < 0)
goto on_error;
- git_buf_free(&tag);
+ git_buf_dispose(&tag);
return 0;
on_error:
- git_buf_free(&tag);
- giterr_set(GITERR_OBJECT, "failed to create tag annotation");
+ git_buf_dispose(&tag);
+ git_error_set(GIT_ERROR_OBJECT, "failed to create tag annotation");
return -1;
}
assert(!create_tag_annotation || (tagger && message));
if (git_object_owner(target) != repo) {
- giterr_set(GITERR_INVALID, "the given target does not belong to this repository");
+ git_error_set(GIT_ERROR_INVALID, "the given target does not belong to this repository");
return -1;
}
/** Ensure the tag name doesn't conflict with an already existing
* reference unless overwriting has explicitly been requested **/
if (error == 0 && !allow_ref_overwrite) {
- git_buf_free(&ref_name);
- giterr_set(GITERR_TAG, "tag already exists");
+ git_buf_dispose(&ref_name);
+ git_error_set(GIT_ERROR_TAG, "tag already exists");
return GIT_EEXISTS;
}
cleanup:
git_reference_free(new_ref);
- git_buf_free(&ref_name);
+ git_buf_dispose(&ref_name);
return error;
}
goto on_error;
if (tag.type != target_obj->cached.type) {
- giterr_set(GITERR_TAG, "the type for the given target is invalid");
+ git_error_set(GIT_ERROR_TAG, "the type for the given target is invalid");
goto on_error;
}
/** Ensure the tag name doesn't conflict with an already existing
* reference unless overwriting has explicitly been requested **/
if (error == 0 && !allow_ref_overwrite) {
- giterr_set(GITERR_TAG, "tag already exists");
+ git_error_set(GIT_ERROR_TAG, "tag already exists");
return GIT_EEXISTS;
}
/* write the buffer */
if ((error = git_odb_open_wstream(
- &stream, odb, strlen(buffer), GIT_OBJ_TAG)) < 0)
+ &stream, odb, strlen(buffer), GIT_OBJECT_TAG)) < 0)
return error;
if (!(error = git_odb_stream_write(stream, buffer, strlen(buffer))))
git_odb_stream_free(stream);
if (error < 0) {
- git_buf_free(&ref_name);
+ git_buf_dispose(&ref_name);
return error;
}
&new_ref, repo, ref_name.ptr, oid, allow_ref_overwrite, NULL);
git_reference_free(new_ref);
- git_buf_free(&ref_name);
+ git_buf_dispose(&ref_name);
return error;
error = retrieve_tag_reference(&tag_ref, &ref_name, repo, tag_name);
- git_buf_free(&ref_name);
+ git_buf_dispose(&ref_name);
if (error < 0)
return error;
if (!(error = git_reference_name_to_id(&oid, d->repo, ref))) {
if ((error = d->cb(ref, &oid, d->cb_data)) != 0)
- giterr_set_after_callback_function(error, "git_tag_foreach");
+ git_error_set_after_callback_function(error, "git_tag_foreach");
}
return error;
p_fnmatch(filter->pattern, tag_name + GIT_REFS_TAGS_DIR_LEN, 0) == 0)
{
char *matched = git__strdup(tag_name + GIT_REFS_TAGS_DIR_LEN);
- GITERR_CHECK_ALLOC(matched);
+ GIT_ERROR_CHECK_ALLOC(matched);
return git_vector_insert(filter->taglist, matched);
}
int git_tag_peel(git_object **tag_target, const git_tag *tag)
{
- return git_object_peel(tag_target, (const git_object *)tag, GIT_OBJ_ANY);
+ return git_object_peel(tag_target, (const git_object *)tag, GIT_OBJECT_ANY);
}
git_object object;
git_oid target;
- git_otype type;
+ git_object_t type;
char *tag_name;
git_signature *tagger;
void git_tag__free(void *tag);
int git_tag__parse(void *tag, git_odb_object *obj);
+int git_tag__parse_raw(void *tag, const char *data, size_t size);
#endif
GIT_UNUSED(level);
GIT_UNUSED(callback);
- giterr_set(GITERR_INVALID,
+ git_error_set(GIT_ERROR_INVALID,
"this version of libgit2 was not built with tracing.");
return -1;
#endif
callback(level, git_buf_cstr(&message));
- git_buf_free(&message);
+ git_buf_dispose(&message);
}
#define git_trace_level() (git_trace__data.level)
if (nl) {
return nl + 1;
} else {
- // return pointer to the NUL terminator:
+ /* return pointer to the NUL terminator: */
return str + strlen(str);
}
}
}
if (isalnum(*ptr) || *ptr == '-') {
- // legal key character
+ /* legal key character */
NEXT(S_KEY);
}
if (*ptr == ' ' || *ptr == '\t') {
- // optional whitespace before separator
+ /* optional whitespace before separator */
*ptr = 0;
NEXT(S_KEY_WS);
}
NEXT(S_SEP_WS);
}
- // illegal character
+ /* illegal character */
GOTO(S_IGNORE);
}
case S_KEY_WS: {
NEXT(S_SEP_WS);
}
- // illegal character
+ /* illegal character */
GOTO(S_IGNORE);
}
case S_SEP_WS: {
}
case S_VALUE_NL: {
if (*ptr == ' ') {
- // continuation;
+ /* continuation; */
NEXT(S_VALUE);
}
const char *name;
void *payload;
- git_ref_t ref_type;
+ git_reference_t ref_type;
union {
git_oid id;
char *symbolic;
assert(out && cfg);
tx = git__calloc(1, sizeof(git_transaction));
- GITERR_CHECK_ALLOC(tx);
+ GIT_ERROR_CHECK_ALLOC(tx);
tx->type = TRANSACTION_CONFIG;
tx->cfg = cfg;
assert(tx && refname);
node = git_pool_mallocz(&tx->pool, sizeof(transaction_node));
- GITERR_CHECK_ALLOC(node);
+ GIT_ERROR_CHECK_ALLOC(node);
node->name = git_pool_strdup(&tx->pool, refname);
- GITERR_CHECK_ALLOC(node->name);
+ GIT_ERROR_CHECK_ALLOC(node->name);
if ((error = git_refdb_lock(&node->payload, tx->db, refname)) < 0)
return error;
git_strmap_insert(tx->locks, node->name, node, &error);
- if (error < 0)
+ if (error < 0)
goto cleanup;
return 0;
static int find_locked(transaction_node **out, git_transaction *tx, const char *refname)
{
- git_strmap_iter pos;
transaction_node *node;
+ size_t pos;
pos = git_strmap_lookup_index(tx->locks, refname);
if (!git_strmap_valid_index(tx->locks, pos)) {
- giterr_set(GITERR_REFERENCE, "the specified reference is not locked");
+ git_error_set(GIT_ERROR_REFERENCE, "the specified reference is not locked");
return GIT_ENOTFOUND;
}
if (msg) {
node->message = git_pool_strdup(&tx->pool, msg);
- GITERR_CHECK_ALLOC(node->message);
+ GIT_ERROR_CHECK_ALLOC(node->message);
}
return 0;
return error;
git_oid_cpy(&node->target.id, target);
- node->ref_type = GIT_REF_OID;
+ node->ref_type = GIT_REFERENCE_DIRECT;
return 0;
}
return error;
node->target.symbolic = git_pool_strdup(&tx->pool, target);
- GITERR_CHECK_ALLOC(node->target.symbolic);
- node->ref_type = GIT_REF_SYMBOLIC;
+ GIT_ERROR_CHECK_ALLOC(node->target.symbolic);
+ node->ref_type = GIT_REFERENCE_SYMBOLIC;
return 0;
}
return error;
node->remove = true;
- node->ref_type = GIT_REF_OID; /* the id will be ignored */
+ node->ref_type = GIT_REFERENCE_DIRECT; /* the id will be ignored */
return 0;
}
size_t len, i;
reflog = git_pool_mallocz(pool, sizeof(git_reflog));
- GITERR_CHECK_ALLOC(reflog);
+ GIT_ERROR_CHECK_ALLOC(reflog);
reflog->ref_name = git_pool_strdup(pool, in->ref_name);
- GITERR_CHECK_ALLOC(reflog->ref_name);
+ GIT_ERROR_CHECK_ALLOC(reflog->ref_name);
len = in->entries.length;
reflog->entries.length = len;
reflog->entries.contents = git_pool_mallocz(pool, len * sizeof(void *));
- GITERR_CHECK_ALLOC(reflog->entries.contents);
+ GIT_ERROR_CHECK_ALLOC(reflog->entries.contents);
entries = git_pool_mallocz(pool, len * sizeof(git_reflog_entry));
- GITERR_CHECK_ALLOC(entries);
+ GIT_ERROR_CHECK_ALLOC(entries);
for (i = 0; i < len; i++) {
const git_reflog_entry *src;
git_oid_cpy(&tgt->oid_cur, &src->oid_cur);
tgt->msg = git_pool_strdup(pool, src->msg);
- GITERR_CHECK_ALLOC(tgt->msg);
+ GIT_ERROR_CHECK_ALLOC(tgt->msg);
if (git_signature__pdup(&tgt->committer, src->committer, pool) < 0)
return -1;
git_reference *ref;
int error, update_reflog;
- if (node->ref_type == GIT_REF_OID) {
+ if (node->ref_type == GIT_REFERENCE_DIRECT) {
ref = git_reference__alloc(node->name, &node->target.id, NULL);
- } else if (node->ref_type == GIT_REF_SYMBOLIC) {
+ } else if (node->ref_type == GIT_REFERENCE_SYMBOLIC) {
ref = git_reference__alloc_symbolic(node->name, node->target.symbolic);
} else {
abort();
}
- GITERR_CHECK_ALLOC(ref);
+ GIT_ERROR_CHECK_ALLOC(ref);
update_reflog = node->reflog == NULL;
if (node->remove) {
error = git_refdb_unlock(db, node->payload, 2, false, ref, NULL, NULL);
- } else if (node->ref_type == GIT_REF_OID) {
+ } else if (node->ref_type == GIT_REFERENCE_DIRECT) {
error = git_refdb_unlock(db, node->payload, true, update_reflog, ref, node->sig, node->message);
- } else if (node->ref_type == GIT_REF_SYMBOLIC) {
+ } else if (node->ref_type == GIT_REFERENCE_SYMBOLIC) {
error = git_refdb_unlock(db, node->payload, true, update_reflog, ref, node->sig, node->message);
} else {
abort();
return error;
}
- if (node->ref_type != GIT_REF_INVALID) {
+ if (node->ref_type != GIT_REFERENCE_INVALID) {
if ((error = update_target(tx->db, node)) < 0)
return error;
}
int error;
if ((error = transport_find_fn(&fn, url, ¶m)) == GIT_ENOTFOUND) {
- giterr_set(GITERR_NET, "unsupported URL protocol");
+ git_error_set(GIT_ERROR_NET, "unsupported URL protocol");
return -1;
} else if (error < 0)
return error;
if ((error = fn(&transport, owner, param)) < 0)
return error;
- GITERR_CHECK_VERSION(transport, GIT_TRANSPORT_VERSION, "git_transport");
+ GIT_ERROR_CHECK_VERSION(transport, GIT_TRANSPORT_VERSION, "git_transport");
*out = transport;
}
definition = git__calloc(1, sizeof(transport_definition));
- GITERR_CHECK_ALLOC(definition);
+ GIT_ERROR_CHECK_ALLOC(definition);
definition->prefix = git_buf_detach(&prefix);
definition->fn = cb;
return 0;
on_error:
- git_buf_free(&prefix);
+ git_buf_dispose(&prefix);
git__free(definition);
return error;
}
error = GIT_ENOTFOUND;
done:
- git_buf_free(&prefix);
+ git_buf_dispose(&prefix);
return error;
}
#include "buffer.h"
static int basic_next_token(
- git_buf *out, git_http_auth_context *ctx, git_cred *c)
+ git_buf *out,
+ git_http_auth_context *ctx,
+ const char *header_name,
+ git_cred *c)
{
git_cred_userpass_plaintext *cred;
git_buf raw = GIT_BUF_INIT;
GIT_UNUSED(ctx);
if (c->credtype != GIT_CREDTYPE_USERPASS_PLAINTEXT) {
- giterr_set(GITERR_INVALID, "invalid credential type for basic auth");
+ git_error_set(GIT_ERROR_INVALID, "invalid credential type for basic auth");
goto on_error;
}
git_buf_printf(&raw, "%s:%s", cred->username, cred->password);
if (git_buf_oom(&raw) ||
- git_buf_puts(out, "Authorization: Basic ") < 0 ||
+ git_buf_printf(out, "%s: Basic ", header_name) < 0 ||
git_buf_encode_base64(out, git_buf_cstr(&raw), raw.size) < 0 ||
git_buf_puts(out, "\r\n") < 0)
goto on_error;
if (raw.size)
git__memzero(raw.ptr, raw.size);
- git_buf_free(&raw);
+ git_buf_dispose(&raw);
return error;
}
int (*set_challenge)(git_http_auth_context *ctx, const char *challenge);
/** Gets the next authentication token from the context */
- int (*next_token)(git_buf *out, git_http_auth_context *ctx, git_cred *cred);
+ int (*next_token)(git_buf *out, git_http_auth_context *ctx, const char *header_name, git_cred *cred);
/** Frees the authentication context */
void (*free)(git_http_auth_context *ctx);
if (gss_display_status(&status_display, status_major, GSS_C_GSS_CODE,
GSS_C_NO_OID, &context, &buffer) == GSS_S_COMPLETE) {
- giterr_set(GITERR_NET, "%s: %.*s (%d.%d)",
+ git_error_set(GIT_ERROR_NET, "%s: %.*s (%d.%d)",
message, (int)buffer.length, (const char *)buffer.value,
status_major, status_minor);
gss_release_buffer(&status_minor, &buffer);
} else {
- giterr_set(GITERR_NET, "%s: unknown negotiate error (%d.%d)",
+ git_error_set(GIT_ERROR_NET, "%s: unknown negotiate error (%d.%d)",
message, status_major, status_minor);
}
}
git__free(ctx->challenge);
ctx->challenge = git__strdup(challenge);
- GITERR_CHECK_ALLOC(ctx->challenge);
+ GIT_ERROR_CHECK_ALLOC(ctx->challenge);
return 0;
}
static int negotiate_next_token(
git_buf *buf,
git_http_auth_context *c,
+ const char *header_name,
git_cred *cred)
{
http_auth_negotiate_context *ctx = (http_auth_negotiate_context *)c;
challenge_len = ctx->challenge ? strlen(ctx->challenge) : 0;
if (challenge_len < 9) {
- giterr_set(GITERR_NET, "no negotiate challenge sent from server");
+ git_error_set(GIT_ERROR_NET, "no negotiate challenge sent from server");
error = -1;
goto done;
} else if (challenge_len > 9) {
if (git_buf_decode_base64(&input_buf,
ctx->challenge + 10, challenge_len - 10) < 0) {
- giterr_set(GITERR_NET, "invalid negotiate challenge from server");
+ git_error_set(GIT_ERROR_NET, "invalid negotiate challenge from server");
error = -1;
goto done;
}
input_token.length = input_buf.size;
input_token_ptr = &input_token;
} else if (ctx->gss_context != GSS_C_NO_CONTEXT) {
- giterr_set(GITERR_NET, "could not restart authentication");
+ git_error_set(GIT_ERROR_NET, "could not restart authentication");
error = -1;
goto done;
}
goto done;
}
- git_buf_puts(buf, "Authorization: Negotiate ");
+ git_buf_printf(buf, "%s: Negotiate ", header_name);
git_buf_encode_base64(buf, output_token.value, output_token.length);
git_buf_puts(buf, "\r\n");
done:
gss_release_name(&status_minor, &server);
gss_release_buffer(&status_minor, (gss_buffer_t) &output_token);
- git_buf_free(&input_buf);
+ git_buf_dispose(&input_buf);
return error;
}
ctx->gss_context = GSS_C_NO_CONTEXT;
}
- git_buf_free(&ctx->target);
+ git_buf_dispose(&ctx->target);
git__free(ctx->challenge);
gss_release_oid_set(&status_minor, &mechanism_list);
if (!ctx->oid) {
- giterr_set(GITERR_NET, "negotiate authentication is not supported");
+ git_error_set(GIT_ERROR_NET, "negotiate authentication is not supported");
return -1;
}
*out = NULL;
ctx = git__calloc(1, sizeof(http_auth_negotiate_context));
- GITERR_CHECK_ALLOC(ctx);
+ GIT_ERROR_CHECK_ALLOC(ctx);
if (negotiate_init_context(ctx, connection_data) < 0) {
git__free(ctx);
assert(cred && username && password);
c = git__malloc(sizeof(git_cred_userpass_plaintext));
- GITERR_CHECK_ALLOC(c);
+ GIT_ERROR_CHECK_ALLOC(c);
c->parent.credtype = GIT_CREDTYPE_USERPASS_PLAINTEXT;
c->parent.free = plaintext_free;
GIT_UNUSED(privatekey);
GIT_UNUSED(passphrase);
- giterr_set(GITERR_INVALID,
+ git_error_set(GIT_ERROR_INVALID,
"this version of libgit2 was not built with ssh memory credentials.");
return -1;
#endif
assert(username && cred && privatekey);
c = git__calloc(1, sizeof(git_cred_ssh_key));
- GITERR_CHECK_ALLOC(c);
+ GIT_ERROR_CHECK_ALLOC(c);
c->parent.credtype = credtype;
c->parent.free = ssh_key_free;
c->username = git__strdup(username);
- GITERR_CHECK_ALLOC(c->username);
+ GIT_ERROR_CHECK_ALLOC(c->username);
c->privatekey = git__strdup(privatekey);
- GITERR_CHECK_ALLOC(c->privatekey);
+ GIT_ERROR_CHECK_ALLOC(c->privatekey);
if (publickey) {
c->publickey = git__strdup(publickey);
- GITERR_CHECK_ALLOC(c->publickey);
+ GIT_ERROR_CHECK_ALLOC(c->publickey);
}
if (passphrase) {
c->passphrase = git__strdup(passphrase);
- GITERR_CHECK_ALLOC(c->passphrase);
+ GIT_ERROR_CHECK_ALLOC(c->passphrase);
}
*cred = &c->parent;
assert(out && username && prompt_callback);
c = git__calloc(1, sizeof(git_cred_ssh_interactive));
- GITERR_CHECK_ALLOC(c);
+ GIT_ERROR_CHECK_ALLOC(c);
c->parent.credtype = GIT_CREDTYPE_SSH_INTERACTIVE;
c->parent.free = ssh_interactive_free;
c->username = git__strdup(username);
- GITERR_CHECK_ALLOC(c->username);
+ GIT_ERROR_CHECK_ALLOC(c->username);
c->prompt_callback = prompt_callback;
c->payload = payload;
assert(username && cred);
c = git__calloc(1, sizeof(git_cred_ssh_key));
- GITERR_CHECK_ALLOC(c);
+ GIT_ERROR_CHECK_ALLOC(c);
c->parent.credtype = GIT_CREDTYPE_SSH_KEY;
c->parent.free = ssh_key_free;
c->username = git__strdup(username);
- GITERR_CHECK_ALLOC(c->username);
+ GIT_ERROR_CHECK_ALLOC(c->username);
c->privatekey = NULL;
assert(username && cred);
c = git__calloc(1, sizeof(git_cred_ssh_custom));
- GITERR_CHECK_ALLOC(c);
+ GIT_ERROR_CHECK_ALLOC(c);
c->parent.credtype = GIT_CREDTYPE_SSH_CUSTOM;
c->parent.free = ssh_custom_free;
c->username = git__strdup(username);
- GITERR_CHECK_ALLOC(c->username);
+ GIT_ERROR_CHECK_ALLOC(c->username);
if (publickey_len > 0) {
c->publickey = git__malloc(publickey_len);
- GITERR_CHECK_ALLOC(c->publickey);
+ GIT_ERROR_CHECK_ALLOC(c->publickey);
memcpy(c->publickey, publickey, publickey_len);
}
assert(cred);
c = git__calloc(1, sizeof(git_cred_default));
- GITERR_CHECK_ALLOC(c);
+ GIT_ERROR_CHECK_ALLOC(c);
c->credtype = GIT_CREDTYPE_DEFAULT;
c->free = default_free;
len = strlen(username);
- GITERR_CHECK_ALLOC_ADD(&allocsize, sizeof(git_cred_username), len);
- GITERR_CHECK_ALLOC_ADD(&allocsize, allocsize, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&allocsize, sizeof(git_cred_username), len);
+ GIT_ERROR_CHECK_ALLOC_ADD(&allocsize, allocsize, 1);
c = git__malloc(allocsize);
- GITERR_CHECK_ALLOC(c);
+ GIT_ERROR_CHECK_ALLOC(c);
c->parent.credtype = GIT_CREDTYPE_USERNAME;
c->parent.free = username_free;
delim = strchr(url, '/');
if (delim == NULL) {
- giterr_set(GITERR_NET, "malformed URL");
+ git_error_set(GIT_ERROR_NET, "malformed URL");
return -1;
}
static int send_command(git_proto_stream *s)
{
- int error;
git_buf request = GIT_BUF_INIT;
+ int error;
+
+ if ((error = gen_proto(&request, s->cmd, s->url)) < 0)
+ goto cleanup;
- error = gen_proto(&request, s->cmd, s->url);
- if (error < 0)
+ if ((error = git_stream__write_full(s->io, request.ptr, request.size, 0)) < 0)
goto cleanup;
- error = git_stream_write(s->io, request.ptr, request.size, 0);
- if (error >= 0)
- s->sent_command = 1;
+ s->sent_command = 1;
cleanup:
- git_buf_free(&request);
+ git_buf_dispose(&request);
return error;
}
const char *buffer,
size_t len)
{
- int error;
git_proto_stream *s = (git_proto_stream *)stream;
+ int error;
if (!s->sent_command && (error = send_command(s)) < 0)
return error;
- return git_stream_write(s->io, buffer, len, 0);
+ return git_stream__write_full(s->io, buffer, len, 0);
}
static void git_proto_stream_free(git_smart_subtransport_stream *stream)
return -1;
s = git__calloc(1, sizeof(git_proto_stream));
- GITERR_CHECK_ALLOC(s);
+ GIT_ERROR_CHECK_ALLOC(s);
s->parent.subtransport = &t->parent;
s->parent.read = git_proto_stream_read;
if ((git_socket_stream_new(&s->io, host, port)) < 0)
return -1;
- GITERR_CHECK_VERSION(s->io, GIT_STREAM_VERSION, "git_stream");
+ GIT_ERROR_CHECK_VERSION(s->io, GIT_STREAM_VERSION, "git_stream");
*stream = &s->parent;
return 0;
return 0;
}
- giterr_set(GITERR_NET, "must call UPLOADPACK_LS before UPLOADPACK");
+ git_error_set(GIT_ERROR_NET, "must call UPLOADPACK_LS before UPLOADPACK");
return -1;
}
return 0;
}
- giterr_set(GITERR_NET, "must call RECEIVEPACK_LS before RECEIVEPACK");
+ git_error_set(GIT_ERROR_NET, "must call RECEIVEPACK_LS before RECEIVEPACK");
return -1;
}
return -1;
t = git__calloc(1, sizeof(git_subtransport));
- GITERR_CHECK_ALLOC(t);
+ GIT_ERROR_CHECK_ALLOC(t);
t->owner = owner;
t->parent.action = _git_action;
#include "auth_negotiate.h"
#include "streams/tls.h"
#include "streams/socket.h"
-#include "streams/curl.h"
git_http_auth_scheme auth_schemes[] = {
{ GIT_AUTHTYPE_NEGOTIATE, "Negotiate", GIT_CREDTYPE_DEFAULT, git_http_auth_negotiate },
static const char *get_verb = "GET";
static const char *post_verb = "POST";
+#define AUTH_HEADER_SERVER "Authorization"
+#define AUTH_HEADER_PROXY "Proxy-Authorization"
+
+#define SERVER_TYPE_REMOTE "remote"
+#define SERVER_TYPE_PROXY "proxy"
+
#define OWNING_SUBTRANSPORT(s) ((http_subtransport *)(s)->parent.subtransport)
#define PARSE_ERROR_GENERIC -1
unsigned chunk_buffer_len;
unsigned sent_request : 1,
received_response : 1,
- chunked : 1,
- redirect_count : 3;
+ chunked : 1;
} http_stream;
+typedef struct {
+ gitno_connection_data url;
+ git_stream *stream;
+
+ git_cred *cred;
+ git_cred *url_cred;
+
+ git_vector auth_challenges;
+ git_vector auth_contexts;
+} http_server;
+
typedef struct {
git_smart_subtransport parent;
transport_smart *owner;
- git_stream *io;
- gitno_connection_data connection_data;
+ git_stream *gitserver_stream;
bool connected;
+ http_server server;
+
+ http_server proxy;
+ char *proxy_url;
+ git_proxy_options proxy_opts;
+
/* Parser structures */
http_parser parser;
http_parser_settings settings;
git_buf parse_header_value;
char parse_buffer_data[NETIO_BUFSIZE];
char *content_type;
+ char *content_length;
char *location;
- git_vector www_authenticate;
enum last_cb last_cb;
int parse_error;
int error;
- unsigned parse_finished : 1;
-
- /* Authentication */
- git_cred *cred;
- git_cred *url_cred;
- git_vector auth_contexts;
+ unsigned parse_finished : 1,
+ replay_count : 3;
} http_subtransport;
typedef struct {
static int auth_context_match(
git_http_auth_context **out,
- http_subtransport *t,
+ http_server *server,
bool (*scheme_match)(git_http_auth_scheme *scheme, void *data),
void *data)
{
return 0;
/* See if authentication has already started for this scheme */
- git_vector_foreach(&t->auth_contexts, i, c) {
+ git_vector_foreach(&server->auth_contexts, i, c) {
if (c->type == scheme->type) {
context = c;
break;
}
if (!context) {
- if (scheme->init_context(&context, &t->connection_data) < 0)
+ if (scheme->init_context(&context, &server->url) < 0)
return -1;
else if (!context)
return 0;
- else if (git_vector_insert(&t->auth_contexts, context) < 0)
+ else if (git_vector_insert(&server->auth_contexts, context) < 0)
return -1;
}
return 0;
}
-static int apply_credentials(git_buf *buf, http_subtransport *t)
+static int apply_credentials(
+ git_buf *buf,
+ http_server *server,
+ const char *header_name)
{
- git_cred *cred = t->cred;
+ git_cred *cred = server->cred;
git_http_auth_context *context;
/* Apply the credentials given to us in the URL */
- if (!cred && t->connection_data.user && t->connection_data.pass) {
- if (!t->url_cred &&
- git_cred_userpass_plaintext_new(&t->url_cred,
- t->connection_data.user, t->connection_data.pass) < 0)
+ if (!cred && server->url.user && server->url.pass) {
+ if (!server->url_cred &&
+ git_cred_userpass_plaintext_new(&server->url_cred,
+ server->url.user, server->url.pass) < 0)
return -1;
- cred = t->url_cred;
+ cred = server->url_cred;
}
if (!cred)
return 0;
/* Get or create a context for the best scheme for this cred type */
- if (auth_context_match(&context, t, credtype_match, &cred->credtype) < 0)
+ if (auth_context_match(&context, server,
+ credtype_match, &cred->credtype) < 0)
return -1;
if (!context)
return 0;
- return context->next_token(buf, context, cred);
+ return context->next_token(buf, context, header_name, cred);
}
static int gen_request(
size_t content_length)
{
http_subtransport *t = OWNING_SUBTRANSPORT(s);
- const char *path = t->connection_data.path ? t->connection_data.path : "/";
+ const char *path = t->server.url.path ? t->server.url.path : "/";
size_t i;
- git_buf_printf(buf, "%s %s%s HTTP/1.1\r\n", s->verb, path, s->service_url);
+ if (t->proxy_opts.type == GIT_PROXY_SPECIFIED)
+ git_buf_printf(buf, "%s %s://%s:%s%s%s HTTP/1.1\r\n",
+ s->verb,
+ t->server.url.use_ssl ? "https" : "http",
+ t->server.url.host,
+ t->server.url.port,
+ path, s->service_url);
+ else
+ git_buf_printf(buf, "%s %s%s HTTP/1.1\r\n",
+ s->verb, path, s->service_url);
git_buf_puts(buf, "User-Agent: ");
git_http__user_agent(buf);
git_buf_puts(buf, "\r\n");
- git_buf_printf(buf, "Host: %s\r\n", t->connection_data.host);
+ git_buf_printf(buf, "Host: %s", t->server.url.host);
+ if (strcmp(t->server.url.port, gitno__default_port(&t->server.url)) != 0) {
+ git_buf_printf(buf, ":%s", t->server.url.port);
+ }
+ git_buf_puts(buf, "\r\n");
if (s->chunked || content_length > 0) {
git_buf_printf(buf, "Accept: application/x-git-%s-result\r\n", s->service);
git_buf_printf(buf, "%s\r\n", t->owner->custom_headers.strings[i]);
}
- /* Apply credentials to the request */
- if (apply_credentials(buf, t) < 0)
+ /* Apply proxy and server credentials to the request */
+ if (t->proxy_opts.type != GIT_PROXY_NONE &&
+ apply_credentials(buf, &t->proxy, AUTH_HEADER_PROXY) < 0)
+ return -1;
+
+ if (apply_credentials(buf, &t->server, AUTH_HEADER_SERVER) < 0)
return -1;
git_buf_puts(buf, "\r\n");
}
static int parse_authenticate_response(
- git_vector *www_authenticate,
- http_subtransport *t,
+ http_server *server,
int *allowed_types)
{
git_http_auth_context *context;
char *challenge;
size_t i;
- git_vector_foreach(www_authenticate, i, challenge) {
- if (auth_context_match(&context, t, challenge_match, challenge) < 0)
+ git_vector_foreach(&server->auth_challenges, i, challenge) {
+ if (auth_context_match(&context, server,
+ challenge_match, challenge) < 0)
return -1;
else if (!context)
continue;
git_buf *value = &t->parse_header_value;
if (!strcasecmp("Content-Type", git_buf_cstr(name))) {
- if (!t->content_type) {
- t->content_type = git__strdup(git_buf_cstr(value));
- GITERR_CHECK_ALLOC(t->content_type);
+ if (t->content_type) {
+ git_error_set(GIT_ERROR_NET, "multiple Content-Type headers");
+ return -1;
}
+
+ t->content_type = git__strdup(git_buf_cstr(value));
+ GIT_ERROR_CHECK_ALLOC(t->content_type);
+ }
+ else if (!strcasecmp("Content-Length", git_buf_cstr(name))) {
+ if (t->content_length) {
+ git_error_set(GIT_ERROR_NET, "multiple Content-Length headers");
+ return -1;
+ }
+
+ t->content_length = git__strdup(git_buf_cstr(value));
+ GIT_ERROR_CHECK_ALLOC(t->content_length);
+ }
+ else if (!strcasecmp("Proxy-Authenticate", git_buf_cstr(name))) {
+ char *dup = git__strdup(git_buf_cstr(value));
+ GIT_ERROR_CHECK_ALLOC(dup);
+
+ if (git_vector_insert(&t->proxy.auth_challenges, dup) < 0)
+ return -1;
}
else if (!strcasecmp("WWW-Authenticate", git_buf_cstr(name))) {
char *dup = git__strdup(git_buf_cstr(value));
- GITERR_CHECK_ALLOC(dup);
+ GIT_ERROR_CHECK_ALLOC(dup);
- git_vector_insert(&t->www_authenticate, dup);
+ if (git_vector_insert(&t->server.auth_challenges, dup) < 0)
+ return -1;
}
else if (!strcasecmp("Location", git_buf_cstr(name))) {
- if (!t->location) {
- t->location = git__strdup(git_buf_cstr(value));
- GITERR_CHECK_ALLOC(t->location);
+ if (t->location) {
+ git_error_set(GIT_ERROR_NET, "multiple Location headers");
+ return -1;
}
+
+ t->location = git__strdup(git_buf_cstr(value));
+ GIT_ERROR_CHECK_ALLOC(t->location);
}
return 0;
return 0;
}
+GIT_INLINE(void) free_cred(git_cred **cred)
+{
+ if (*cred) {
+ git_cred_free(*cred);
+ (*cred) = NULL;
+ }
+}
+
+static int on_auth_required(
+ git_cred **creds,
+ http_parser *parser,
+ const char *url,
+ const char *type,
+ git_cred_acquire_cb callback,
+ void *callback_payload,
+ const char *username,
+ int allowed_types)
+{
+ parser_context *ctx = (parser_context *) parser->data;
+ http_subtransport *t = ctx->t;
+ int ret;
+
+ if (!allowed_types) {
+ git_error_set(GIT_ERROR_NET, "%s requested authentication but did not negotiate mechanisms", type);
+ t->parse_error = PARSE_ERROR_GENERIC;
+ return t->parse_error;
+ }
+
+ if (callback) {
+ free_cred(creds);
+ ret = callback(creds, url, username, allowed_types, callback_payload);
+
+ if (ret == GIT_PASSTHROUGH) {
+ /* treat GIT_PASSTHROUGH as if callback isn't set */
+ } else if (ret < 0) {
+ t->error = ret;
+ t->parse_error = PARSE_ERROR_EXT;
+ return t->parse_error;
+ } else {
+ assert(*creds);
+
+ if (!((*creds)->credtype & allowed_types)) {
+ git_error_set(GIT_ERROR_NET, "%s credential provider returned an invalid cred type", type);
+ t->parse_error = PARSE_ERROR_GENERIC;
+ return t->parse_error;
+ }
+
+ /* Successfully acquired a credential. */
+ t->parse_error = PARSE_ERROR_REPLAY;
+ return 0;
+ }
+ }
+
+ git_error_set(GIT_ERROR_NET, "%s authentication required but no callback set",
+ type);
+ t->parse_error = PARSE_ERROR_GENERIC;
+ return t->parse_error;
+}
+
static int on_headers_complete(http_parser *parser)
{
parser_context *ctx = (parser_context *) parser->data;
http_subtransport *t = ctx->t;
http_stream *s = ctx->s;
git_buf buf = GIT_BUF_INIT;
- int error = 0, no_callback = 0, allowed_auth_types = 0;
+ int proxy_auth_types = 0, server_auth_types = 0;
+
+ /* Enforce a reasonable cap on the number of replays */
+ if (t->replay_count++ >= GIT_HTTP_REPLAY_MAX) {
+ git_error_set(GIT_ERROR_NET, "too many redirects or authentication replays");
+ return t->parse_error = PARSE_ERROR_GENERIC;
+ }
/* Both parse_header_name and parse_header_value are populated
* and ready for consumption. */
if (on_header_ready(t) < 0)
return t->parse_error = PARSE_ERROR_GENERIC;
- /* Capture authentication headers which may be a 401 (authentication
- * is not complete) or a 200 (simply informing us that auth *is*
- * complete.)
+ /*
+ * Capture authentication headers for the proxy or final endpoint,
+ * these may be 407/401 (authentication is not complete) or a 200
+ * (informing us that auth has completed).
*/
- if (parse_authenticate_response(&t->www_authenticate, t,
- &allowed_auth_types) < 0)
+ if (parse_authenticate_response(&t->proxy, &proxy_auth_types) < 0 ||
+ parse_authenticate_response(&t->server, &server_auth_types) < 0)
return t->parse_error = PARSE_ERROR_GENERIC;
- /* Check for an authentication failure. */
- if (parser->status_code == 401 && get_verb == s->verb) {
- if (!t->owner->cred_acquire_cb) {
- no_callback = 1;
- } else {
- if (allowed_auth_types) {
- if (t->cred) {
- t->cred->free(t->cred);
- t->cred = NULL;
- }
-
- error = t->owner->cred_acquire_cb(&t->cred,
- t->owner->url,
- t->connection_data.user,
- allowed_auth_types,
- t->owner->cred_acquire_payload);
-
- if (error == GIT_PASSTHROUGH) {
- no_callback = 1;
- } else if (error < 0) {
- t->error = error;
- return t->parse_error = PARSE_ERROR_EXT;
- } else {
- assert(t->cred);
-
- if (!(t->cred->credtype & allowed_auth_types)) {
- giterr_set(GITERR_NET, "credentials callback returned an invalid cred type");
- return t->parse_error = PARSE_ERROR_GENERIC;
- }
-
- /* Successfully acquired a credential. */
- t->parse_error = PARSE_ERROR_REPLAY;
- return 0;
- }
- }
- }
+ /* Check for a proxy authentication failure. */
+ if (parser->status_code == 407 && get_verb == s->verb)
+ return on_auth_required(&t->proxy.cred,
+ parser,
+ t->proxy_opts.url,
+ SERVER_TYPE_PROXY,
+ t->proxy_opts.credentials,
+ t->proxy_opts.payload,
+ t->proxy.url.user,
+ proxy_auth_types);
- if (no_callback) {
- giterr_set(GITERR_NET, "authentication required but no callback set");
- return t->parse_error = PARSE_ERROR_GENERIC;
- }
- }
+ /* Check for an authentication failure. */
+ if (parser->status_code == 401 && get_verb == s->verb)
+ return on_auth_required(&t->server.cred,
+ parser,
+ t->owner->url,
+ SERVER_TYPE_REMOTE,
+ t->owner->cred_acquire_cb,
+ t->owner->cred_acquire_payload,
+ t->server.url.user,
+ server_auth_types);
/* Check for a redirect.
* Right now we only permit a redirect to the same hostname. */
if ((parser->status_code == 301 ||
parser->status_code == 302 ||
(parser->status_code == 303 && get_verb == s->verb) ||
- parser->status_code == 307) &&
+ parser->status_code == 307 ||
+ parser->status_code == 308) &&
t->location) {
- if (s->redirect_count >= 7) {
- giterr_set(GITERR_NET, "too many redirects");
- return t->parse_error = PARSE_ERROR_GENERIC;
- }
-
- if (gitno_connection_data_from_url(&t->connection_data, t->location, s->service_url) < 0)
+ if (gitno_connection_data_from_url(&t->server.url, t->location, s->service_url) < 0)
return t->parse_error = PARSE_ERROR_GENERIC;
/* Set the redirect URL on the stream. This is a transfer of
t->location = NULL;
t->connected = 0;
- s->redirect_count++;
-
t->parse_error = PARSE_ERROR_REPLAY;
return 0;
}
/* Check for a 200 HTTP status code. */
if (parser->status_code != 200) {
- giterr_set(GITERR_NET,
+ git_error_set(GIT_ERROR_NET,
"unexpected HTTP status code: %d",
parser->status_code);
return t->parse_error = PARSE_ERROR_GENERIC;
/* The response must contain a Content-Type header. */
if (!t->content_type) {
- giterr_set(GITERR_NET, "no Content-Type header in response");
+ git_error_set(GIT_ERROR_NET, "no Content-Type header in response");
return t->parse_error = PARSE_ERROR_GENERIC;
}
return t->parse_error = PARSE_ERROR_GENERIC;
if (strcmp(t->content_type, git_buf_cstr(&buf))) {
- git_buf_free(&buf);
- giterr_set(GITERR_NET,
+ git_buf_dispose(&buf);
+ git_error_set(GIT_ERROR_NET,
"invalid Content-Type: %s",
t->content_type);
return t->parse_error = PARSE_ERROR_GENERIC;
}
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return 0;
}
if (t->parse_error == PARSE_ERROR_REPLAY)
return 0;
- if (ctx->buf_size < len) {
- giterr_set(GITERR_NET, "can't fit data in the buffer");
- return t->parse_error = PARSE_ERROR_GENERIC;
+ /* If there's no buffer set, we're explicitly ignoring the body. */
+ if (ctx->buffer) {
+ if (ctx->buf_size < len) {
+ git_error_set(GIT_ERROR_NET, "can't fit data in the buffer");
+ return t->parse_error = PARSE_ERROR_GENERIC;
+ }
+
+ memcpy(ctx->buffer, str, len);
+ ctx->buffer += len;
+ ctx->buf_size -= len;
}
- memcpy(ctx->buffer, str, len);
*(ctx->bytes_read) += len;
- ctx->buffer += len;
- ctx->buf_size -= len;
return 0;
}
static void clear_parser_state(http_subtransport *t)
{
http_parser_init(&t->parser, HTTP_RESPONSE);
- gitno_buffer_setup_fromstream(t->io,
+ gitno_buffer_setup_fromstream(t->server.stream,
&t->parse_buffer,
t->parse_buffer_data,
sizeof(t->parse_buffer_data));
t->parse_error = 0;
t->parse_finished = 0;
- git_buf_free(&t->parse_header_name);
+ git_buf_dispose(&t->parse_header_name);
git_buf_init(&t->parse_header_name, 0);
- git_buf_free(&t->parse_header_value);
+ git_buf_dispose(&t->parse_header_value);
git_buf_init(&t->parse_header_value, 0);
git__free(t->content_type);
t->content_type = NULL;
+ git__free(t->content_length);
+ t->content_length = NULL;
+
git__free(t->location);
t->location = NULL;
- git_vector_free_deep(&t->www_authenticate);
+ git_vector_free_deep(&t->proxy.auth_challenges);
+ git_vector_free_deep(&t->server.auth_challenges);
}
static int write_chunk(git_stream *io, const char *buffer, size_t len)
if (git_buf_oom(&buf))
return -1;
- if (git_stream_write(io, buf.ptr, buf.size, 0) < 0) {
- git_buf_free(&buf);
+ if (git_stream__write_full(io, buf.ptr, buf.size, 0) < 0) {
+ git_buf_dispose(&buf);
return -1;
}
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
/* Chunk body */
- if (len > 0 && git_stream_write(io, buffer, len, 0) < 0)
+ if (len > 0 && git_stream__write_full(io, buffer, len, 0) < 0)
return -1;
/* Chunk footer */
- if (git_stream_write(io, "\r\n", 2, 0) < 0)
+ if (git_stream__write_full(io, "\r\n", 2, 0) < 0)
return -1;
return 0;
}
-static int apply_proxy_config(http_subtransport *t)
+static int load_proxy_config(http_subtransport *t)
{
int error;
- git_proxy_t proxy_type;
- if (!git_stream_supports_proxy(t->io))
+ switch (t->owner->proxy.type) {
+ case GIT_PROXY_NONE:
return 0;
- proxy_type = t->owner->proxy.type;
+ case GIT_PROXY_AUTO:
+ git__free(t->proxy_url);
+ t->proxy_url = NULL;
- if (proxy_type == GIT_PROXY_NONE)
- return 0;
-
- if (proxy_type == GIT_PROXY_AUTO) {
- char *url;
- git_proxy_options opts = GIT_PROXY_OPTIONS_INIT;
+ git_proxy_init_options(&t->proxy_opts, GIT_PROXY_OPTIONS_VERSION);
- if ((error = git_remote__get_http_proxy(t->owner->owner, !!t->connection_data.use_ssl, &url)) < 0)
+ if ((error = git_remote__get_http_proxy(t->owner->owner,
+ !!t->server.url.use_ssl, &t->proxy_url)) < 0)
return error;
- opts.credentials = t->owner->proxy.credentials;
- opts.certificate_check = t->owner->proxy.certificate_check;
- opts.payload = t->owner->proxy.payload;
- opts.type = GIT_PROXY_SPECIFIED;
- opts.url = url;
- error = git_stream_set_proxy(t->io, &opts);
- git__free(url);
+ if (!t->proxy_url)
+ return 0;
+
+ t->proxy_opts.type = GIT_PROXY_SPECIFIED;
+ t->proxy_opts.url = t->proxy_url;
+ t->proxy_opts.credentials = t->owner->proxy.credentials;
+ t->proxy_opts.certificate_check = t->owner->proxy.certificate_check;
+ t->proxy_opts.payload = t->owner->proxy.payload;
+ break;
+
+ case GIT_PROXY_SPECIFIED:
+ memcpy(&t->proxy_opts, &t->owner->proxy, sizeof(git_proxy_options));
+ break;
+
+ default:
+ assert(0);
+ return -1;
+ }
+
+ if ((error = gitno_connection_data_from_url(&t->proxy.url, t->proxy_opts.url, NULL)) < 0)
+ return error;
+
+ if (t->proxy.url.use_ssl) {
+ git_error_set(GIT_ERROR_NET, "SSL connections to proxy are not supported");
+ return -1;
+ }
+
+ return error;
+}
+
+static int check_certificate(
+ git_stream *stream,
+ gitno_connection_data *url,
+ int is_valid,
+ git_transport_certificate_check_cb cert_cb,
+ void *cert_cb_payload)
+{
+ git_cert *cert;
+ git_error_state last_error = {0};
+ int error;
+
+ if ((error = git_stream_certificate(&cert, stream)) < 0)
+ return error;
+
+ git_error_state_capture(&last_error, GIT_ECERTIFICATE);
+
+ error = cert_cb(cert, is_valid, url->host, cert_cb_payload);
+
+ if (error == GIT_PASSTHROUGH && !is_valid)
+ return git_error_state_restore(&last_error);
+ else if (error == GIT_PASSTHROUGH)
+ error = 0;
+ else if (error && !git_error_last())
+ git_error_set(GIT_ERROR_NET, "user rejected certificate for %s", url->host);
+
+ git_error_state_free(&last_error);
+ return error;
+}
+
+static int stream_connect(
+ git_stream *stream,
+ gitno_connection_data *url,
+ git_transport_certificate_check_cb cert_cb,
+ void *cb_payload)
+{
+ int error;
+
+ GIT_ERROR_CHECK_VERSION(stream, GIT_STREAM_VERSION, "git_stream");
+
+ error = git_stream_connect(stream);
+ if (error && error != GIT_ECERTIFICATE)
return error;
+
+ if (git_stream_is_encrypted(stream) && cert_cb != NULL)
+ error = check_certificate(stream, url, !error, cert_cb, cb_payload);
+
+ return error;
+}
+
+static int gen_connect_req(git_buf *buf, http_subtransport *t)
+{
+ git_buf_printf(buf, "CONNECT %s:%s HTTP/1.1\r\n",
+ t->server.url.host, t->server.url.port);
+
+ git_buf_puts(buf, "User-Agent: ");
+ git_http__user_agent(buf);
+ git_buf_puts(buf, "\r\n");
+
+ git_buf_printf(buf, "Host: %s\r\n", t->proxy.url.host);
+
+ if (apply_credentials(buf, &t->proxy, AUTH_HEADER_PROXY) < 0)
+ return -1;
+
+ git_buf_puts(buf, "\r\n");
+
+ return git_buf_oom(buf) ? -1 : 0;
+}
+
+static int proxy_headers_complete(http_parser *parser)
+{
+ parser_context *ctx = (parser_context *) parser->data;
+ http_subtransport *t = ctx->t;
+ int proxy_auth_types = 0;
+
+ /* Enforce a reasonable cap on the number of replays */
+ if (t->replay_count++ >= GIT_HTTP_REPLAY_MAX) {
+ git_error_set(GIT_ERROR_NET, "too many redirects or authentication replays");
+ return t->parse_error = PARSE_ERROR_GENERIC;
+ }
+
+ /* Both parse_header_name and parse_header_value are populated
+ * and ready for consumption. */
+ if (VALUE == t->last_cb)
+ if (on_header_ready(t) < 0)
+ return t->parse_error = PARSE_ERROR_GENERIC;
+
+ /*
+ * Capture authentication headers for the proxy or final endpoint,
+ * these may be 407/401 (authentication is not complete) or a 200
+ * (informing us that auth has completed).
+ */
+ if (parse_authenticate_response(&t->proxy, &proxy_auth_types) < 0)
+ return t->parse_error = PARSE_ERROR_GENERIC;
+
+ /* Check for a proxy authentication failure. */
+ if (parser->status_code == 407)
+ return on_auth_required(&t->proxy.cred,
+ parser,
+ t->proxy_opts.url,
+ SERVER_TYPE_PROXY,
+ t->proxy_opts.credentials,
+ t->proxy_opts.payload,
+ t->proxy.url.user,
+ proxy_auth_types);
+
+ if (parser->status_code != 200) {
+ git_error_set(GIT_ERROR_NET, "unexpected status code from proxy: %d",
+ parser->status_code);
+ return t->parse_error = PARSE_ERROR_GENERIC;
+ }
+
+ if (!t->content_length || strcmp(t->content_length, "0") == 0)
+ t->parse_finished = 1;
+
+ return 0;
+}
+
+static int proxy_connect(
+ git_stream **out, git_stream *proxy_stream, http_subtransport *t)
+{
+ git_buf request = GIT_BUF_INIT;
+ static http_parser_settings proxy_parser_settings = {0};
+ size_t bytes_read = 0, bytes_parsed;
+ parser_context ctx;
+ int error;
+
+ /* Use the parser settings only to parser headers. */
+ proxy_parser_settings.on_header_field = on_header_field;
+ proxy_parser_settings.on_header_value = on_header_value;
+ proxy_parser_settings.on_headers_complete = proxy_headers_complete;
+ proxy_parser_settings.on_message_complete = on_message_complete;
+
+replay:
+ clear_parser_state(t);
+
+ gitno_buffer_setup_fromstream(proxy_stream,
+ &t->parse_buffer,
+ t->parse_buffer_data,
+ sizeof(t->parse_buffer_data));
+
+ if ((error = gen_connect_req(&request, t)) < 0)
+ goto done;
+
+ if ((error = git_stream__write_full(proxy_stream, request.ptr,
+ request.size, 0)) < 0)
+ goto done;
+
+ git_buf_dispose(&request);
+
+ while (!bytes_read && !t->parse_finished) {
+ t->parse_buffer.offset = 0;
+
+ if ((error = gitno_recv(&t->parse_buffer)) < 0)
+ goto done;
+
+ /*
+ * This call to http_parser_execute will invoke the on_*
+ * callbacks. Since we don't care about the body of the response,
+ * we can set our buffer to NULL.
+ */
+ ctx.t = t;
+ ctx.s = NULL;
+ ctx.buffer = NULL;
+ ctx.buf_size = 0;
+ ctx.bytes_read = &bytes_read;
+
+ /* Set the context, call the parser, then unset the context. */
+ t->parser.data = &ctx;
+
+ bytes_parsed = http_parser_execute(&t->parser,
+ &proxy_parser_settings, t->parse_buffer.data, t->parse_buffer.offset);
+
+ t->parser.data = NULL;
+
+ /* Ensure that we didn't get a redirect; unsupported. */
+ if (t->location) {
+ git_error_set(GIT_ERROR_NET, "proxy server sent unsupported redirect during CONNECT");
+ error = -1;
+ goto done;
+ }
+
+ /* Replay the request with authentication headers. */
+ if (PARSE_ERROR_REPLAY == t->parse_error)
+ goto replay;
+
+ if (t->parse_error < 0) {
+ error = t->parse_error == PARSE_ERROR_EXT ? PARSE_ERROR_EXT : -1;
+ goto done;
+ }
+
+ if (bytes_parsed != t->parse_buffer.offset) {
+ git_error_set(GIT_ERROR_NET,
+ "HTTP parser error: %s",
+ http_errno_description((enum http_errno)t->parser.http_errno));
+ error = -1;
+ goto done;
+ }
}
- return git_stream_set_proxy(t->io, &t->owner->proxy);
+ if ((error = git_tls_stream_wrap(out, proxy_stream, t->server.url.host)) == 0)
+ error = stream_connect(*out, &t->server.url,
+ t->owner->certificate_check_cb,
+ t->owner->message_cb_payload);
+
+ /*
+ * Since we've connected via a HTTPS proxy tunnel, we don't behave
+ * as if we have an HTTP proxy.
+ */
+ t->proxy_opts.type = GIT_PROXY_NONE;
+ t->replay_count = 0;
+
+done:
+ return error;
}
static int http_connect(http_subtransport *t)
{
+ gitno_connection_data *url;
+ git_stream *proxy_stream = NULL, *stream = NULL;
+ git_transport_certificate_check_cb cert_cb;
+ void *cb_payload;
int error;
if (t->connected &&
t->parse_finished)
return 0;
- if (t->io) {
- git_stream_close(t->io);
- git_stream_free(t->io);
- t->io = NULL;
- t->connected = 0;
+ if ((error = load_proxy_config(t)) < 0)
+ return error;
+
+ if (t->server.stream) {
+ git_stream_close(t->server.stream);
+ git_stream_free(t->server.stream);
+ t->server.stream = NULL;
}
- if (t->connection_data.use_ssl) {
- error = git_tls_stream_new(&t->io, t->connection_data.host, t->connection_data.port);
- } else {
-#ifdef GIT_CURL
- error = git_curl_stream_new(&t->io, t->connection_data.host, t->connection_data.port);
-#else
- error = git_socket_stream_new(&t->io, t->connection_data.host, t->connection_data.port);
-#endif
+ if (t->proxy.stream) {
+ git_stream_close(t->proxy.stream);
+ git_stream_free(t->proxy.stream);
+ t->proxy.stream = NULL;
}
- if (error < 0)
- return error;
+ t->connected = 0;
- GITERR_CHECK_VERSION(t->io, GIT_STREAM_VERSION, "git_stream");
+ if (t->proxy_opts.type == GIT_PROXY_SPECIFIED) {
+ url = &t->proxy.url;
+ cert_cb = t->proxy_opts.certificate_check;
+ cb_payload = t->proxy_opts.payload;
+ } else {
+ url = &t->server.url;
+ cert_cb = t->owner->certificate_check_cb;
+ cb_payload = t->owner->message_cb_payload;
+ }
- apply_proxy_config(t);
+ if (url->use_ssl)
+ error = git_tls_stream_new(&stream, url->host, url->port);
+ else
+ error = git_socket_stream_new(&stream, url->host, url->port);
- error = git_stream_connect(t->io);
+ if (error < 0)
+ goto on_error;
- if ((!error || error == GIT_ECERTIFICATE) && t->owner->certificate_check_cb != NULL &&
- git_stream_is_encrypted(t->io)) {
- git_cert *cert;
- int is_valid = (error == GIT_OK);
+ if ((error = stream_connect(stream, url, cert_cb, cb_payload)) < 0)
+ goto on_error;
- if ((error = git_stream_certificate(&cert, t->io)) < 0)
- return error;
+ /*
+ * At this point we have a connection to the remote server or to
+ * a proxy. If it's a proxy and the remote server is actually
+ * an HTTPS connection, then we need to build a CONNECT tunnel.
+ */
+ if (t->proxy_opts.type == GIT_PROXY_SPECIFIED &&
+ t->server.url.use_ssl) {
+ proxy_stream = stream;
+ stream = NULL;
- giterr_clear();
- error = t->owner->certificate_check_cb(cert, is_valid, t->connection_data.host, t->owner->message_cb_payload);
+ if ((error = proxy_connect(&stream, proxy_stream, t)) < 0)
+ goto on_error;
+ }
- if (error < 0) {
- if (!giterr_last())
- giterr_set(GITERR_NET, "user cancelled certificate check");
+ t->proxy.stream = proxy_stream;
+ t->server.stream = stream;
+ t->connected = 1;
+ t->replay_count = 0;
+ return 0;
- return error;
- }
+on_error:
+ if (stream) {
+ git_stream_close(stream);
+ git_stream_free(stream);
}
- if (error < 0)
- return error;
+ if (proxy_stream) {
+ git_stream_close(proxy_stream);
+ git_stream_free(proxy_stream);
+ }
- t->connected = 1;
- return 0;
+ return error;
}
static int http_stream_read(
if (gen_request(&request, s, 0) < 0)
return -1;
- if (git_stream_write(t->io, request.ptr, request.size, 0) < 0) {
- git_buf_free(&request);
+ if (git_stream__write_full(t->server.stream, request.ptr,
+ request.size, 0) < 0) {
+ git_buf_dispose(&request);
return -1;
}
- git_buf_free(&request);
+ git_buf_dispose(&request);
s->sent_request = 1;
}
/* Flush, if necessary */
if (s->chunk_buffer_len > 0 &&
- write_chunk(t->io, s->chunk_buffer, s->chunk_buffer_len) < 0)
+ write_chunk(t->server.stream,
+ s->chunk_buffer, s->chunk_buffer_len) < 0)
return -1;
s->chunk_buffer_len = 0;
/* Write the final chunk. */
- if (git_stream_write(t->io, "0\r\n\r\n", 5, 0) < 0)
+ if (git_stream__write_full(t->server.stream,
+ "0\r\n\r\n", 5, 0) < 0)
return -1;
}
return -1;
if (bytes_parsed != t->parse_buffer.offset - data_offset) {
- giterr_set(GITERR_NET,
+ git_error_set(GIT_ERROR_NET,
"HTTP parser error: %s",
http_errno_description((enum http_errno)t->parser.http_errno));
return -1;
if (gen_request(&request, s, 0) < 0)
return -1;
- if (git_stream_write(t->io, request.ptr, request.size, 0) < 0) {
- git_buf_free(&request);
+ if (git_stream__write_full(t->server.stream, request.ptr,
+ request.size, 0) < 0) {
+ git_buf_dispose(&request);
return -1;
}
- git_buf_free(&request);
+ git_buf_dispose(&request);
s->sent_request = 1;
}
if (len > CHUNK_SIZE) {
/* Flush, if necessary */
if (s->chunk_buffer_len > 0) {
- if (write_chunk(t->io, s->chunk_buffer, s->chunk_buffer_len) < 0)
+ if (write_chunk(t->server.stream,
+ s->chunk_buffer, s->chunk_buffer_len) < 0)
return -1;
s->chunk_buffer_len = 0;
}
/* Write chunk directly */
- if (write_chunk(t->io, buffer, len) < 0)
+ if (write_chunk(t->server.stream, buffer, len) < 0)
return -1;
}
else {
/* Is the buffer full? If so, then flush */
if (CHUNK_SIZE == s->chunk_buffer_len) {
- if (write_chunk(t->io, s->chunk_buffer, s->chunk_buffer_len) < 0)
+ if (write_chunk(t->server.stream,
+ s->chunk_buffer, s->chunk_buffer_len) < 0)
return -1;
s->chunk_buffer_len = 0;
assert(t->connected);
if (s->sent_request) {
- giterr_set(GITERR_NET, "subtransport configured for only one write");
+ git_error_set(GIT_ERROR_NET, "subtransport configured for only one write");
return -1;
}
if (gen_request(&request, s, len) < 0)
return -1;
- if (git_stream_write(t->io, request.ptr, request.size, 0) < 0)
+ if (git_stream__write_full(t->server.stream, request.ptr, request.size, 0) < 0)
goto on_error;
- if (len && git_stream_write(t->io, buffer, len, 0) < 0)
+ if (len && git_stream__write_full(t->server.stream, buffer, len, 0) < 0)
goto on_error;
- git_buf_free(&request);
+ git_buf_dispose(&request);
s->sent_request = 1;
return 0;
on_error:
- git_buf_free(&request);
+ git_buf_dispose(&request);
return -1;
}
return -1;
s = git__calloc(sizeof(http_stream), 1);
- GITERR_CHECK_ALLOC(s);
+ GIT_ERROR_CHECK_ALLOC(s);
s->parent.subtransport = &t->parent;
s->parent.read = http_stream_read;
http_subtransport *t = (http_subtransport *)subtransport;
int ret;
- if (!stream)
- return -1;
+ assert(stream);
- if ((!t->connection_data.host || !t->connection_data.port || !t->connection_data.path) &&
- (ret = gitno_connection_data_from_url(&t->connection_data, url, NULL)) < 0)
+ /*
+ * If we've seen a redirect then preserve the location that we've
+ * been given. This is important to continue authorization against
+ * the redirect target, not the user-given source; the endpoint may
+ * have redirected us from HTTP->HTTPS and is using an auth mechanism
+ * that would be insecure in plaintext (eg, HTTP Basic).
+ */
+ if ((!t->server.url.host || !t->server.url.port || !t->server.url.path) &&
+ (ret = gitno_connection_data_from_url(&t->server.url, url, NULL)) < 0)
return ret;
+ assert(t->server.url.host && t->server.url.port && t->server.url.path);
+
if ((ret = http_connect(t)) < 0)
return ret;
return -1;
}
-static int http_close(git_smart_subtransport *subtransport)
+static void free_auth_contexts(git_vector *contexts)
{
- http_subtransport *t = (http_subtransport *) subtransport;
git_http_auth_context *context;
size_t i;
+ git_vector_foreach(contexts, i, context) {
+ if (context->free)
+ context->free(context);
+ }
+
+ git_vector_clear(contexts);
+}
+
+static int http_close(git_smart_subtransport *subtransport)
+{
+ http_subtransport *t = (http_subtransport *) subtransport;
+
clear_parser_state(t);
t->connected = 0;
- if (t->io) {
- git_stream_close(t->io);
- git_stream_free(t->io);
- t->io = NULL;
+ if (t->server.stream) {
+ git_stream_close(t->server.stream);
+ git_stream_free(t->server.stream);
+ t->server.stream = NULL;
}
- if (t->cred) {
- t->cred->free(t->cred);
- t->cred = NULL;
+ if (t->proxy.stream) {
+ git_stream_close(t->proxy.stream);
+ git_stream_free(t->proxy.stream);
+ t->proxy.stream = NULL;
}
- if (t->url_cred) {
- t->url_cred->free(t->url_cred);
- t->url_cred = NULL;
- }
+ free_cred(&t->server.cred);
+ free_cred(&t->server.url_cred);
+ free_cred(&t->proxy.cred);
+ free_cred(&t->proxy.url_cred);
- git_vector_foreach(&t->auth_contexts, i, context) {
- if (context->free)
- context->free(context);
- }
+ free_auth_contexts(&t->server.auth_contexts);
+ free_auth_contexts(&t->proxy.auth_contexts);
+
+ gitno_connection_data_free_ptrs(&t->server.url);
+ memset(&t->server.url, 0x0, sizeof(gitno_connection_data));
- git_vector_clear(&t->auth_contexts);
+ gitno_connection_data_free_ptrs(&t->proxy.url);
+ memset(&t->proxy.url, 0x0, sizeof(gitno_connection_data));
- gitno_connection_data_free_ptrs(&t->connection_data);
- memset(&t->connection_data, 0x0, sizeof(gitno_connection_data));
+ git__free(t->proxy_url);
+ t->proxy_url = NULL;
return 0;
}
http_close(subtransport);
- git_vector_free(&t->auth_contexts);
+ git_vector_free(&t->server.auth_contexts);
+ git_vector_free(&t->proxy.auth_contexts);
git__free(t);
}
return -1;
t = git__calloc(sizeof(http_subtransport), 1);
- GITERR_CHECK_ALLOC(t);
+ GIT_ERROR_CHECK_ALLOC(t);
t->owner = (transport_smart *)owner;
t->parent.action = http_action;
#include "buffer.h"
+#define GIT_HTTP_REPLAY_MAX 7
+
GIT_INLINE(int) git_http__user_agent(git_buf *buf)
{
const char *ua = git_libgit2__user_agent();
if (!strcmp(name, GIT_HEAD_FILE) && error == GIT_ENOTFOUND) {
/* This is actually okay. Empty repos often have a HEAD that
* points to a nonexistent "refs/heads/master". */
- giterr_clear();
+ git_error_clear();
return 0;
}
return error;
git_reference_free(resolved);
head = git__calloc(1, sizeof(git_remote_head));
- GITERR_CHECK_ALLOC(head);
+ GIT_ERROR_CHECK_ALLOC(head);
head->name = git__strdup(name);
- GITERR_CHECK_ALLOC(head->name);
+ GIT_ERROR_CHECK_ALLOC(head->name);
git_oid_cpy(&head->oid, &obj_id);
- if (git_reference_type(ref) == GIT_REF_SYMBOLIC) {
+ if (git_reference_type(ref) == GIT_REFERENCE_SYMBOLIC) {
head->symref_target = git__strdup(git_reference_symbolic_target(ref));
- GITERR_CHECK_ALLOC(head->symref_target);
+ GIT_ERROR_CHECK_ALLOC(head->symref_target);
}
git_reference_free(ref);
if (git__prefixcmp(name, GIT_REFS_TAGS_DIR))
return 0;
- if ((error = git_object_lookup(&obj, t->repo, &head->oid, GIT_OBJ_ANY)) < 0)
+ if ((error = git_object_lookup(&obj, t->repo, &head->oid, GIT_OBJECT_ANY)) < 0)
return error;
head = NULL;
/* If it's not an annotated tag, or if we're mocking
* git-receive-pack, just get out */
- if (git_object_type(obj) != GIT_OBJ_TAG ||
+ if (git_object_type(obj) != GIT_OBJECT_TAG ||
t->direction != GIT_DIRECTION_FETCH) {
git_object_free(obj);
return 0;
/* And if it's a tag, peel it, and add it to the list */
head = git__calloc(1, sizeof(git_remote_head));
- GITERR_CHECK_ALLOC(head);
+ GIT_ERROR_CHECK_ALLOC(head);
if (git_buf_join(&buf, 0, name, peeled) < 0) {
free_head(head);
free_heads(&t->refs);
t->url = git__strdup(url);
- GITERR_CHECK_ALLOC(t->url);
+ GIT_ERROR_CHECK_ALLOC(t->url);
t->direction = direction;
t->flags = flags;
/* 'url' may be a url or path; convert to a path */
if ((error = git_path_from_url_or_path(&buf, url)) < 0) {
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return error;
}
path = git_buf_cstr(&buf);
error = git_repository_open(&repo, path);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
if (error < 0)
return -1;
transport_local *t = (transport_local *)transport;
if (!t->have_refs) {
- giterr_set(GITERR_NET, "the transport has not yet loaded the refs");
+ git_error_set(GIT_ERROR_NET, "the transport has not yet loaded the refs");
return -1;
}
else if (error != GIT_ENOTFOUND)
return error;
else
- giterr_clear();
+ git_error_clear();
git_object_free(obj);
}
/* 'push->remote->url' may be a url or path; convert to a path */
if ((error = git_path_from_url_or_path(&buf, push->remote->url)) < 0) {
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return error;
}
path = git_buf_cstr(&buf);
error = git_repository_open(&remote_repo, path);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
if (error < 0)
return error;
but we forbid all pushes just in case */
if (!remote_repo->is_bare) {
error = GIT_EBAREREPO;
- giterr_set(GITERR_INVALID, "local push doesn't (yet) support pushing to non-bare repos.");
+ git_error_set(GIT_ERROR_INVALID, "local push doesn't (yet) support pushing to non-bare repos.");
goto on_error;
}
goto on_error;
error = git_packbuilder_write(push->pb, odb_path.ptr, 0, transfer_to_push_transfer, (void *) cbs);
- git_buf_free(&odb_path);
+ git_buf_dispose(&odb_path);
if (error < 0)
goto on_error;
status->msg = git__strdup("Remote branch not found to delete");
break;
default:
- last = giterr_last();
+ last = git_error_last();
if (last && last->message)
status->msg = git__strdup(last->message);
return -1;
error = t->progress_cb(git_buf_cstr(&progress_info), git_buf_len(&progress_info), t->message_cb_payload);
- git_buf_free(&progress_info);
+ git_buf_dispose(&progress_info);
return error;
}
git_revwalk *walk = (git_revwalk *)payload;
int error;
- if (git_reference_type(reference) != GIT_REF_OID) {
+ if (git_reference_type(reference) != GIT_REFERENCE_DIRECT) {
git_reference_free(reference);
return 0;
}
error = git_revwalk_hide(walk, git_reference_target(reference));
/* The reference is in the local repository, so the target may not
* exist on the remote. It also may not be a commit. */
- if (error == GIT_ENOTFOUND || error == GITERR_INVALID) {
- giterr_clear();
+ if (error == GIT_ENOTFOUND || error == GIT_ERROR_INVALID) {
+ git_error_clear();
error = 0;
}
git_vector_foreach(&t->refs, i, rhead) {
git_object *obj;
- if ((error = git_object_lookup(&obj, t->repo, &rhead->oid, GIT_OBJ_ANY)) < 0)
+ if ((error = git_object_lookup(&obj, t->repo, &rhead->oid, GIT_OBJECT_ANY)) < 0)
goto cleanup;
- if (git_object_type(obj) == GIT_OBJ_COMMIT) {
+ if (git_object_type(obj) == GIT_OBJECT_COMMIT) {
/* Revwalker includes only wanted commits */
error = git_revwalk_push(walk, &rhead->oid);
} else {
cleanup:
if (writepack) writepack->free(writepack);
- git_buf_free(&progress_info);
+ git_buf_dispose(&progress_info);
git_packbuilder_free(pack);
git_revwalk_free(walk);
return error;
GIT_UNUSED(param);
t = git__calloc(1, sizeof(transport_local));
- GITERR_CHECK_ALLOC(t);
+ GIT_ERROR_CHECK_ALLOC(t);
t->parent.version = GIT_TRANSPORT_VERSION;
t->parent.set_callbacks = local_set_callbacks;
t->current_stream = NULL;
}
- if (t->url) {
+ if (close_subtransport) {
git__free(t->url);
t->url = NULL;
- }
- if (close_subtransport &&
- t->wrapped->close(t->wrapped) < 0)
- return -1;
+ if (t->wrapped->close(t->wrapped) < 0)
+ return -1;
+ }
return 0;
}
const char *c;
int name_len;
- // Disallow \r and \n
+ /* Disallow \r and \n */
c = strchr(http_header, '\r');
if (c)
return true;
if (c)
return true;
- // Require a header name followed by :
+ /* Require a header name followed by : */
name_len = http_header_name_length(http_header);
if (name_len < 1)
return true;
unsigned long i;
int name_len = http_header_name_length(custom_header);
- // Disallow headers that we set
+ /* Disallow headers that we set */
for (i = 0; i < ARRAY_SIZE(forbidden_custom_headers); i++)
if (strncmp(forbidden_custom_headers[i], custom_header, name_len) == 0)
return true;
for (i = 0; i < custom_headers->count; i++) {
if (is_malformed_http_header(custom_headers->strings[i])) {
- giterr_set(GITERR_INVALID, "custom HTTP header '%s' is malformed", custom_headers->strings[i]);
+ git_error_set(GIT_ERROR_INVALID, "custom HTTP header '%s' is malformed", custom_headers->strings[i]);
return -1;
}
if (is_forbidden_custom_header(custom_headers->strings[i])) {
- giterr_set(GITERR_INVALID, "custom HTTP header '%s' is already set by libgit2", custom_headers->strings[i]);
+ git_error_set(GIT_ERROR_INVALID, "custom HTTP header '%s' is already set by libgit2", custom_headers->strings[i]);
return -1;
}
}
git_vector_foreach(symrefs, j, spec) {
git_buf_clear(&buf);
if (git_refspec_src_matches(spec, ref->head.name) &&
- !(error = git_refspec_transform(&buf, spec, ref->head.name)))
+ !(error = git_refspec_transform(&buf, spec, ref->head.name))) {
+ git__free(ref->head.symref_target);
ref->head.symref_target = git_buf_detach(&buf);
+ }
}
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
if (error < 0)
return error;
size_t i;
git_vector_foreach(symrefs, i, spec) {
- git_refspec__free(spec);
+ git_refspec__dispose(spec);
git__free(spec);
}
return -1;
t->url = git__strdup(url);
- GITERR_CHECK_ALLOC(t->url);
+ GIT_ERROR_CHECK_ALLOC(t->url);
if (git_proxy_options_dup(&t->proxy, proxy) < 0)
return -1;
else if (GIT_DIRECTION_PUSH == t->direction)
service = GIT_SERVICE_RECEIVEPACK_LS;
else {
- giterr_set(GITERR_NET, "invalid direction");
+ git_error_set(GIT_ERROR_NET, "invalid direction");
return -1;
}
pkt = (git_pkt *)git_vector_get(&t->refs, 0);
if (!pkt || GIT_PKT_COMMENT != pkt->type) {
- giterr_set(GITERR_NET, "invalid response");
+ git_error_set(GIT_ERROR_NET, "invalid response");
return -1;
} else {
/* Remove the comment pkt from the list */
/* We now have loaded the refs. */
t->have_refs = 1;
- first = (git_pkt_ref *)git_vector_get(&t->refs, 0);
+ pkt = (git_pkt *)git_vector_get(&t->refs, 0);
+ if (pkt && GIT_PKT_REF != pkt->type) {
+ git_error_set(GIT_ERROR_NET, "invalid response");
+ return -1;
+ }
+ first = (git_pkt_ref *)pkt;
if ((error = git_vector_init(&symrefs, 1, NULL)) < 0)
return error;
/* Detect capabilities */
- if (git_smart__detect_caps(first, &t->caps, &symrefs) < 0)
- return -1;
+ if ((error = git_smart__detect_caps(first, &t->caps, &symrefs)) == 0) {
+ /* If the only ref in the list is capabilities^{} with OID_ZERO, remove it */
+ if (1 == t->refs.length && !strcmp(first->head.name, "capabilities^{}") &&
+ git_oid_iszero(&first->head.oid)) {
+ git_vector_clear(&t->refs);
+ git_pkt_free((git_pkt *)first);
+ }
- /* If the only ref in the list is capabilities^{} with OID_ZERO, remove it */
- if (1 == t->refs.length && !strcmp(first->head.name, "capabilities^{}") &&
- git_oid_iszero(&first->head.oid)) {
- git_vector_clear(&t->refs);
- git_pkt_free((git_pkt *)first);
+ /* Keep a list of heads for _ls */
+ git_smart__update_heads(t, &symrefs);
+ } else if (error == GIT_ENOTFOUND) {
+ /* There was no ref packet received, or the cap list was empty */
+ error = 0;
+ } else {
+ git_error_set(GIT_ERROR_NET, "invalid response");
+ goto cleanup;
}
- /* Keep a list of heads for _ls */
- git_smart__update_heads(t, &symrefs);
-
- free_symrefs(&symrefs);
-
- if (t->rpc && git_smart__reset_stream(t, false) < 0)
- return -1;
+ if (t->rpc && (error = git_smart__reset_stream(t, false)) < 0)
+ goto cleanup;
/* We're now logically connected. */
t->connected = 1;
- return 0;
+cleanup:
+ free_symrefs(&symrefs);
+
+ return error;
}
static int git_smart__ls(const git_remote_head ***out, size_t *size, git_transport *transport)
transport_smart *t = (transport_smart *)transport;
if (!t->have_refs) {
- giterr_set(GITERR_NET, "the transport has not yet loaded the refs");
+ git_error_set(GIT_ERROR_NET, "the transport has not yet loaded the refs");
return -1;
}
return -1;
if (GIT_DIRECTION_FETCH != t->direction) {
- giterr_set(GITERR_NET, "this operation is only valid for fetch");
+ git_error_set(GIT_ERROR_NET, "this operation is only valid for fetch");
return -1;
}
return -1;
if (GIT_DIRECTION_PUSH != t->direction) {
- giterr_set(GITERR_NET, "this operation is only valid for push");
+ git_error_set(GIT_ERROR_NET, "this operation is only valid for push");
return -1;
}
{
transport_smart *t = (transport_smart *)transport;
+ assert(transport && cert && hostname);
+
+ if (!t->certificate_check_cb)
+ return GIT_PASSTHROUGH;
+
return t->certificate_check_cb(cert, valid, hostname, t->message_cb_payload);
}
{
transport_smart *t = (transport_smart *)transport;
+ assert(out && transport);
+
+ if (!t->cred_acquire_cb)
+ return GIT_PASSTHROUGH;
+
return t->cred_acquire_cb(out, t->url, user, methods, t->cred_acquire_payload);
}
return -1;
t = git__calloc(1, sizeof(transport_smart));
- GITERR_CHECK_ALLOC(t);
+ GIT_ERROR_CHECK_ALLOC(t);
t->parent.version = GIT_TRANSPORT_VERSION;
t->parent.set_callbacks = git_smart__set_callbacks;
GIT_PKT_HAVE,
GIT_PKT_ACK,
GIT_PKT_NAK,
- GIT_PKT_PACK__UNUSED,
GIT_PKT_COMMENT,
GIT_PKT_ERR,
GIT_PKT_DATA,
GIT_PKT_UNPACK,
} git_pkt_type;
-/* Used for multi_ack and mutli_ack_detailed */
+/* Used for multi_ack and multi_ack_detailed */
enum git_ack_status {
GIT_ACK_NONE,
GIT_ACK_CONTINUE,
git_pkt *pkt;
pkt = git__malloc(sizeof(git_pkt));
- GITERR_CHECK_ALLOC(pkt);
+ GIT_ERROR_CHECK_ALLOC(pkt);
pkt->type = GIT_PKT_FLUSH;
*out = pkt;
git_pkt_ack *pkt;
pkt = git__calloc(1, sizeof(git_pkt_ack));
- GITERR_CHECK_ALLOC(pkt);
+ GIT_ERROR_CHECK_ALLOC(pkt);
pkt->type = GIT_PKT_ACK;
if (git__prefixncmp(line, len, "ACK "))
return 0;
out_err:
- giterr_set(GITERR_NET, "error parsing ACK pkt-line");
+ git_error_set(GIT_ERROR_NET, "error parsing ACK pkt-line");
git__free(pkt);
return -1;
}
git_pkt *pkt;
pkt = git__malloc(sizeof(git_pkt));
- GITERR_CHECK_ALLOC(pkt);
+ GIT_ERROR_CHECK_ALLOC(pkt);
pkt->type = GIT_PKT_NAK;
*out = pkt;
git_pkt_comment *pkt;
size_t alloclen;
- GITERR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_pkt_comment), len);
- GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_pkt_comment), len);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1);
pkt = git__malloc(alloclen);
- GITERR_CHECK_ALLOC(pkt);
+ GIT_ERROR_CHECK_ALLOC(pkt);
pkt->type = GIT_PKT_COMMENT;
memcpy(pkt->comment, line, len);
line += 4;
len -= 4;
- GITERR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_pkt_progress), len);
- GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_pkt_progress), len);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1);
pkt = git__malloc(alloclen);
- GITERR_CHECK_ALLOC(pkt);
+ GIT_ERROR_CHECK_ALLOC(pkt);
pkt->type = GIT_PKT_ERR;
pkt->len = len;
return 0;
out_err:
- giterr_set(GITERR_NET, "error parsing ERR pkt-line");
+ git_error_set(GIT_ERROR_NET, "error parsing ERR pkt-line");
git__free(pkt);
return -1;
}
line++;
len--;
- GITERR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_pkt_progress), len);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_pkt_progress), len);
pkt = git__malloc(alloclen);
- GITERR_CHECK_ALLOC(pkt);
+ GIT_ERROR_CHECK_ALLOC(pkt);
pkt->type = GIT_PKT_DATA;
pkt->len = len;
line++;
len--;
- GITERR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_pkt_progress), len);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_pkt_progress), len);
pkt = git__malloc(alloclen);
- GITERR_CHECK_ALLOC(pkt);
+ GIT_ERROR_CHECK_ALLOC(pkt);
pkt->type = GIT_PKT_PROGRESS;
pkt->len = len;
line++;
len--;
- GITERR_CHECK_ALLOC_ADD(&alloc_len, sizeof(git_pkt_err), len);
- GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, sizeof(git_pkt_err), len);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 1);
pkt = git__malloc(alloc_len);
- GITERR_CHECK_ALLOC(pkt);
+ GIT_ERROR_CHECK_ALLOC(pkt);
pkt->type = GIT_PKT_ERR;
pkt->len = (int)len;
size_t alloclen;
pkt = git__calloc(1, sizeof(git_pkt_ref));
- GITERR_CHECK_ALLOC(pkt);
+ GIT_ERROR_CHECK_ALLOC(pkt);
pkt->type = GIT_PKT_REF;
if (len < GIT_OID_HEXSZ || git_oid_fromstr(&pkt->head.oid, line) < 0)
if (line[len - 1] == '\n')
--len;
- GITERR_CHECK_ALLOC_ADD(&alloclen, len, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, len, 1);
pkt->head.name = git__malloc(alloclen);
- GITERR_CHECK_ALLOC(pkt->head.name);
+ GIT_ERROR_CHECK_ALLOC(pkt->head.name);
memcpy(pkt->head.name, line, len);
pkt->head.name[len] = '\0';
return 0;
out_err:
- giterr_set(GITERR_NET, "error parsing REF pkt-line");
+ git_error_set(GIT_ERROR_NET, "error parsing REF pkt-line");
if (pkt)
git__free(pkt->head.name);
git__free(pkt);
size_t alloc_len;
pkt = git__malloc(sizeof(*pkt));
- GITERR_CHECK_ALLOC(pkt);
+ GIT_ERROR_CHECK_ALLOC(pkt);
pkt->type = GIT_PKT_OK;
if (git__prefixncmp(line, len, "ok "))
if (line[len - 1] == '\n')
--len;
- GITERR_CHECK_ALLOC_ADD(&alloc_len, len, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, len, 1);
pkt->ref = git__malloc(alloc_len);
- GITERR_CHECK_ALLOC(pkt->ref);
+ GIT_ERROR_CHECK_ALLOC(pkt->ref);
memcpy(pkt->ref, line, len);
pkt->ref[len] = '\0';
return 0;
out_err:
- giterr_set(GITERR_NET, "error parsing OK pkt-line");
+ git_error_set(GIT_ERROR_NET, "error parsing OK pkt-line");
git__free(pkt);
return -1;
}
size_t alloclen;
pkt = git__malloc(sizeof(*pkt));
- GITERR_CHECK_ALLOC(pkt);
+ GIT_ERROR_CHECK_ALLOC(pkt);
pkt->ref = NULL;
pkt->type = GIT_PKT_NG;
goto out_err;
len = ptr - line;
- GITERR_CHECK_ALLOC_ADD(&alloclen, len, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, len, 1);
pkt->ref = git__malloc(alloclen);
- GITERR_CHECK_ALLOC(pkt->ref);
+ GIT_ERROR_CHECK_ALLOC(pkt->ref);
memcpy(pkt->ref, line, len);
pkt->ref[len] = '\0';
goto out_err;
len = ptr - line;
- GITERR_CHECK_ALLOC_ADD(&alloclen, len, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, len, 1);
pkt->msg = git__malloc(alloclen);
- GITERR_CHECK_ALLOC(pkt->msg);
+ GIT_ERROR_CHECK_ALLOC(pkt->msg);
memcpy(pkt->msg, line, len);
pkt->msg[len] = '\0';
return 0;
out_err:
- giterr_set(GITERR_NET, "invalid packet line");
+ git_error_set(GIT_ERROR_NET, "invalid packet line");
git__free(pkt->ref);
git__free(pkt);
return -1;
git_pkt_unpack *pkt;
pkt = git__malloc(sizeof(*pkt));
- GITERR_CHECK_ALLOC(pkt);
+ GIT_ERROR_CHECK_ALLOC(pkt);
pkt->type = GIT_PKT_UNPACK;
if (!git__prefixncmp(line, len, "unpack ok"))
}
}
- giterr_set(GITERR_NET, "invalid hex digit in length: '%s'", num);
+ git_error_set(GIT_ERROR_NET, "invalid hex digit in length: '%s'", num);
return -1;
}
}
if (error == GIT_EBUFS)
;
else if (!git__prefixncmp(line, linelen, "PACK"))
- giterr_set(GITERR_NET, "unexpected pack file");
+ git_error_set(GIT_ERROR_NET, "unexpected pack file");
else
- giterr_set(GITERR_NET, "bad packet length");
+ git_error_set(GIT_ERROR_NET, "bad packet length");
return error;
}
* line, we should return an error upon hitting one.
*/
if (len == PKT_LEN_SIZE) {
- giterr_set_str(GITERR_NET, "Invalid empty packet");
+ git_error_set_str(GIT_ERROR_NET, "Invalid empty packet");
return GIT_ERROR;
}
void git_pkt_free(git_pkt *pkt)
{
+ if (pkt == NULL) {
+ return;
+ }
if (pkt->type == GIT_PKT_REF) {
git_pkt_ref *p = (git_pkt_ref *) pkt;
git__free(p->head.name);
git_buf_len(&str) + 1 /* LF */;
if (len > 0xffff) {
- giterr_set(GITERR_NET,
+ git_error_set(GIT_ERROR_NET,
"tried to produce packet with invalid length %" PRIuZ, len);
return -1;
}
git_oid_fmt(oid, &head->oid);
git_buf_printf(buf,
"%04xwant %s %s\n", (unsigned int)len, oid, git_buf_cstr(&str));
- git_buf_free(&str);
+ git_buf_dispose(&str);
- GITERR_CHECK_ALLOC_BUF(buf);
+ GIT_ERROR_CHECK_ALLOC_BUF(buf);
return 0;
}
return recvd;
if (recvd == 0) {
- giterr_set(GITERR_NET, "early EOF");
+ git_error_set(GIT_ERROR_NET, "early EOF");
return GIT_EEOF;
}
gitno_consume(buf, line_end);
if (pkt->type == GIT_PKT_ERR) {
- giterr_set(GITERR_NET, "remote error: %s", ((git_pkt_err *)pkt)->error);
+ git_error_set(GIT_ERROR_NET, "remote error: %s", ((git_pkt_err *)pkt)->error);
git__free(pkt);
return -1;
}
/* symref mapping has refspec format */
mapping = git__calloc(1, sizeof(git_refspec));
- GITERR_CHECK_ALLOC(mapping);
+ GIT_ERROR_CHECK_ALLOC(mapping);
error = git_refspec__parse(mapping, git_buf_cstr(&buf), true);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
/* if the error isn't OOM, then it's a parse error; let's use a nicer message */
if (error < 0) {
- if (giterr_last()->klass != GITERR_NOMEMORY)
+ if (git_error_last()->klass != GIT_ERROR_NOMEMORY)
goto on_invalid;
git__free(mapping);
return 0;
on_invalid:
- giterr_set(GITERR_NET, "remote sent invalid symref");
- git_refspec__free(mapping);
+ git_error_set(GIT_ERROR_NET, "remote sent invalid symref");
+ git_refspec__dispose(mapping);
git__free(mapping);
return -1;
}
/* No refs or capabilites, odd but not a problem */
if (pkt == NULL || pkt->capabilities == NULL)
- return 0;
+ return GIT_ENOTFOUND;
ptr = pkt->capabilities;
while (ptr != NULL && *ptr != '\0') {
return 0;
}
-static int recv_pkt(git_pkt **out, git_pkt_type *pkt_type, gitno_buffer *buf)
+static int recv_pkt(git_pkt **out_pkt, git_pkt_type *out_type, gitno_buffer *buf)
{
const char *ptr = buf->data, *line_end = ptr;
git_pkt *pkt = NULL;
if ((ret = gitno_recv(buf)) < 0) {
return ret;
} else if (ret == 0) {
- giterr_set(GITERR_NET, "early EOF");
+ git_error_set(GIT_ERROR_NET, "early EOF");
return GIT_EEOF;
}
} while (error);
gitno_consume(buf, line_end);
- if (pkt_type)
- *pkt_type = pkt->type;
- if (out != NULL)
- *out = pkt;
+ if (out_type != NULL)
+ *out_type = pkt->type;
+ if (out_pkt != NULL)
+ *out_pkt = pkt;
else
git__free(pkt);
if ((error = recv_pkt(&pkt, NULL, buf)) < 0)
return error;
- if (pkt->type == GIT_PKT_ACK) {
- if (git_vector_insert(&t->common, pkt) < 0)
- return -1;
- } else {
+ if (pkt->type != GIT_PKT_ACK) {
git__free(pkt);
return 0;
}
+ if (git_vector_insert(&t->common, pkt) < 0) {
+ git__free(pkt);
+ return -1;
+ }
} while (1);
return 0;
if ((error = git_reference_lookup(&ref, repo, refs.strings[i])) < 0)
goto on_error;
- if (git_reference_type(ref) == GIT_REF_SYMBOLIC)
+ if (git_reference_type(ref) == GIT_REFERENCE_SYMBOLIC)
continue;
if ((error = git_revwalk_push(walk, git_reference_target(ref))) < 0)
static int wait_while_ack(gitno_buffer *buf)
{
int error;
- git_pkt_ack *pkt = NULL;
+ git_pkt *pkt = NULL;
+ git_pkt_ack *ack = NULL;
while (1) {
- git__free(pkt);
+ git_pkt_free(pkt);
- if ((error = recv_pkt((git_pkt **)&pkt, NULL, buf)) < 0)
+ if ((error = recv_pkt(&pkt, NULL, buf)) < 0)
return error;
if (pkt->type == GIT_PKT_NAK)
break;
+ if (pkt->type != GIT_PKT_ACK)
+ continue;
- if (pkt->type == GIT_PKT_ACK &&
- (pkt->status != GIT_ACK_CONTINUE &&
- pkt->status != GIT_ACK_COMMON &&
- pkt->status != GIT_ACK_READY)) {
- git__free(pkt);
- return 0;
+ ack = (git_pkt_ack*)pkt;
+
+ if (ack->status != GIT_ACK_CONTINUE &&
+ ack->status != GIT_ACK_COMMON &&
+ ack->status != GIT_ACK_READY) {
+ break;
}
}
- git__free(pkt);
+ git_pkt_free(pkt);
return 0;
}
i++;
if (i % 20 == 0) {
if (t->cancelled.val) {
- giterr_set(GITERR_NET, "The fetch was cancelled by the user");
+ git_error_set(GIT_ERROR_NET, "The fetch was cancelled by the user");
error = GIT_EUSER;
goto on_error;
}
if ((error = store_common(t)) < 0)
goto on_error;
} else {
- error = recv_pkt(NULL, &pkt_type, buf);
- if (error < 0) {
+ if ((error = recv_pkt(NULL, &pkt_type, buf)) < 0)
goto on_error;
- } else if (pkt_type == GIT_PKT_ACK) {
+
+ if (pkt_type == GIT_PKT_ACK) {
break;
} else if (pkt_type == GIT_PKT_NAK) {
continue;
} else {
- giterr_set(GITERR_NET, "Unexpected pkt type");
+ git_error_set(GIT_ERROR_NET, "Unexpected pkt type");
error = -1;
goto on_error;
}
goto on_error;
if (t->cancelled.val) {
- giterr_set(GITERR_NET, "The fetch was cancelled by the user");
+ git_error_set(GIT_ERROR_NET, "The fetch was cancelled by the user");
error = GIT_EUSER;
goto on_error;
}
if ((error = git_smart__negotiation_step(&t->parent, data.ptr, data.size)) < 0)
goto on_error;
- git_buf_free(&data);
+ git_buf_dispose(&data);
git_revwalk_free(walk);
/* Now let's eat up whatever the server gives us */
if (!t->caps.multi_ack && !t->caps.multi_ack_detailed) {
- error = recv_pkt(NULL, &pkt_type, buf);
-
- if (error < 0) {
+ if ((error = recv_pkt(NULL, &pkt_type, buf)) < 0)
return error;
- } else if (pkt_type != GIT_PKT_ACK && pkt_type != GIT_PKT_NAK) {
- giterr_set(GITERR_NET, "Unexpected pkt type");
+
+ if (pkt_type != GIT_PKT_ACK && pkt_type != GIT_PKT_NAK) {
+ git_error_set(GIT_ERROR_NET, "Unexpected pkt type");
return -1;
}
} else {
on_error:
git_revwalk_free(walk);
- git_buf_free(&data);
+ git_buf_dispose(&data);
return error;
}
do {
if (t->cancelled.val) {
- giterr_set(GITERR_NET, "The fetch was cancelled by the user");
+ git_error_set(GIT_ERROR_NET, "The fetch was cancelled by the user");
return GIT_EUSER;
}
/* Check cancellation before network call */
if (t->cancelled.val) {
- giterr_clear();
+ git_error_clear();
error = GIT_EUSER;
goto done;
}
if ((error = recv_pkt(&pkt, NULL, buf)) >= 0) {
/* Check cancellation after network call */
if (t->cancelled.val) {
- giterr_clear();
+ git_error_clear();
error = GIT_EUSER;
} else if (pkt->type == GIT_PKT_PROGRESS) {
if (t->progress_cb) {
}
}
- git__free(pkt);
+ git_pkt_free(pkt);
+
if (error < 0)
goto done;
switch (pkt->type) {
case GIT_PKT_OK:
status = git__calloc(1, sizeof(push_status));
- GITERR_CHECK_ALLOC(status);
+ GIT_ERROR_CHECK_ALLOC(status);
status->msg = NULL;
status->ref = git__strdup(((git_pkt_ok *)pkt)->ref);
if (!status->ref ||
break;
case GIT_PKT_NG:
status = git__calloc(1, sizeof(push_status));
- GITERR_CHECK_ALLOC(status);
+ GIT_ERROR_CHECK_ALLOC(status);
status->ref = git__strdup(((git_pkt_ng *)pkt)->ref);
status->msg = git__strdup(((git_pkt_ng *)pkt)->msg);
if (!status->ref || !status->msg ||
case GIT_PKT_FLUSH:
return GIT_ITEROVER;
default:
- giterr_set(GITERR_NET, "report-status: protocol error");
+ git_error_set(GIT_ERROR_NET, "report-status: protocol error");
return -1;
}
}
if (recvd == 0) {
- giterr_set(GITERR_NET, "early EOF");
+ git_error_set(GIT_ERROR_NET, "early EOF");
error = GIT_EEOF;
goto done;
}
error = add_push_report_sideband_pkt(push, (git_pkt_data *)pkt, &data_pkt_buf);
break;
case GIT_PKT_ERR:
- giterr_set(GITERR_NET, "report-status: Error reported: %s",
+ git_error_set(GIT_ERROR_NET, "report-status: Error reported: %s",
((git_pkt_err *)pkt)->error);
error = -1;
break;
if (data_pkt_buf.size > 0) {
/* If there was data remaining in the pack data buffer,
* then the server sent a partial pkt-line */
- giterr_set(GITERR_NET, "Incomplete pack data pkt-line");
+ git_error_set(GIT_ERROR_NET, "Incomplete pack data pkt-line");
error = GIT_ERROR;
}
goto done;
}
}
done:
- git_buf_free(&data_pkt_buf);
+ git_buf_dispose(&data_pkt_buf);
return error;
}
static int add_ref_from_push_spec(git_vector *refs, push_spec *push_spec)
{
git_pkt_ref *added = git__calloc(1, sizeof(git_pkt_ref));
- GITERR_CHECK_ALLOC(added);
+ GIT_ERROR_CHECK_ALLOC(added);
added->type = GIT_PKT_REF;
git_oid_cpy(&added->head.oid, &push_spec->loid);
/* For each push spec we sent to the server, we should have
* gotten back a status packet in the push report */
if (push_specs->length != push_report->length) {
- giterr_set(GITERR_NET, "report-status: protocol error");
+ git_error_set(GIT_ERROR_NET, "report-status: protocol error");
return -1;
}
/* For each push spec we sent to the server, we should have
* gotten back a status packet in the push report which matches */
if (strcmp(push_spec->refspec.dst, push_status->ref)) {
- giterr_set(GITERR_NET, "report-status: protocol error");
+ git_error_set(GIT_ERROR_NET, "report-status: protocol error");
return -1;
}
}
}
done:
- git_buf_free(&pktline);
+ git_buf_dispose(&pktline);
return error;
}
char *ssherr;
libssh2_session_last_error(session, &ssherr, NULL, 0);
- giterr_set(GITERR_SSH, "%s: %s", errmsg, ssherr);
+ git_error_set(GIT_ERROR_SSH, "%s: %s", errmsg, ssherr);
}
/*
done:
if (!repo) {
- giterr_set(GITERR_NET, "malformed git protocol URL");
+ git_error_set(GIT_ERROR_NET, "malformed git protocol URL");
return -1;
}
s->sent_command = 1;
cleanup:
- git_buf_free(&request);
+ git_buf_dispose(&request);
return error;
}
*/
if (rc == 0) {
if ((rc = libssh2_channel_read_stderr(s->channel, buffer, buf_size)) > 0) {
- giterr_set(GITERR_SSH, "%*s", rc, buffer);
+ git_error_set(GIT_ERROR_SSH, "%*s", rc, buffer);
return GIT_EEOF;
} else if (rc < LIBSSH2_ERROR_NONE) {
ssh_error(s->session, "SSH could not read stderr");
assert(stream);
s = git__calloc(sizeof(ssh_stream), 1);
- GITERR_CHECK_ALLOC(s);
+ GIT_ERROR_CHECK_ALLOC(s);
s->parent.subtransport = &t->parent;
s->parent.read = ssh_stream_read;
if (at) {
start = at + 1;
*username = git__substrdup(url, at - url);
- GITERR_CHECK_ALLOC(*username);
+ GIT_ERROR_CHECK_ALLOC(*username);
} else {
start = url;
*username = NULL;
}
if (colon == NULL || (colon < start)) {
- giterr_set(GITERR_NET, "malformed URL");
+ git_error_set(GIT_ERROR_NET, "malformed URL");
return -1;
}
*host = git__substrdup(start, colon - start);
- GITERR_CHECK_ALLOC(*host);
+ GIT_ERROR_CHECK_ALLOC(*host);
return 0;
}
int rc;
do {
- giterr_clear();
+ git_error_clear();
switch (cred->credtype) {
case GIT_CREDTYPE_USERPASS_PLAINTEXT: {
git_cred_userpass_plaintext *c = (git_cred_userpass_plaintext *)cred;
return GIT_EAUTH;
if (rc != LIBSSH2_ERROR_NONE) {
- if (!giterr_last())
+ if (!git_error_last())
ssh_error(session, "Failed to authenticate SSH session");
return -1;
}
error = t->owner->cred_acquire_cb(&cred, t->owner->url, user, auth_methods,
t->owner->cred_acquire_payload);
- if (error == GIT_PASSTHROUGH)
+ if (error == GIT_PASSTHROUGH) {
no_callback = 1;
- else if (error < 0)
+ } else if (error < 0) {
return error;
- else if (!cred) {
- giterr_set(GITERR_SSH, "callback failed to initialize SSH credentials");
+ } else if (!cred) {
+ git_error_set(GIT_ERROR_SSH, "callback failed to initialize SSH credentials");
return -1;
}
}
if (no_callback) {
- giterr_set(GITERR_SSH, "authentication required but no callback set");
+ git_error_set(GIT_ERROR_SSH, "authentication required but no callback set");
return -1;
}
if (!(cred->credtype & auth_methods)) {
cred->free(cred);
- giterr_set(GITERR_SSH, "callback returned unsupported credentials type");
+ git_error_set(GIT_ERROR_SSH, "callback returned unsupported credentials type");
return -1;
}
s = libssh2_session_init();
if (!s) {
- giterr_set(GITERR_NET, "failed to initialize SSH session");
+ git_error_set(GIT_ERROR_NET, "failed to initialize SSH session");
return -1;
}
if ((error = git_ssh_extract_url_parts(&host, &user, url)) < 0)
goto done;
port = git__strdup(default_port);
- GITERR_CHECK_ALLOC(port);
+ GIT_ERROR_CHECK_ALLOC(port);
post_extract:
if ((error = git_socket_stream_new(&s->io, host, port)) < 0 ||
}
if (cert.type == 0) {
- giterr_set(GITERR_SSH, "unable to get the host key");
+ git_error_set(GIT_ERROR_SSH, "unable to get the host key");
error = -1;
goto done;
}
/* We don't currently trust any hostkeys */
- giterr_clear();
+ git_error_clear();
cert_ptr = &cert;
error = t->owner->certificate_check_cb((git_cert *) cert_ptr, 0, host, t->owner->message_cb_payload);
- if (error < 0) {
- if (!giterr_last())
- giterr_set(GITERR_NET, "user cancelled hostkey check");
+
+ if (error < 0 && error != GIT_PASSTHROUGH) {
+ if (!git_error_last())
+ git_error_set(GIT_ERROR_NET, "user cancelled hostkey check");
goto done;
}
goto done;
if (strcmp(user, git_cred__username(cred))) {
- giterr_set(GITERR_SSH, "username does not match previous request");
+ git_error_set(GIT_ERROR_SSH, "username does not match previous request");
error = -1;
goto done;
}
return 0;
}
- giterr_set(GITERR_NET, "must call UPLOADPACK_LS before UPLOADPACK");
+ git_error_set(GIT_ERROR_NET, "must call UPLOADPACK_LS before UPLOADPACK");
return -1;
}
return 0;
}
- giterr_set(GITERR_NET, "must call RECEIVEPACK_LS before RECEIVEPACK");
+ git_error_set(GIT_ERROR_NET, "must call RECEIVEPACK_LS before RECEIVEPACK");
return -1;
}
GIT_UNUSED(param);
t = git__calloc(sizeof(ssh_subtransport), 1);
- GITERR_CHECK_ALLOC(t);
+ GIT_ERROR_CHECK_ALLOC(t);
t->owner = (transport_smart *)owner;
t->parent.action = _ssh_action;
assert(out);
*out = NULL;
- giterr_set(GITERR_INVALID, "cannot create SSH transport. Library was built without SSH support");
+ git_error_set(GIT_ERROR_INVALID, "cannot create SSH transport. Library was built without SSH support");
return -1;
#endif
}
};
if (paths->count != 2) {
- giterr_set(GITERR_SSH, "invalid ssh paths, must be two strings");
+ git_error_set(GIT_ERROR_SSH, "invalid ssh paths, must be two strings");
return GIT_EINVALIDSPEC;
}
t = (ssh_subtransport *) smart->wrapped;
t->cmd_uploadpack = git__strdup(paths->strings[0]);
- GITERR_CHECK_ALLOC(t->cmd_uploadpack);
+ GIT_ERROR_CHECK_ALLOC(t->cmd_uploadpack);
t->cmd_receivepack = git__strdup(paths->strings[1]);
- GITERR_CHECK_ALLOC(t->cmd_receivepack);
+ GIT_ERROR_CHECK_ALLOC(t->cmd_receivepack);
*out = transport;
return 0;
assert(out);
*out = NULL;
- giterr_set(GITERR_INVALID, "cannot create SSH transport. Library was built without SSH support");
+ git_error_set(GIT_ERROR_INVALID, "cannot create SSH transport. Library was built without SSH support");
return -1;
#endif
}
{
#ifdef GIT_SSH
if (libssh2_init(0) < 0) {
- giterr_set(GITERR_SSH, "unable to initialize libssh2");
+ git_error_set(GIT_ERROR_SSH, "unable to initialize libssh2");
return -1;
}
goto done;
if (!WinHttpSetCredentials(request, target, scheme, user, pass, NULL)) {
- giterr_set(GITERR_OS, "failed to set credentials");
+ git_error_set(GIT_ERROR_OS, "failed to set credentials");
error = -1;
}
} else if (mechanisms & GIT_WINHTTP_AUTH_BASIC) {
native_scheme = WINHTTP_AUTH_SCHEME_BASIC;
} else {
- giterr_set(GITERR_NET, "invalid authentication scheme");
+ git_error_set(GIT_ERROR_NET, "invalid authentication scheme");
return -1;
}
DWORD native_scheme = 0;
if ((mechanisms & GIT_WINHTTP_AUTH_NTLM) != 0)
- native_scheme |= WINHTTP_AUTH_SCHEME_NTLM;
+ native_scheme = WINHTTP_AUTH_SCHEME_NTLM;
if ((mechanisms & GIT_WINHTTP_AUTH_NEGOTIATE) != 0)
- native_scheme |= WINHTTP_AUTH_SCHEME_NEGOTIATE;
+ native_scheme = WINHTTP_AUTH_SCHEME_NEGOTIATE;
if (!native_scheme) {
- giterr_set(GITERR_NET, "invalid authentication scheme");
+ git_error_set(GIT_ERROR_NET, "invalid authentication scheme");
return -1;
}
* as an authentication mechanism */
if (GIT_CREDTYPE_DEFAULT & allowed_types) {
wchar_t *wide_url;
+ HRESULT hCoInitResult;
/* Convert URL to wide characters */
if (git__utf8_to_16_alloc(&wide_url, url) < 0) {
- giterr_set(GITERR_OS, "failed to convert string to wide form");
+ git_error_set(GIT_ERROR_OS, "failed to convert string to wide form");
return -1;
}
- if (SUCCEEDED(CoInitializeEx(NULL, COINIT_MULTITHREADED))) {
+ hCoInitResult = CoInitializeEx(NULL, COINIT_MULTITHREADED);
+
+ if (SUCCEEDED(hCoInitResult) || hCoInitResult == RPC_E_CHANGED_MODE) {
IInternetSecurityManager* pISM;
/* And if the target URI is in the My Computer, Intranet, or Trusted zones */
pISM->lpVtbl->Release(pISM);
}
- CoUninitialize();
+ if (SUCCEEDED(hCoInitResult))
+ /* Only unitialize if the call to CoInitializeEx was successful. */
+ CoUninitialize();
}
git__free(wide_url);
/* If there is no override, we should fail if WinHTTP doesn't think it's fine */
if (t->owner->certificate_check_cb == NULL && !valid) {
- if (!giterr_last())
- giterr_set(GITERR_NET, "unknown certificate check failure");
+ if (!git_error_last())
+ git_error_set(GIT_ERROR_NET, "unknown certificate check failure");
return GIT_ECERTIFICATE;
}
return 0;
if (!WinHttpQueryOption(s->request, WINHTTP_OPTION_SERVER_CERT_CONTEXT, &cert_ctx, &cert_ctx_size)) {
- giterr_set(GITERR_OS, "failed to get server certificate");
+ git_error_set(GIT_ERROR_OS, "failed to get server certificate");
return -1;
}
- giterr_clear();
+ git_error_clear();
cert.parent.cert_type = GIT_CERT_X509;
cert.data = cert_ctx->pbCertEncoded;
cert.len = cert_ctx->cbCertEncoded;
error = t->owner->certificate_check_cb((git_cert *) &cert, valid, t->connection_data.host, t->owner->message_cb_payload);
CertFreeCertificateContext(cert_ctx);
- if (error < 0 && !giterr_last())
- giterr_set(GITERR_NET, "user cancelled certificate check");
+ if (error == GIT_PASSTHROUGH)
+ error = valid ? 0 : GIT_ECERTIFICATE;
+
+ if (error < 0 && !git_error_last())
+ git_error_set(GIT_ERROR_NET, "user cancelled certificate check");
return error;
}
s->sent_request = 0;
}
-/**
- * Extract the url and password from a URL. The outputs are pointers
- * into the input.
- */
-static int userpass_from_url(wchar_t **user, int *user_len,
- wchar_t **pass, int *pass_len,
- const wchar_t *url, int url_len)
-{
- URL_COMPONENTS components = { 0 };
-
- components.dwStructSize = sizeof(components);
- /* These tell WinHttpCrackUrl that we're interested in the fields */
- components.dwUserNameLength = 1;
- components.dwPasswordLength = 1;
-
- if (!WinHttpCrackUrl(url, url_len, 0, &components)) {
- giterr_set(GITERR_OS, "failed to extract user/pass from url");
- return -1;
- }
-
- *user = components.lpszUserName;
- *user_len = components.dwUserNameLength;
- *pass = components.lpszPassword;
- *pass_len = components.dwPasswordLength;
-
- return 0;
-}
-
#define SCHEME_HTTP "http://"
#define SCHEME_HTTPS "https://"
/* Convert URL to wide characters */
if (git__utf8_to_16_alloc(&s->request_uri, git_buf_cstr(&buf)) < 0) {
- giterr_set(GITERR_OS, "failed to convert string to wide form");
+ git_error_set(GIT_ERROR_OS, "failed to convert string to wide form");
goto on_error;
}
t->connection_data.use_ssl ? WINHTTP_FLAG_SECURE : 0);
if (!s->request) {
- giterr_set(GITERR_OS, "failed to open request");
+ git_error_set(GIT_ERROR_OS, "failed to open request");
goto on_error;
}
if (!WinHttpSetTimeouts(s->request, default_timeout, default_connect_timeout, default_timeout, default_timeout)) {
- giterr_set(GITERR_OS, "failed to set timeouts for WinHTTP");
+ git_error_set(GIT_ERROR_OS, "failed to set timeouts for WinHTTP");
goto on_error;
}
}
else if (proxy_opts->type == GIT_PROXY_SPECIFIED) {
proxy_url = git__strdup(proxy_opts->url);
- GITERR_CHECK_ALLOC(proxy_url);
+ GIT_ERROR_CHECK_ALLOC(proxy_url);
}
if (proxy_url) {
} else if (!git__prefixcmp(proxy_url, SCHEME_HTTPS)) {
t->proxy_connection_data.use_ssl = true;
} else {
- giterr_set(GITERR_NET, "invalid URL: '%s'", proxy_url);
+ git_error_set(GIT_ERROR_NET, "invalid URL: '%s'", proxy_url);
return -1;
}
/* Convert URL to wide characters */
error = git__utf8_to_16_alloc(&proxy_wide, processed_url.ptr);
- git_buf_free(&processed_url);
+ git_buf_dispose(&processed_url);
if (error < 0)
goto on_error;
WINHTTP_OPTION_PROXY,
&proxy_info,
sizeof(WINHTTP_PROXY_INFO))) {
- giterr_set(GITERR_OS, "failed to set proxy");
+ git_error_set(GIT_ERROR_OS, "failed to set proxy");
git__free(proxy_wide);
goto on_error;
}
WINHTTP_OPTION_DISABLE_FEATURE,
&disable_redirects,
sizeof(disable_redirects))) {
- giterr_set(GITERR_OS, "failed to disable redirects");
+ git_error_set(GIT_ERROR_OS, "failed to disable redirects");
goto on_error;
}
/* Send Pragma: no-cache header */
if (!WinHttpAddRequestHeaders(s->request, pragma_nocache, (ULONG) -1L, WINHTTP_ADDREQ_FLAG_ADD)) {
- giterr_set(GITERR_OS, "failed to add a header to the request");
+ git_error_set(GIT_ERROR_OS, "failed to add a header to the request");
goto on_error;
}
goto on_error;
if (git__utf8_to_16(ct, MAX_CONTENT_TYPE_LEN, git_buf_cstr(&buf)) < 0) {
- giterr_set(GITERR_OS, "failed to convert content-type to wide characters");
+ git_error_set(GIT_ERROR_OS, "failed to convert content-type to wide characters");
goto on_error;
}
if (!WinHttpAddRequestHeaders(s->request, ct, (ULONG)-1L,
WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE)) {
- giterr_set(GITERR_OS, "failed to add a header to the request");
+ git_error_set(GIT_ERROR_OS, "failed to add a header to the request");
goto on_error;
}
goto on_error;
if (git__utf8_to_16(ct, MAX_CONTENT_TYPE_LEN, git_buf_cstr(&buf)) < 0) {
- giterr_set(GITERR_OS, "failed to convert accept header to wide characters");
+ git_error_set(GIT_ERROR_OS, "failed to convert accept header to wide characters");
goto on_error;
}
if (!WinHttpAddRequestHeaders(s->request, ct, (ULONG)-1L,
WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE)) {
- giterr_set(GITERR_OS, "failed to add a header to the request");
+ git_error_set(GIT_ERROR_OS, "failed to add a header to the request");
goto on_error;
}
}
git_buf_clear(&buf);
git_buf_puts(&buf, t->owner->custom_headers.strings[i]);
if (git__utf8_to_16(ct, MAX_CONTENT_TYPE_LEN, git_buf_cstr(&buf)) < 0) {
- giterr_set(GITERR_OS, "failed to convert custom header to wide characters");
+ git_error_set(GIT_ERROR_OS, "failed to convert custom header to wide characters");
goto on_error;
}
if (!WinHttpAddRequestHeaders(s->request, ct, (ULONG)-1L,
WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE)) {
- giterr_set(GITERR_OS, "failed to add a header to the request");
+ git_error_set(GIT_ERROR_OS, "failed to add a header to the request");
goto on_error;
}
}
winhttp_stream_close(s);
git__free(proxy_url);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return error;
}
* We can assume this was already done, since we know we are unauthorized.
*/
if (!WinHttpQueryAuthSchemes(request, &supported, &first, &target)) {
- giterr_set(GITERR_OS, "failed to parse supported auth schemes");
+ git_error_set(GIT_ERROR_OS, "failed to parse supported auth schemes");
return -1;
}
git_buf buf = GIT_BUF_INIT;
/* Chunk header */
- git_buf_printf(&buf, "%X\r\n", len);
+ git_buf_printf(&buf, "%"PRIXZ"\r\n", len);
if (git_buf_oom(&buf))
return -1;
if (!WinHttpWriteData(request,
git_buf_cstr(&buf), (DWORD)git_buf_len(&buf),
&bytes_written)) {
- git_buf_free(&buf);
- giterr_set(GITERR_OS, "failed to write chunk header");
+ git_buf_dispose(&buf);
+ git_error_set(GIT_ERROR_OS, "failed to write chunk header");
return -1;
}
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
/* Chunk body */
if (!WinHttpWriteData(request,
buffer, (DWORD)len,
&bytes_written)) {
- giterr_set(GITERR_OS, "failed to write chunk");
+ git_error_set(GIT_ERROR_OS, "failed to write chunk");
return -1;
}
if (!WinHttpWriteData(request,
"\r\n", 2,
&bytes_written)) {
- giterr_set(GITERR_OS, "failed to write chunk footer");
+ git_error_set(GIT_ERROR_OS, "failed to write chunk footer");
return -1;
}
if (t->connection) {
if (!WinHttpCloseHandle(t->connection)) {
- giterr_set(GITERR_OS, "unable to close connection");
+ git_error_set(GIT_ERROR_OS, "unable to close connection");
ret = -1;
}
if (t->session) {
if (!WinHttpCloseHandle(t->session)) {
- giterr_set(GITERR_OS, "unable to close session");
+ git_error_set(GIT_ERROR_OS, "unable to close session");
ret = -1;
}
status = *((DWORD *)info);
if ((status & WINHTTP_CALLBACK_STATUS_FLAG_CERT_CN_INVALID))
- giterr_set(GITERR_NET, "SSL certificate issued for different common name");
+ git_error_set(GIT_ERROR_NET, "SSL certificate issued for different common name");
else if ((status & WINHTTP_CALLBACK_STATUS_FLAG_CERT_DATE_INVALID))
- giterr_set(GITERR_NET, "SSL certificate has expired");
+ git_error_set(GIT_ERROR_NET, "SSL certificate has expired");
else if ((status & WINHTTP_CALLBACK_STATUS_FLAG_INVALID_CA))
- giterr_set(GITERR_NET, "SSL certificate signed by unknown CA");
+ git_error_set(GIT_ERROR_NET, "SSL certificate signed by unknown CA");
else if ((status & WINHTTP_CALLBACK_STATUS_FLAG_INVALID_CERT))
- giterr_set(GITERR_NET, "SSL certificate is invalid");
+ git_error_set(GIT_ERROR_NET, "SSL certificate is invalid");
else if ((status & WINHTTP_CALLBACK_STATUS_FLAG_CERT_REV_FAILED))
- giterr_set(GITERR_NET, "certificate revocation check failed");
+ git_error_set(GIT_ERROR_NET, "certificate revocation check failed");
else if ((status & WINHTTP_CALLBACK_STATUS_FLAG_CERT_REVOKED))
- giterr_set(GITERR_NET, "SSL certificate was revoked");
+ git_error_set(GIT_ERROR_NET, "SSL certificate was revoked");
else if ((status & WINHTTP_CALLBACK_STATUS_FLAG_SECURITY_CHANNEL_ERROR))
- giterr_set(GITERR_NET, "security libraries could not be loaded");
+ git_error_set(GIT_ERROR_NET, "security libraries could not be loaded");
else
- giterr_set(GITERR_NET, "unknown security error %d", status);
+ git_error_set(GIT_ERROR_NET, "unknown security error %lu", status);
}
static int winhttp_connect(
/* Prepare host */
if (git__utf8_to_16_alloc(&wide_host, t->connection_data.host) < 0) {
- giterr_set(GITERR_OS, "unable to convert host to wide characters");
+ git_error_set(GIT_ERROR_OS, "unable to convert host to wide characters");
return -1;
}
}
if (git__utf8_to_16_alloc(&wide_ua, git_buf_cstr(&ua)) < 0) {
- giterr_set(GITERR_OS, "unable to convert host to wide characters");
+ git_error_set(GIT_ERROR_OS, "unable to convert host to wide characters");
git__free(wide_host);
- git_buf_free(&ua);
+ git_buf_dispose(&ua);
return -1;
}
- git_buf_free(&ua);
+ git_buf_dispose(&ua);
/* Establish session */
t->session = WinHttpOpen(
0);
if (!t->session) {
- giterr_set(GITERR_OS, "failed to init WinHTTP");
+ git_error_set(GIT_ERROR_OS, "failed to init WinHTTP");
goto on_error;
}
sizeof(protocols));
if (!WinHttpSetTimeouts(t->session, default_timeout, default_connect_timeout, default_timeout, default_timeout)) {
- giterr_set(GITERR_OS, "failed to set timeouts for WinHTTP");
+ git_error_set(GIT_ERROR_OS, "failed to set timeouts for WinHTTP");
goto on_error;
}
0);
if (!t->connection) {
- giterr_set(GITERR_OS, "failed to connect to host");
+ git_error_set(GIT_ERROR_OS, "failed to connect to host");
goto on_error;
}
if (WinHttpSetStatusCallback(t->connection, winhttp_status, WINHTTP_CALLBACK_FLAG_SECURE_FAILURE, 0) == WINHTTP_INVALID_STATUS_CALLBACK) {
- giterr_set(GITERR_OS, "failed to set status callback");
+ git_error_set(GIT_ERROR_OS, "failed to set status callback");
goto on_error;
}
len, 0);
}
- if (success || GetLastError() != SEC_E_BUFFER_TOO_SMALL)
+ if (success || GetLastError() != (DWORD)SEC_E_BUFFER_TOO_SMALL)
break;
}
int request_failed = 0, cert_valid = 1, error = 0;
DWORD ignore_flags;
- giterr_clear();
+ git_error_clear();
if ((error = do_send_request(s, len, ignore_length)) < 0) {
if (GetLastError() != ERROR_WINHTTP_SECURE_FAILURE) {
- giterr_set(GITERR_OS, "failed to send request");
+ git_error_set(GIT_ERROR_OS, "failed to send request");
return -1;
}
cert_valid = 0;
}
- giterr_clear();
+ git_error_clear();
if ((error = certificate_check(s, cert_valid)) < 0) {
- if (!giterr_last())
- giterr_set(GITERR_OS, "user cancelled certificate check");
+ if (!git_error_last())
+ git_error_set(GIT_ERROR_OS, "user cancelled certificate check");
return error;
}
ignore_flags = no_check_cert_flags;
if (!WinHttpSetOption(s->request, WINHTTP_OPTION_SECURITY_FLAGS, &ignore_flags, sizeof(ignore_flags))) {
- giterr_set(GITERR_OS, "failed to set security options");
+ git_error_set(GIT_ERROR_OS, "failed to set security options");
return -1;
}
if ((error = do_send_request(s, len, ignore_length)) < 0)
- giterr_set(GITERR_OS, "failed to send request with unchecked certificate");
+ git_error_set(GIT_ERROR_OS, "failed to send request with unchecked certificate");
return error;
}
replay:
/* Enforce a reasonable cap on the number of replays */
- if (++replay_count >= 7) {
- giterr_set(GITERR_NET, "too many redirects or authentication replays");
+ if (replay_count++ >= GIT_HTTP_REPLAY_MAX) {
+ git_error_set(GIT_ERROR_NET, "too many redirects or authentication replays");
return -1;
}
if (!WinHttpWriteData(s->request,
"0\r\n\r\n", 5,
&bytes_written)) {
- giterr_set(GITERR_OS, "failed to write final chunk");
+ git_error_set(GIT_ERROR_OS, "failed to write final chunk");
return -1;
}
}
if (INVALID_SET_FILE_POINTER == SetFilePointer(s->post_body,
0, 0, FILE_BEGIN) &&
NO_ERROR != GetLastError()) {
- giterr_set(GITERR_OS, "failed to reset file pointer");
+ git_error_set(GIT_ERROR_OS, "failed to reset file pointer");
return -1;
}
&bytes_read, NULL) ||
!bytes_read) {
git__free(buffer);
- giterr_set(GITERR_OS, "failed to read from temp file");
+ git_error_set(GIT_ERROR_OS, "failed to read from temp file");
return -1;
}
if (!WinHttpWriteData(s->request, buffer,
bytes_read, &bytes_written)) {
git__free(buffer);
- giterr_set(GITERR_OS, "failed to write data");
+ git_error_set(GIT_ERROR_OS, "failed to write data");
return -1;
}
}
if (!WinHttpReceiveResponse(s->request, 0)) {
- giterr_set(GITERR_OS, "failed to receive response");
+ git_error_set(GIT_ERROR_OS, "failed to receive response");
return -1;
}
WINHTTP_HEADER_NAME_BY_INDEX,
&status_code, &status_code_length,
WINHTTP_NO_HEADER_INDEX)) {
- giterr_set(GITERR_OS, "failed to retrieve status code");
+ git_error_set(GIT_ERROR_OS, "failed to retrieve status code");
return -1;
}
&location_length,
WINHTTP_NO_HEADER_INDEX) ||
GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
- giterr_set(GITERR_OS, "failed to read Location header");
+ git_error_set(GIT_ERROR_OS, "failed to read Location header");
return -1;
}
location = git__malloc(location_length);
- GITERR_CHECK_ALLOC(location);
+ GIT_ERROR_CHECK_ALLOC(location);
if (!WinHttpQueryHeaders(s->request,
WINHTTP_QUERY_LOCATION,
location,
&location_length,
WINHTTP_NO_HEADER_INDEX)) {
- giterr_set(GITERR_OS, "failed to read Location header");
+ git_error_set(GIT_ERROR_OS, "failed to read Location header");
git__free(location);
return -1;
}
/* Convert the Location header to UTF-8 */
if (git__utf16_to_8_alloc(&location8, location) < 0) {
- giterr_set(GITERR_OS, "failed to convert Location header to UTF-8");
+ git_error_set(GIT_ERROR_OS, "failed to convert Location header to UTF-8");
git__free(location);
return -1;
}
}
if (HTTP_STATUS_OK != status_code) {
- giterr_set(GITERR_NET, "request failed with status code: %d", status_code);
+ git_error_set(GIT_ERROR_NET, "request failed with status code: %lu", status_code);
return -1;
}
p_snprintf(expected_content_type_8, MAX_CONTENT_TYPE_LEN, "application/x-git-%s-advertisement", s->service);
if (git__utf8_to_16(expected_content_type, MAX_CONTENT_TYPE_LEN, expected_content_type_8) < 0) {
- giterr_set(GITERR_OS, "failed to convert expected content-type to wide characters");
+ git_error_set(GIT_ERROR_OS, "failed to convert expected content-type to wide characters");
return -1;
}
WINHTTP_HEADER_NAME_BY_INDEX,
&content_type, &content_type_length,
WINHTTP_NO_HEADER_INDEX)) {
- giterr_set(GITERR_OS, "failed to retrieve response content-type");
+ git_error_set(GIT_ERROR_OS, "failed to retrieve response content-type");
return -1;
}
if (wcscmp(expected_content_type, content_type)) {
- giterr_set(GITERR_NET, "received unexpected content-type");
+ git_error_set(GIT_ERROR_NET, "received unexpected content-type");
return -1;
}
(DWORD)buf_size,
&dw_bytes_read))
{
- giterr_set(GITERR_OS, "failed to read data");
+ git_error_set(GIT_ERROR_OS, "failed to read data");
return -1;
}
/* This implementation of write permits only a single call. */
if (s->sent_request) {
- giterr_set(GITERR_NET, "subtransport configured for only one write");
+ git_error_set(GIT_ERROR_NET, "subtransport configured for only one write");
return -1;
}
(LPCVOID)buffer,
(DWORD)len,
&bytes_written)) {
- giterr_set(GITERR_OS, "failed to write data");
+ git_error_set(GIT_ERROR_OS, "failed to write data");
return -1;
}
if (RPC_S_OK != status &&
RPC_S_UUID_LOCAL_ONLY != status &&
RPC_S_UUID_NO_ADDRESS != status) {
- giterr_set(GITERR_NET, "unable to generate name for temp file");
+ git_error_set(GIT_ERROR_NET, "unable to generate name for temp file");
return -1;
}
if (buffer_len_cch < UUID_LENGTH_CCH + 1) {
- giterr_set(GITERR_NET, "buffer too small for name of temp file");
+ git_error_set(GIT_ERROR_NET, "buffer too small for name of temp file");
return -1;
}
uuid.Data4[4], uuid.Data4[5], uuid.Data4[6], uuid.Data4[7]);
if (result < UUID_LENGTH_CCH) {
- giterr_set(GITERR_OS, "unable to generate name for temp file");
+ git_error_set(GIT_ERROR_OS, "unable to generate name for temp file");
return -1;
}
size_t len;
if (!GetTempPathW(buffer_len_cch, buffer)) {
- giterr_set(GITERR_OS, "failed to get temp path");
+ git_error_set(GIT_ERROR_OS, "failed to get temp path");
return -1;
}
if (INVALID_HANDLE_VALUE == s->post_body) {
s->post_body = NULL;
- giterr_set(GITERR_OS, "failed to create temporary file");
+ git_error_set(GIT_ERROR_OS, "failed to create temporary file");
return -1;
}
}
if (!WriteFile(s->post_body, buffer, (DWORD)len, &bytes_written, NULL)) {
- giterr_set(GITERR_OS, "failed to write to temporary file");
+ git_error_set(GIT_ERROR_OS, "failed to write to temporary file");
return -1;
}
if (!WinHttpAddRequestHeaders(s->request,
transfer_encoding, (ULONG) -1L,
WINHTTP_ADDREQ_FLAG_ADD)) {
- giterr_set(GITERR_OS, "failed to add a header to the request");
+ git_error_set(GIT_ERROR_OS, "failed to add a header to the request");
return -1;
}
return -1;
s = git__calloc(1, sizeof(winhttp_stream));
- GITERR_CHECK_ALLOC(s);
+ GIT_ERROR_CHECK_ALLOC(s);
s->parent.subtransport = &t->parent;
s->parent.read = winhttp_stream_read;
return -1;
t = git__calloc(1, sizeof(winhttp_subtransport));
- GITERR_CHECK_ALLOC(t);
+ GIT_ERROR_CHECK_ALLOC(t);
t->owner = (transport_smart *)owner;
t->parent.action = winhttp_action;
unsigned int i;
tree->children = git_pool_malloc(pool, tree->children_count * sizeof(git_tree_cache *));
- GITERR_CHECK_ALLOC(tree->children);
+ GIT_ERROR_CHECK_ALLOC(tree->children);
memset(tree->children, 0x0, tree->children_count * sizeof(git_tree_cache *));
return 0;
corrupted:
- giterr_set(GITERR_INDEX, "corrupted TREE extension in index");
+ git_error_set(GIT_ERROR_INDEX, "corrupted TREE extension in index");
return -1;
}
return -1;
if (buffer < buffer_end) {
- giterr_set(GITERR_INDEX, "corrupted TREE extension in index (unexpected trailing data)");
+ git_error_set(GIT_ERROR_INDEX, "corrupted TREE extension in index (unexpected trailing data)");
return -1;
}
cache->children_count = ntrees;
cache->children = git_pool_mallocz(pool, ntrees * sizeof(git_tree_cache *));
- GITERR_CHECK_ALLOC(cache->children);
+ GIT_ERROR_CHECK_ALLOC(cache->children);
j = 0;
for (i = 0; i < nentries; i++) {
name_len = strlen(name);
tree = git_pool_malloc(pool, sizeof(git_tree_cache) + name_len + 1);
- GITERR_CHECK_ALLOC(tree);
+ GIT_ERROR_CHECK_ALLOC(tree);
memset(tree, 0x0, sizeof(git_tree_cache));
/* NUL-terminated tree name */
#define MAX_FILEMODE_BYTES 6
#define TREE_ENTRY_CHECK_NAMELEN(n) \
- if (n > UINT16_MAX) { giterr_set(GITERR_INVALID, "tree entry path too long"); }
+ if (n > UINT16_MAX) { git_error_set(GIT_ERROR_INVALID, "tree entry path too long"); }
static bool valid_filemode(const int filemode)
{
return entry_sort_cmp(e1, e2);
}
-int git_tree_entry_icmp(const git_tree_entry *e1, const git_tree_entry *e2)
-{
- return git_path_cmp(
- e1->filename, e1->filename_len, git_tree_entry__is_tree(e1),
- e2->filename, e2->filename_len, git_tree_entry__is_tree(e2),
- git__strncasecmp);
-}
-
/**
* Allocate a new self-contained entry, with enough space after it to
* store the filename and the id.
return entry->oid;
}
-git_otype git_tree_entry_type(const git_tree_entry *entry)
+git_object_t git_tree_entry_type(const git_tree_entry *entry)
{
assert(entry);
if (S_ISGITLINK(entry->attr))
- return GIT_OBJ_COMMIT;
+ return GIT_OBJECT_COMMIT;
else if (S_ISDIR(entry->attr))
- return GIT_OBJ_TREE;
+ return GIT_OBJECT_TREE;
else
- return GIT_OBJ_BLOB;
+ return GIT_OBJECT_BLOB;
}
int git_tree_entry_to_object(
const git_tree_entry *entry)
{
assert(entry && object_out);
- return git_object_lookup(object_out, repo, entry->oid, GIT_OBJ_ANY);
+ return git_object_lookup(object_out, repo, entry->oid, GIT_OBJECT_ANY);
}
static const git_tree_entry *entry_fromname(
return NULL;
}
-int git_tree__prefix_position(const git_tree *tree, const char *path)
-{
- struct tree_key_search ksearch;
- size_t at_pos, path_len;
-
- if (!path)
- return 0;
-
- path_len = strlen(path);
- TREE_ENTRY_CHECK_NAMELEN(path_len);
-
- ksearch.filename = path;
- ksearch.filename_len = (uint16_t)path_len;
-
- /* Find tree entry with appropriate prefix */
- git_array_search(
- &at_pos, tree->entries, &homing_search_cmp, &ksearch);
-
- for (; at_pos < tree->entries.size; ++at_pos) {
- const git_tree_entry *entry = git_array_get(tree->entries, at_pos);
- if (homing_search_cmp(&ksearch, entry) < 0)
- break;
- }
-
- for (; at_pos > 0; --at_pos) {
- const git_tree_entry *entry =
- git_array_get(tree->entries, at_pos - 1);
-
- if (homing_search_cmp(&ksearch, entry) > 0)
- break;
- }
-
- return (int)at_pos;
-}
-
size_t git_tree_entrycount(const git_tree *tree)
{
assert(tree);
static int tree_error(const char *str, const char *path)
{
if (path)
- giterr_set(GITERR_TREE, "%s - %s", str, path);
+ git_error_set(GIT_ERROR_TREE, "%s - %s", str, path);
else
- giterr_set(GITERR_TREE, "%s", str);
+ git_error_set(GIT_ERROR_TREE, "%s", str);
return -1;
}
-static int parse_mode(unsigned int *modep, const char *buffer, const char **buffer_out)
+static int parse_mode(uint16_t *mode_out, const char *buffer, size_t buffer_len, const char **buffer_out)
{
- unsigned char c;
- unsigned int mode = 0;
+ int32_t mode;
+ int error;
- if (*buffer == ' ')
+ if (!buffer_len || git__isspace(*buffer))
return -1;
- while ((c = *buffer++) != ' ') {
- if (c < '0' || c > '7')
- return -1;
- mode = (mode << 3) + (c - '0');
- }
- *modep = mode;
- *buffer_out = buffer;
+ if ((error = git__strntol32(&mode, buffer, buffer_len, buffer_out, 8)) < 0)
+ return error;
+
+ if (mode < 0 || mode > UINT16_MAX)
+ return -1;
+
+ *mode_out = mode;
return 0;
}
-int git_tree__parse(void *_tree, git_odb_object *odb_obj)
+int git_tree__parse_raw(void *_tree, const char *data, size_t size)
{
git_tree *tree = _tree;
const char *buffer;
const char *buffer_end;
- if (git_odb_object_dup(&tree->odb_obj, odb_obj) < 0)
- return -1;
-
- buffer = git_odb_object_data(tree->odb_obj);
- buffer_end = buffer + git_odb_object_size(tree->odb_obj);
+ buffer = data;
+ buffer_end = buffer + size;
+ tree->odb_obj = NULL;
git_array_init_to_size(tree->entries, DEFAULT_TREE_SIZE);
- GITERR_CHECK_ARRAY(tree->entries);
+ GIT_ERROR_CHECK_ARRAY(tree->entries);
while (buffer < buffer_end) {
git_tree_entry *entry;
size_t filename_len;
const char *nul;
- unsigned int attr;
+ uint16_t attr;
- if (parse_mode(&attr, buffer, &buffer) < 0 || !buffer)
+ if (parse_mode(&attr, buffer, buffer_end - buffer, &buffer) < 0 || !buffer)
return tree_error("failed to parse tree: can't parse filemode", NULL);
+ if (buffer >= buffer_end || (*buffer++) != ' ')
+ return tree_error("failed to parse tree: missing space after filemode", NULL);
+
if ((nul = memchr(buffer, 0, buffer_end - buffer)) == NULL)
return tree_error("failed to parse tree: object is corrupted", NULL);
- if ((filename_len = nul - buffer) == 0)
+ if ((filename_len = nul - buffer) == 0 || filename_len > UINT16_MAX)
return tree_error("failed to parse tree: can't parse filename", NULL);
if ((buffer_end - (nul + 1)) < GIT_OID_RAWSZ)
/* Allocate the entry */
{
entry = git_array_alloc(tree->entries);
- GITERR_CHECK_ALLOC(entry);
+ GIT_ERROR_CHECK_ALLOC(entry);
entry->attr = attr;
- entry->filename_len = filename_len;
+ entry->filename_len = (uint16_t)filename_len;
entry->filename = buffer;
entry->oid = (git_oid *) ((char *) buffer + filename_len + 1);
}
return 0;
}
+int git_tree__parse(void *_tree, git_odb_object *odb_obj)
+{
+ git_tree *tree = _tree;
+
+ if ((git_tree__parse_raw(tree,
+ git_odb_object_data(odb_obj),
+ git_odb_object_size(odb_obj))) < 0)
+ return -1;
+
+ if (git_odb_object_dup(&tree->odb_obj, odb_obj) < 0)
+ return -1;
+
+ return 0;
+}
+
static size_t find_next_dir(const char *dirname, git_index *index, size_t start)
{
size_t dirlen, i, entries = git_index_entrycount(index);
return i;
}
+static git_object_t otype_from_mode(git_filemode_t filemode)
+{
+ switch (filemode) {
+ case GIT_FILEMODE_TREE:
+ return GIT_OBJECT_TREE;
+ case GIT_FILEMODE_COMMIT:
+ return GIT_OBJECT_COMMIT;
+ default:
+ return GIT_OBJECT_BLOB;
+ }
+}
+
+static int check_entry(git_repository *repo, const char *filename, const git_oid *id, git_filemode_t filemode)
+{
+ if (!valid_filemode(filemode))
+ return tree_error("failed to insert entry: invalid filemode for file", filename);
+
+ if (!valid_entry_name(repo, filename))
+ return tree_error("failed to insert entry: invalid name for a tree entry", filename);
+
+ if (git_oid_iszero(id))
+ return tree_error("failed to insert entry: invalid null OID", filename);
+
+ if (filemode != GIT_FILEMODE_COMMIT &&
+ !git_object__is_valid(repo, id, otype_from_mode(filemode)))
+ return tree_error("failed to insert entry: invalid object specified", filename);
+
+ return 0;
+}
+
static int append_entry(
git_treebuilder *bld,
const char *filename,
git_tree_entry *entry;
int error = 0;
- if (validate && !valid_entry_name(bld->repo, filename))
- return tree_error("failed to insert entry: invalid name for a tree entry", filename);
-
- if (validate && git_oid_iszero(id))
- return tree_error("failed to insert entry: invalid null OID for a tree entry", filename);
+ if (validate && ((error = check_entry(bld->repo, filename, id, filemode)) < 0))
+ return error;
entry = alloc_entry(filename, strlen(filename), id);
- GITERR_CHECK_ALLOC(entry);
+ GIT_ERROR_CHECK_ALLOC(entry);
entry->attr = (uint16_t)filemode;
git_strmap_insert(bld->map, entry->filename, entry, &error);
if (error < 0) {
git_tree_entry_free(entry);
- giterr_set(GITERR_TREE, "failed to append entry %s to the tree builder", filename);
+ git_error_set(GIT_ERROR_TREE, "failed to append entry %s to the tree builder", filename);
return -1;
}
char *subdir, *last_comp;
subdir = git__strndup(entry->path, next_slash - entry->path);
- GITERR_CHECK_ALLOC(subdir);
+ GIT_ERROR_CHECK_ALLOC(subdir);
/* Write out the subtree */
written = write_tree(&sub_oid, repo, index, subdir, i, shared_buf);
assert(oid && index && repo);
if (git_index_has_conflicts(index)) {
- giterr_set(GITERR_INDEX,
+ git_error_set(GIT_ERROR_INDEX,
"cannot create a tree from a not fully merged index.");
return GIT_EUNMERGED;
}
}
ret = write_tree(oid, repo, index, "", 0, &shared_buf);
- git_buf_free(&shared_buf);
+ git_buf_dispose(&shared_buf);
if (old_ignore_case)
git_index__set_ignore_case(index, true);
assert(builder_p && repo);
bld = git__calloc(1, sizeof(git_treebuilder));
- GITERR_CHECK_ALLOC(bld);
+ GIT_ERROR_CHECK_ALLOC(bld);
bld->repo = repo;
return -1;
}
-static git_otype otype_from_mode(git_filemode_t filemode)
-{
- switch (filemode) {
- case GIT_FILEMODE_TREE:
- return GIT_OBJ_TREE;
- case GIT_FILEMODE_COMMIT:
- return GIT_OBJ_COMMIT;
- default:
- return GIT_OBJ_BLOB;
- }
-}
-
int git_treebuilder_insert(
const git_tree_entry **entry_out,
git_treebuilder *bld,
{
git_tree_entry *entry;
int error;
- git_strmap_iter pos;
+ size_t pos;
assert(bld && id && filename);
- if (!valid_filemode(filemode))
- return tree_error("failed to insert entry: invalid filemode for file", filename);
-
- if (!valid_entry_name(bld->repo, filename))
- return tree_error("failed to insert entry: invalid name for a tree entry", filename);
-
- if (git_oid_iszero(id))
- return tree_error("failed to insert entry: invalid null OID", filename);
-
- if (filemode != GIT_FILEMODE_COMMIT &&
- !git_object__is_valid(bld->repo, id, otype_from_mode(filemode)))
- return tree_error("failed to insert entry: invalid object specified", filename);
+ if ((error = check_entry(bld->repo, filename, id, filemode)) < 0)
+ return error;
pos = git_strmap_lookup_index(bld->map, filename);
if (git_strmap_valid_index(bld->map, pos)) {
git_oid_cpy((git_oid *) entry->oid, id);
} else {
entry = alloc_entry(filename, strlen(filename), id);
- GITERR_CHECK_ALLOC(entry);
+ GIT_ERROR_CHECK_ALLOC(entry);
git_strmap_insert(bld->map, entry->filename, entry, &error);
if (error < 0) {
git_tree_entry_free(entry);
- giterr_set(GITERR_TREE, "failed to insert %s", filename);
+ git_error_set(GIT_ERROR_TREE, "failed to insert %s", filename);
return -1;
}
}
static git_tree_entry *treebuilder_get(git_treebuilder *bld, const char *filename)
{
git_tree_entry *entry = NULL;
- git_strmap_iter pos;
+ size_t pos;
assert(bld && filename);
error = git_treebuilder_write_with_buffer(oid, bld, &buffer);
- git_buf_free(&buffer);
+ git_buf_dispose(&buffer);
return error;
}
}
if ((error = git_repository_odb__weakptr(&odb, bld->repo)) == 0)
- error = git_odb_write(oid, odb, tree->ptr, tree->size, GIT_OBJ_TREE);
+ error = git_odb_write(oid, odb, tree->ptr, tree->size, GIT_OBJECT_TREE);
out:
git_vector_free(&entries);
filename_len = subpath_len(path);
if (filename_len == 0) {
- giterr_set(GITERR_TREE, "invalid tree path given");
+ git_error_set(GIT_ERROR_TREE, "invalid tree path given");
return GIT_ENOTFOUND;
}
entry = entry_fromname(root, path, filename_len);
if (entry == NULL) {
- giterr_set(GITERR_TREE,
+ git_error_set(GIT_ERROR_TREE,
"the path '%.*s' does not exist in the given tree", (int) filename_len, path);
return GIT_ENOTFOUND;
}
/* If there are more components in the path...
* then this entry *must* be a tree */
if (!git_tree_entry__is_tree(entry)) {
- giterr_set(GITERR_TREE,
+ git_error_set(GIT_ERROR_TREE,
"the path '%.*s' exists but is not a tree", (int) filename_len, path);
return GIT_ENOTFOUND;
}
if (preorder) {
error = callback(path->ptr, entry, payload);
if (error < 0) { /* negative value stops iteration */
- giterr_set_after_callback_function(error, "git_tree_walk");
+ git_error_set_after_callback_function(error, "git_tree_walk");
break;
}
if (error > 0) { /* positive value skips this entry */
if (!preorder) {
error = callback(path->ptr, entry, payload);
if (error < 0) { /* negative value stops iteration */
- giterr_set_after_callback_function(error, "git_tree_walk");
+ git_error_set_after_callback_function(error, "git_tree_walk");
break;
}
error = 0;
git_buf root_path = GIT_BUF_INIT;
if (mode != GIT_TREEWALK_POST && mode != GIT_TREEWALK_PRE) {
- giterr_set(GITERR_INVALID, "invalid walking mode for tree walk");
+ git_error_set(GIT_ERROR_INVALID, "invalid walking mode for tree walk");
return -1;
}
error = tree_walk(
tree, callback, &root_path, payload, (mode == GIT_TREEWALK_PRE));
- git_buf_free(&root_path);
+ git_buf_dispose(&root_path);
return error;
}
{
GIT_UNUSED(old); GIT_UNUSED(new);
- giterr_set(GITERR_TREE, "duplicate entries given for update");
+ git_error_set(GIT_ERROR_TREE, "duplicate entries given for update");
return -1;
}
git_buf_puts(component, popped->name);
git__free(popped->name);
- GITERR_CHECK_ALLOC(component->ptr);
+ GIT_ERROR_CHECK_ALLOC(component->ptr);
/* Error out if this would create a D/F conflict in this update */
if (current->tree) {
const git_tree_entry *to_replace;
to_replace = git_tree_entry_byname(current->tree, component->ptr);
- if (to_replace && git_tree_entry_type(to_replace) != GIT_OBJ_TREE) {
- giterr_set(GITERR_TREE, "D/F conflict when updating tree");
+ if (to_replace && git_tree_entry_type(to_replace) != GIT_OBJECT_TREE) {
+ git_error_set(GIT_ERROR_TREE, "D/F conflict when updating tree");
return -1;
}
}
}
root_elem = git_array_alloc(stack);
- GITERR_CHECK_ALLOC(root_elem);
+ GIT_ERROR_CHECK_ALLOC(root_elem);
memset(root_elem, 0, sizeof(*root_elem));
if (baseline && (error = git_tree_dup(&root_elem->tree, baseline)) < 0)
if (!entry)
entry = treebuilder_get(last->bld, component.ptr);
- if (entry && git_tree_entry_type(entry) != GIT_OBJ_TREE) {
- giterr_set(GITERR_TREE, "D/F conflict when updating tree");
+ if (entry && git_tree_entry_type(entry) != GIT_OBJECT_TREE) {
+ git_error_set(GIT_ERROR_TREE, "D/F conflict when updating tree");
error = -1;
goto cleanup;
}
new_entry = git_array_alloc(stack);
- GITERR_CHECK_ALLOC(new_entry);
+ GIT_ERROR_CHECK_ALLOC(new_entry);
memset(new_entry, 0, sizeof(*new_entry));
new_entry->tree = NULL;
goto cleanup;
new_entry->name = git__strdup(component.ptr);
- GITERR_CHECK_ALLOC(new_entry->name);
+ GIT_ERROR_CHECK_ALLOC(new_entry->name);
/* Get to the start of the next component */
path += component.size + 1;
const git_tree_entry *e = git_treebuilder_get(last->bld, basename);
if (e && git_tree_entry_type(e) != git_object__type_from_filemode(update->filemode)) {
git__free(basename);
- giterr_set(GITERR_TREE, "cannot replace '%s' with '%s' at '%s'",
+ git_error_set(GIT_ERROR_TREE, "cannot replace '%s' with '%s' at '%s'",
git_object_type2string(git_tree_entry_type(e)),
git_object_type2string(git_object__type_from_filemode(update->filemode)),
update->path);
break;
}
default:
- giterr_set(GITERR_TREE, "unknown action for update");
+ git_error_set(GIT_ERROR_TREE, "unknown action for update");
error = -1;
goto cleanup;
}
}
}
- git_buf_free(&component);
+ git_buf_dispose(&component);
git_array_clear(stack);
git_vector_free(&entries);
return error;
return (S_ISDIR(e->attr) && !S_ISGITLINK(e->attr));
}
-extern int git_tree_entry_icmp(const git_tree_entry *e1, const git_tree_entry *e2);
-
void git_tree__free(void *tree);
int git_tree__parse(void *tree, git_odb_object *obj);
-
-/**
- * Lookup the first position in the tree with a given prefix.
- *
- * @param tree a previously loaded tree.
- * @param prefix the beginning of a path to find in the tree.
- * @return index of the first item at or after the given prefix.
- */
-int git_tree__prefix_position(const git_tree *tree, const char *prefix);
-
+int git_tree__parse_raw(void *_tree, const char *data, size_t size);
/**
* Write a tree to the given repository
{
long sc_page_size = sysconf(_SC_PAGE_SIZE);
if (sc_page_size < 0) {
- giterr_set(GITERR_OS, "can't determine system page size");
+ git_error_set(GIT_ERROR_OS, "can't determine system page size");
return -1;
}
*page_size = (size_t) sc_page_size;
out->data = mmap(NULL, len, mprot, mflag, fd, offset);
if (!out->data || out->data == MAP_FAILED) {
- giterr_set(GITERR_OS, "failed to mmap. Could not write data");
+ git_error_set(GIT_ERROR_OS, "failed to mmap. Could not write data");
return -1;
}
return 0;
tgt->strings = git__calloc(src->count, sizeof(char *));
- GITERR_CHECK_ALLOC(tgt->strings);
+ GIT_ERROR_CHECK_ALLOC(tgt->strings);
for (i = 0; i < src->count; ++i) {
if (!src->strings[i])
/*
* White space
*/
- while (git__isspace(*p))
- p++;
+ while (nptr_len && git__isspace(*p))
+ p++, nptr_len--;
+
+ if (!nptr_len)
+ goto Return;
/*
* Sign
*/
- if (*p == '-' || *p == '+')
- if (*p++ == '-')
+ if (*p == '-' || *p == '+') {
+ if (*p == '-')
neg = 1;
+ p++;
+ nptr_len--;
+ }
+
+ if (!nptr_len)
+ goto Return;
/*
- * Base
+ * Automatically detect the base if none was given to us.
+ * Right now, we assume that a number starting with '0x'
+ * is hexadecimal and a number starting with '0' is
+ * octal.
*/
if (base == 0) {
if (*p != '0')
base = 10;
- else {
+ else if (nptr_len > 2 && (p[1] == 'x' || p[1] == 'X'))
+ base = 16;
+ else
base = 8;
- if (p[1] == 'x' || p[1] == 'X') {
- p += 2;
- base = 16;
- }
- }
- } else if (base == 16 && *p == '0') {
- if (p[1] == 'x' || p[1] == 'X')
- p += 2;
- } else if (base < 0 || 36 < base)
+ }
+
+ if (base < 0 || 36 < base)
goto Return;
+ /*
+ * Skip prefix of '0x'-prefixed hexadecimal numbers. There is no
+ * need to do the same for '0'-prefixed octal numbers as a
+ * leading '0' does not have any impact. Also, if we skip a
+ * leading '0' in such a string, then we may end up with no
+ * digits left and produce an error later on which isn't one.
+ */
+ if (base == 16 && nptr_len > 2 && p[0] == '0' && (p[1] == 'x' || p[1] == 'X')) {
+ p += 2;
+ nptr_len -= 2;
+ }
+
/*
* Non-empty sequence of digits
*/
Return:
if (ndig == 0) {
- giterr_set(GITERR_INVALID, "failed to convert string to long: not a number");
+ git_error_set(GIT_ERROR_INVALID, "failed to convert string to long: not a number");
return -1;
}
*endptr = p;
if (ovfl) {
- giterr_set(GITERR_INVALID, "failed to convert string to long: overflow error");
+ git_error_set(GIT_ERROR_INVALID, "failed to convert string to long: overflow error");
return -1;
}
tmp_int = tmp_long & 0xFFFFFFFF;
if (tmp_int != tmp_long) {
int len = tmp_endptr - nptr;
- giterr_set(GITERR_INVALID, "failed to convert: '%.*s' is too large", len, nptr);
+ git_error_set(GIT_ERROR_INVALID, "failed to convert: '%.*s' is too large", len, nptr);
return -1;
}
return git__timer();
}
+size_t git__utf8_valid_buf_length(const uint8_t *str, size_t str_len)
+{
+ size_t offset = 0;
+
+ while (offset < str_len) {
+ int length = git__utf8_charlen(str + offset, str_len - offset);
+
+ if (length < 0)
+ break;
+
+ offset += length;
+ }
+
+ return offset;
+}
+
#ifdef GIT_WIN32
int git__getenv(git_buf *out, const char *name)
{
if ((value_len = GetEnvironmentVariableW(wide_name, NULL, 0)) > 0) {
wide_value = git__malloc(value_len * sizeof(wchar_t));
- GITERR_CHECK_ALLOC(wide_value);
+ GIT_ERROR_CHECK_ALLOC(wide_value);
value_len = GetEnvironmentVariableW(wide_name, wide_value, value_len);
}
else if (GetLastError() == ERROR_ENVVAR_NOT_FOUND)
error = GIT_ENOTFOUND;
else
- giterr_set(GITERR_OS, "could not read environment variable '%s'", name);
+ git_error_set(GIT_ERROR_OS, "could not read environment variable '%s'", name);
git__free(wide_name);
git__free(wide_value);
*/
#define CONST_STRLEN(x) ((sizeof(x)/sizeof(x[0])) - 1)
-#if defined(GIT_MSVC_CRTDBG)
-
-/* Enable MSVC CRTDBG memory leak reporting.
- *
- * We DO NOT use the "_CRTDBG_MAP_ALLOC" macro described in the MSVC
- * documentation because all allocs/frees in libgit2 already go through
- * the "git__" routines defined in this file. Simply using the normal
- * reporting mechanism causes all leaks to be attributed to a routine
- * here in util.h (ie, the actual call to calloc()) rather than the
- * caller of git__calloc().
- *
- * Therefore, we declare a set of "git__crtdbg__" routines to replace
- * the corresponding "git__" routines and re-define the "git__" symbols
- * as macros. This allows us to get and report the file:line info of
- * the real caller.
- *
- * We DO NOT replace the "git__free" routine because it needs to remain
- * a function pointer because it is used as a function argument when
- * setting up various structure "destructors".
- *
- * We also DO NOT use the "_CRTDBG_MAP_ALLOC" macro because it causes
- * "free" to be remapped to "_free_dbg" and this causes problems for
- * structures which define a field named "free".
- *
- * Finally, CRTDBG must be explicitly enabled and configured at program
- * startup. See tests/main.c for an example.
- */
-
-#include "win32/w32_crtdbg_stacktrace.h"
-
-#define git__malloc(len) git__crtdbg__malloc(len, __FILE__, __LINE__)
-#define git__calloc(nelem, elsize) git__crtdbg__calloc(nelem, elsize, __FILE__, __LINE__)
-#define git__strdup(str) git__crtdbg__strdup(str, __FILE__, __LINE__)
-#define git__strndup(str, n) git__crtdbg__strndup(str, n, __FILE__, __LINE__)
-#define git__substrdup(str, n) git__crtdbg__substrdup(str, n, __FILE__, __LINE__)
-#define git__realloc(ptr, size) git__crtdbg__realloc(ptr, size, __FILE__, __LINE__)
-#define git__reallocarray(ptr, nelem, elsize) git__crtdbg__reallocarray(ptr, nelem, elsize, __FILE__, __LINE__)
-#define git__mallocarray(nelem, elsize) git__crtdbg__mallocarray(nelem, elsize, __FILE__, __LINE__)
-
-#else
-
-/*
- * Custom memory allocation wrappers
- * that set error code and error message
- * on allocation failure
- */
-GIT_INLINE(void *) git__malloc(size_t len)
-{
- void *ptr = malloc(len);
- if (!ptr) giterr_set_oom();
- return ptr;
-}
-
-GIT_INLINE(void *) git__calloc(size_t nelem, size_t elsize)
-{
- void *ptr = calloc(nelem, elsize);
- if (!ptr) giterr_set_oom();
- return ptr;
-}
-
-GIT_INLINE(char *) git__strdup(const char *str)
-{
- char *ptr = strdup(str);
- if (!ptr) giterr_set_oom();
- return ptr;
-}
-
-GIT_INLINE(char *) git__strndup(const char *str, size_t n)
-{
- size_t length = 0, alloclength;
- char *ptr;
-
- length = p_strnlen(str, n);
-
- if (GIT_ADD_SIZET_OVERFLOW(&alloclength, length, 1) ||
- !(ptr = git__malloc(alloclength)))
- return NULL;
-
- if (length)
- memcpy(ptr, str, length);
-
- ptr[length] = '\0';
-
- return ptr;
-}
-
-/* NOTE: This doesn't do null or '\0' checking. Watch those boundaries! */
-GIT_INLINE(char *) git__substrdup(const char *start, size_t n)
-{
- char *ptr;
- size_t alloclen;
-
- if (GIT_ADD_SIZET_OVERFLOW(&alloclen, n, 1) ||
- !(ptr = git__malloc(alloclen)))
- return NULL;
-
- memcpy(ptr, start, n);
- ptr[n] = '\0';
- return ptr;
-}
-
-GIT_INLINE(void *) git__realloc(void *ptr, size_t size)
-{
- void *new_ptr = realloc(ptr, size);
- if (!new_ptr) giterr_set_oom();
- return new_ptr;
-}
-
-/**
- * Similar to `git__realloc`, except that it is suitable for reallocing an
- * array to a new number of elements of `nelem`, each of size `elsize`.
- * The total size calculation is checked for overflow.
- */
-GIT_INLINE(void *) git__reallocarray(void *ptr, size_t nelem, size_t elsize)
-{
- size_t newsize;
- return GIT_MULTIPLY_SIZET_OVERFLOW(&newsize, nelem, elsize) ?
- NULL : realloc(ptr, newsize);
-}
-
-/**
- * Similar to `git__calloc`, except that it does not zero memory.
- */
-GIT_INLINE(void *) git__mallocarray(size_t nelem, size_t elsize)
-{
- return git__reallocarray(NULL, nelem, elsize);
-}
-
-#endif /* !MSVC_CTRDBG */
-
-GIT_INLINE(void) git__free(void *ptr)
-{
- free(ptr);
-}
-
#define STRCMP_CASESELECT(IGNORE_CASE, STR1, STR2) \
((IGNORE_CASE) ? strcasecmp((STR1), (STR2)) : strcmp((STR1), (STR2)))
*/
extern int git__utf8_iterate(const uint8_t *str, int str_len, int32_t *dst);
+/*
+ * Iterate through an UTF-8 string and stops after finding any invalid UTF-8
+ * codepoints.
+ *
+ * @param str string to scan
+ * @param str_len size of the string
+ * @return length in bytes of the string that contains valid data
+ */
+extern size_t git__utf8_valid_buf_length(const uint8_t *str, size_t str_len);
+
/*
* Safely zero-out memory, making sure that the compiler
* doesn't optimize away the operation.
extern int git__getenv(git_buf *out, const char *name);
+#include "alloc.h"
+
#endif
return 0;
new_contents = git__reallocarray(v->contents, new_size, sizeof(void *));
- GITERR_CHECK_ALLOC(new_contents);
+ GIT_ERROR_CHECK_ALLOC(new_contents);
v->_alloc_size = new_size;
v->contents = new_contents;
if (src->length) {
size_t bytes;
- GITERR_CHECK_ALLOC_MULTIPLY(&bytes, src->length, sizeof(void *));
+ GIT_ERROR_CHECK_ALLOC_MULTIPLY(&bytes, src->length, sizeof(void *));
v->contents = git__malloc(bytes);
- GITERR_CHECK_ALLOC(v->contents);
+ GIT_ERROR_CHECK_ALLOC(v->contents);
v->_alloc_size = src->length;
memcpy(v->contents, src->contents, bytes);
}
assert(insert_len > 0 && idx <= v->length);
- GITERR_CHECK_ALLOC_ADD(&new_length, v->length, insert_len);
+ GIT_ERROR_CHECK_ALLOC_ADD(&new_length, v->length, insert_len);
if (new_length > v->_alloc_size && resize_vector(v, new_length) < 0)
return -1;
new->h = FindFirstFileW(filter_w, &new->f);
if (new->h == INVALID_HANDLE_VALUE) {
- giterr_set(GITERR_OS, "could not open directory '%s'", dir);
+ git_error_set(GIT_ERROR_OS, "could not open directory '%s'", dir);
git__free(new);
return NULL;
}
else if (!FindNextFileW(d->h, &d->f)) {
if (GetLastError() == ERROR_NO_MORE_FILES)
return 0;
- giterr_set(GITERR_OS, "could not read from directory '%s'", d->dir);
+ git_error_set(GIT_ERROR_OS, "could not read from directory '%s'", d->dir);
return -1;
}
d->h = FindFirstFileW(filter_w, &d->f);
if (d->h == INVALID_HANDLE_VALUE)
- giterr_set(GITERR_OS, "could not open directory '%s'", d->dir);
+ git_error_set(GIT_ERROR_OS, "could not open directory '%s'", d->dir);
else
d->first = 1;
}
git_win32_utf8_path utf8_path;
if (git_win32_path_to_utf8(utf8_path, src) < 0) {
- giterr_set(GITERR_OS, "unable to convert path to UTF-8");
+ git_error_set(GIT_ERROR_OS, "unable to convert path to UTF-8");
return -1;
}
}
}
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return (git_buf_oom(out) ? -1 : 0);
}
&buf, HKEY_LOCAL_MACHINE, REG_MSYSGIT_INSTALL, subdir) && buf.size)
git_buf_join(out, GIT_PATH_LIST_SEPARATOR, out->ptr, buf.ptr);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return (git_buf_oom(out) ? -1 : 0);
}
if (fh == INVALID_HANDLE_VALUE) {
errno = EBADF;
- giterr_set(GITERR_OS, "failed to mmap. Invalid handle value");
+ git_error_set(GIT_ERROR_OS, "failed to mmap. Invalid handle value");
return -1;
}
if (page_offset != 0) { /* offset must be multiple of the allocation granularity */
errno = EINVAL;
- giterr_set(GITERR_OS, "failed to mmap. Offset must be multiple of allocation granularity");
+ git_error_set(GIT_ERROR_OS, "failed to mmap. Offset must be multiple of allocation granularity");
return -1;
}
out->fmh = CreateFileMapping(fh, NULL, fmap_prot, 0, 0, NULL);
if (!out->fmh || out->fmh == INVALID_HANDLE_VALUE) {
- giterr_set(GITERR_OS, "failed to mmap. Invalid handle value");
+ git_error_set(GIT_ERROR_OS, "failed to mmap. Invalid handle value");
out->fmh = NULL;
return -1;
}
off_hi = (DWORD)(page_start >> 32);
out->data = MapViewOfFile(out->fmh, view_prot, off_hi, off_low, len);
if (!out->data) {
- giterr_set(GITERR_OS, "failed to mmap. No data written");
+ git_error_set(GIT_ERROR_OS, "failed to mmap. No data written");
CloseHandle(out->fmh);
out->fmh = NULL;
return -1;
if (map->data) {
if (!UnmapViewOfFile(map->data)) {
- giterr_set(GITERR_OS, "failed to munmap. Could not unmap view of file");
+ git_error_set(GIT_ERROR_OS, "failed to munmap. Could not unmap view of file");
error = -1;
}
map->data = NULL;
if (map->fmh) {
if (!CloseHandle(map->fmh)) {
- giterr_set(GITERR_OS, "failed to munmap. Could not close handle");
+ git_error_set(GIT_ERROR_OS, "failed to munmap. Could not close handle");
error = -1;
}
map->fmh = NULL;
typedef unsigned short mode_t;
typedef SSIZE_T ssize_t;
+#ifdef _WIN64
+# define SSIZE_MAX _I64_MAX
+#else
+# define SSIZE_MAX LONG_MAX
+#endif
+
#define strcasecmp(s1, s2) _stricmp(s1, s2)
#define strncasecmp(s1, s2, c) _strnicmp(s1, s2, c)
goto on_error;
}
- /* Skip the drive letter specification ("C:") */
+ /* Skip the drive letter specification ("C:") */
if (git__utf8_to_16(dest + 2, MAX_PATH - 2, src) < 0)
goto on_error;
}
}
/* On success, returns the length, in characters, of the path stored in dest.
-* On failure, returns a negative value. */
+ * On failure, returns a negative value. */
int git_win32_path_readlink_w(git_win32_path dest, const git_win32_path path)
{
BYTE buf[MAXIMUM_REPARSE_DATA_BUFFER_SIZE];
if (path_is_volume(target, target_len)) {
/* This path is a reparse point that represents another volume mounted
- * at this location, it is not a symbolic link our input was canonical.
- */
+ * at this location, it is not a symbolic link our input was canonical.
+ */
errno = EINVAL;
error = -1;
} else if (target_len) {
- /* The path may need to have a prefix removed. */
- target_len = git_win32__canonicalize_path(target, target_len);
+ /* The path may need to have a namespace prefix removed. */
+ target_len = git_win32_path_remove_namespace(target, target_len);
/* Need one additional character in the target buffer
- * for the terminating NULL. */
+ * for the terminating NULL. */
if (GIT_WIN_PATH_UTF16 > target_len) {
wcscpy(dest, target);
error = (int)target_len;
CloseHandle(handle);
return error;
}
+
+/**
+ * Removes any trailing backslashes from a path, except in the case of a drive
+ * letter path (C:\, D:\, etc.). This function cannot fail.
+ *
+ * @param path The path which should be trimmed.
+ * @return The length of the modified string (<= the input length)
+ */
+size_t git_win32_path_trim_end(wchar_t *str, size_t len)
+{
+ while (1) {
+ if (!len || str[len - 1] != L'\\')
+ break;
+
+ /*
+ * Don't trim backslashes from drive letter paths, which
+ * are 3 characters long and of the form C:\, D:\, etc.
+ */
+ if (len == 3 && git_win32__isalpha(str[0]) && str[1] == ':')
+ break;
+
+ len--;
+ }
+
+ str[len] = L'\0';
+
+ return len;
+}
+
+/**
+ * Removes any of the following namespace prefixes from a path,
+ * if found: "\??\", "\\?\", "\\?\UNC\". This function cannot fail.
+ *
+ * @param path The path which should be converted.
+ * @return The length of the modified string (<= the input length)
+ */
+size_t git_win32_path_remove_namespace(wchar_t *str, size_t len)
+{
+ static const wchar_t dosdevices_namespace[] = L"\\\?\?\\";
+ static const wchar_t nt_namespace[] = L"\\\\?\\";
+ static const wchar_t unc_namespace_remainder[] = L"UNC\\";
+ static const wchar_t unc_prefix[] = L"\\\\";
+
+ const wchar_t *prefix = NULL, *remainder = NULL;
+ size_t prefix_len = 0, remainder_len = 0;
+
+ /* "\??\" -- DOS Devices prefix */
+ if (len >= CONST_STRLEN(dosdevices_namespace) &&
+ !wcsncmp(str, dosdevices_namespace, CONST_STRLEN(dosdevices_namespace))) {
+ remainder = str + CONST_STRLEN(dosdevices_namespace);
+ remainder_len = len - CONST_STRLEN(dosdevices_namespace);
+ }
+ /* "\\?\" -- NT namespace prefix */
+ else if (len >= CONST_STRLEN(nt_namespace) &&
+ !wcsncmp(str, nt_namespace, CONST_STRLEN(nt_namespace))) {
+ remainder = str + CONST_STRLEN(nt_namespace);
+ remainder_len = len - CONST_STRLEN(nt_namespace);
+ }
+
+ /* "\??\UNC\", "\\?\UNC\" -- UNC prefix */
+ if (remainder_len >= CONST_STRLEN(unc_namespace_remainder) &&
+ !wcsncmp(remainder, unc_namespace_remainder, CONST_STRLEN(unc_namespace_remainder))) {
+
+ /*
+ * The proper Win32 path for a UNC share has "\\" at beginning of it
+ * and looks like "\\server\share\<folderStructure>". So remove the
+ * UNC namespace and add a prefix of "\\" in its place.
+ */
+ remainder += CONST_STRLEN(unc_namespace_remainder);
+ remainder_len -= CONST_STRLEN(unc_namespace_remainder);
+
+ prefix = unc_prefix;
+ prefix_len = CONST_STRLEN(unc_prefix);
+ }
+
+ if (remainder) {
+ /*
+ * Sanity check that the new string isn't longer than the old one.
+ * (This could only happen due to programmer error introducing a
+ * prefix longer than the namespace it replaces.)
+ */
+ assert(len >= remainder_len + prefix_len);
+
+ if (prefix)
+ memmove(str, prefix, prefix_len * sizeof(wchar_t));
+
+ memmove(str + prefix_len, remainder, remainder_len * sizeof(wchar_t));
+
+ len = remainder_len + prefix_len;
+ str[len] = L'\0';
+ }
+
+ return git_win32_path_trim_end(str, len);
+}
extern int git_win32_path_readlink_w(git_win32_path dest, const git_win32_path path);
+/**
+ * Removes any trailing backslashes from a path, except in the case of a drive
+ * letter path (C:\, D:\, etc.). This function cannot fail.
+ *
+ * @param path The path which should be trimmed.
+ * @return The length of the modified string (<= the input length)
+ */
+size_t git_win32_path_trim_end(wchar_t *str, size_t len);
+
+/**
+ * Removes any of the following namespace prefixes from a path,
+ * if found: "\??\", "\\?\", "\\?\UNC\". This function cannot fail.
+ *
+ * @param path The path which should be converted.
+ * @return The length of the modified string (<= the input length)
+ */
+size_t git_win32_path_remove_namespace(wchar_t *str, size_t len);
+
#endif
#define IO_REPARSE_TAG_SYMLINK (0xA000000CL)
#endif
+#ifndef SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE
+# define SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE 0x02
+#endif
+
/* Allowable mode bits on Win32. Using mode bits that are not supported on
* Win32 (eg S_IRWXU) is generally ignored, but Wine warns loudly about it
* so we simply remove them.
*/
#define WIN32_MODE_MASK (_S_IREAD | _S_IWRITE)
-/* GetFinalPathNameByHandleW signature */
-typedef DWORD(WINAPI *PFGetFinalPathNameByHandleW)(HANDLE, LPWSTR, DWORD, DWORD);
-
unsigned long git_win32__createfile_sharemode =
FILE_SHARE_READ | FILE_SHARE_WRITE;
int git_win32__retries = 10;
if ((len = git_win32_path_from_utf8(path_w, path)) < 0)
return -1;
- git_win32__path_trim_end(path_w, len);
+ git_win32_path_trim_end(path_w, len);
return lstat_w(path_w, buf, posixly_correct);
}
return (int)bufsiz;
}
-int p_symlink(const char *old, const char *new)
+int p_symlink(const char *target, const char *path)
{
- /* Real symlinks on NTFS require admin privileges. Until this changes,
- * libgit2 just creates a text file with the link target in the contents.
- */
- return git_futils_fake_symlink(old, new);
+ git_win32_path target_w, path_w;
+
+ if (git_win32_path_from_utf8(path_w, path) < 0 ||
+ git__utf8_to_16(target_w, MAX_PATH, target) < 0)
+ return -1;
+
+ if (!CreateSymbolicLinkW(path_w, target_w,
+ SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE))
+ return -1;
+
+ return 0;
}
struct open_opts {
attrs_new = attrs_orig & ~FILE_ATTRIBUTE_READONLY;
if (!SetFileAttributesW(wpath, attrs_new)) {
- giterr_set(GITERR_OS, "failed to set attributes");
+ git_error_set(GIT_ERROR_OS, "failed to set attributes");
return -1;
}
}
return 0;
}
-/*
- * Returns the address of the GetFinalPathNameByHandleW function.
- * This function is available on Windows Vista and higher.
- */
-static PFGetFinalPathNameByHandleW get_fpnbyhandle(void)
-{
- static PFGetFinalPathNameByHandleW pFunc = NULL;
- PFGetFinalPathNameByHandleW toReturn = pFunc;
-
- if (!toReturn) {
- HMODULE hModule = GetModuleHandleW(L"kernel32");
-
- if (hModule)
- toReturn = (PFGetFinalPathNameByHandleW)GetProcAddress(hModule, "GetFinalPathNameByHandleW");
-
- pFunc = toReturn;
- }
-
- assert(toReturn);
-
- return toReturn;
-}
-
static int getfinalpath_w(
git_win32_path dest,
const wchar_t *path)
{
- PFGetFinalPathNameByHandleW pgfp = get_fpnbyhandle();
HANDLE hFile;
DWORD dwChars;
- if (!pgfp)
- return -1;
-
/* Use FILE_FLAG_BACKUP_SEMANTICS so we can open a directory. Do not
* specify FILE_FLAG_OPEN_REPARSE_POINT; we want to open a handle to the
* target of the link. */
return -1;
/* Call GetFinalPathNameByHandle */
- dwChars = pgfp(hFile, dest, GIT_WIN_PATH_UTF16, FILE_NAME_NORMALIZED);
+ dwChars = GetFinalPathNameByHandleW(hFile, dest, GIT_WIN_PATH_UTF16, FILE_NAME_NORMALIZED);
CloseHandle(hFile);
if (!dwChars || dwChars >= GIT_WIN_PATH_UTF16)
return -1;
- /* The path may be delivered to us with a prefix; canonicalize */
- return (int)git_win32__canonicalize_path(dest, dwChars);
+ /* The path may be delivered to us with a namespace prefix; remove */
+ return (int)git_win32_path_remove_namespace(dest, dwChars);
}
static int follow_and_lstat_link(git_win32_path path, struct stat* buf)
return -1;
#endif
- return p_open(tmp_path, O_RDWR | O_CREAT | O_EXCL, 0744); //-V536
+ return p_open(tmp_path, O_RDWR | O_CREAT | O_EXCL, 0744); /* -V536 */
}
int p_access(const char* path, mode_t mode)
int p_recv(GIT_SOCKET socket, void *buffer, size_t length, int flags)
{
if ((size_t)((int)length) != length)
- return -1; /* giterr_set will be done by caller */
+ return -1; /* git_error_set will be done by caller */
return recv(socket, buffer, (int)length, flags);
}
int p_send(GIT_SOCKET socket, const void *buffer, size_t length, int flags)
{
if ((size_t)((int)length) != length)
- return -1; /* giterr_set will be done by caller */
+ return -1; /* git_error_set will be done by caller */
return send(socket, buffer, (int)length, flags);
}
assert(utf8_len > 0);
- GITERR_CHECK_ALLOC_ADD(&new_size, buf->size, (size_t)utf8_len);
- GITERR_CHECK_ALLOC_ADD(&new_size, new_size, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&new_size, buf->size, (size_t)utf8_len);
+ GIT_ERROR_CHECK_ALLOC_ADD(&new_size, new_size, 1);
if (git_buf_grow(buf, new_size) < 0)
return -1;
static unsigned int g_checkpoint_id = 0; /* to better label leak checkpoints */
static bool g_transient_leaks_since_mark = false; /* payload for hook */
+static void *crtdbg__malloc(size_t len, const char *file, int line)
+{
+ void *ptr = _malloc_dbg(len, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line);
+ if (!ptr) git_error_set_oom();
+ return ptr;
+}
+
+static void *crtdbg__calloc(size_t nelem, size_t elsize, const char *file, int line)
+{
+ void *ptr = _calloc_dbg(nelem, elsize, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line);
+ if (!ptr) git_error_set_oom();
+ return ptr;
+}
+
+static char *crtdbg__strdup(const char *str, const char *file, int line)
+{
+ char *ptr = _strdup_dbg(str, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line);
+ if (!ptr) git_error_set_oom();
+ return ptr;
+}
+
+static char *crtdbg__strndup(const char *str, size_t n, const char *file, int line)
+{
+ size_t length = 0, alloclength;
+ char *ptr;
+
+ length = p_strnlen(str, n);
+
+ if (GIT_ADD_SIZET_OVERFLOW(&alloclength, length, 1) ||
+ !(ptr = crtdbg__malloc(alloclength, file, line)))
+ return NULL;
+
+ if (length)
+ memcpy(ptr, str, length);
+
+ ptr[length] = '\0';
+
+ return ptr;
+}
+
+static char *crtdbg__substrdup(const char *start, size_t n, const char *file, int line)
+{
+ char *ptr;
+ size_t alloclen;
+
+ if (GIT_ADD_SIZET_OVERFLOW(&alloclen, n, 1) ||
+ !(ptr = crtdbg__malloc(alloclen, file, line)))
+ return NULL;
+
+ memcpy(ptr, start, n);
+ ptr[n] = '\0';
+ return ptr;
+}
+
+static void *crtdbg__realloc(void *ptr, size_t size, const char *file, int line)
+{
+ void *new_ptr = _realloc_dbg(ptr, size, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line);
+ if (!new_ptr) git_error_set_oom();
+ return new_ptr;
+}
+
+static void *crtdbg__reallocarray(void *ptr, size_t nelem, size_t elsize, const char *file, int line)
+{
+ size_t newsize;
+
+ return GIT_MULTIPLY_SIZET_OVERFLOW(&newsize, nelem, elsize) ?
+ NULL : _realloc_dbg(ptr, newsize, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line);
+}
+
+static void *crtdbg__mallocarray(size_t nelem, size_t elsize, const char *file, int line)
+{
+ return crtdbg__reallocarray(NULL, nelem, elsize, file, line);
+}
+
+static void crtdbg__free(void *ptr)
+{
+ free(ptr);
+}
+
+int git_win32_crtdbg_init_allocator(git_allocator *allocator)
+{
+ allocator->gmalloc = crtdbg__malloc;
+ allocator->gcalloc = crtdbg__calloc;
+ allocator->gstrdup = crtdbg__strdup;
+ allocator->gstrndup = crtdbg__strndup;
+ allocator->gsubstrdup = crtdbg__substrdup;
+ allocator->grealloc = crtdbg__realloc;
+ allocator->greallocarray = crtdbg__reallocarray;
+ allocator->gmallocarray = crtdbg__mallocarray;
+ allocator->gfree = crtdbg__free;
+ return 0;
+}
+
/**
* Compare function for bsearch on g_cs_index table.
*/
bool b_quiet = IS_BIT_SET(opt, GIT_WIN32__CRTDBG_STACKTRACE__QUIET);
if (b_leaks_since_mark && b_leaks_total) {
- giterr_set(GITERR_INVALID, "cannot combine LEAKS_SINCE_MARK and LEAKS_TOTAL.");
+ git_error_set(GIT_ERROR_INVALID, "cannot combine LEAKS_SINCE_MARK and LEAKS_TOTAL.");
return GIT_ERROR;
}
if (!b_set_mark && !b_leaks_since_mark && !b_leaks_total) {
- giterr_set(GITERR_INVALID, "nothing to do.");
+ git_error_set(GIT_ERROR_INVALID, "nothing to do.");
return GIT_ERROR;
}
return result;
}
+
#endif
#include "git2/errors.h"
#include "strnlen.h"
+/* MSVC CRTDBG memory leak reporting.
+ *
+ * We DO NOT use the "_CRTDBG_MAP_ALLOC" macro described in the MSVC
+ * documentation because all allocs/frees in libgit2 already go through
+ * the "git__" routines defined in this file. Simply using the normal
+ * reporting mechanism causes all leaks to be attributed to a routine
+ * here in util.h (ie, the actual call to calloc()) rather than the
+ * caller of git__calloc().
+ *
+ * Therefore, we declare a set of "git__crtdbg__" routines to replace
+ * the corresponding "git__" routines and re-define the "git__" symbols
+ * as macros. This allows us to get and report the file:line info of
+ * the real caller.
+ *
+ * We DO NOT replace the "git__free" routine because it needs to remain
+ * a function pointer because it is used as a function argument when
+ * setting up various structure "destructors".
+ *
+ * We also DO NOT use the "_CRTDBG_MAP_ALLOC" macro because it causes
+ * "free" to be remapped to "_free_dbg" and this causes problems for
+ * structures which define a field named "free".
+ *
+ * Finally, CRTDBG must be explicitly enabled and configured at program
+ * startup. See tests/main.c for an example.
+ */
+
+int git_win32_crtdbg_init_allocator(git_allocator *allocator);
+
/**
* Initialize our memory leak tracking and de-dup data structures.
* This should ONLY be called by git_libgit2_init().
*/
const char *git_win32__crtdbg_stacktrace(int skip, const char *file);
-GIT_INLINE(void *) git__crtdbg__malloc(size_t len, const char *file, int line)
-{
- void *ptr = _malloc_dbg(len, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line);
- if (!ptr) giterr_set_oom();
- return ptr;
-}
-
-GIT_INLINE(void *) git__crtdbg__calloc(size_t nelem, size_t elsize, const char *file, int line)
-{
- void *ptr = _calloc_dbg(nelem, elsize, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line);
- if (!ptr) giterr_set_oom();
- return ptr;
-}
-
-GIT_INLINE(char *) git__crtdbg__strdup(const char *str, const char *file, int line)
-{
- char *ptr = _strdup_dbg(str, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line);
- if (!ptr) giterr_set_oom();
- return ptr;
-}
-
-GIT_INLINE(char *) git__crtdbg__strndup(const char *str, size_t n, const char *file, int line)
-{
- size_t length = 0, alloclength;
- char *ptr;
-
- length = p_strnlen(str, n);
-
- if (GIT_ADD_SIZET_OVERFLOW(&alloclength, length, 1) ||
- !(ptr = git__crtdbg__malloc(alloclength, file, line)))
- return NULL;
-
- if (length)
- memcpy(ptr, str, length);
-
- ptr[length] = '\0';
-
- return ptr;
-}
-
-GIT_INLINE(char *) git__crtdbg__substrdup(const char *start, size_t n, const char *file, int line)
-{
- char *ptr;
- size_t alloclen;
-
- if (GIT_ADD_SIZET_OVERFLOW(&alloclen, n, 1) ||
- !(ptr = git__crtdbg__malloc(alloclen, file, line)))
- return NULL;
-
- memcpy(ptr, start, n);
- ptr[n] = '\0';
- return ptr;
-}
-
-GIT_INLINE(void *) git__crtdbg__realloc(void *ptr, size_t size, const char *file, int line)
-{
- void *new_ptr = _realloc_dbg(ptr, size, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line);
- if (!new_ptr) giterr_set_oom();
- return new_ptr;
-}
-
-GIT_INLINE(void *) git__crtdbg__reallocarray(void *ptr, size_t nelem, size_t elsize, const char *file, int line)
-{
- size_t newsize;
-
- return GIT_MULTIPLY_SIZET_OVERFLOW(&newsize, nelem, elsize) ?
- NULL : _realloc_dbg(ptr, newsize, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line);
-}
-
-GIT_INLINE(void *) git__crtdbg__mallocarray(size_t nelem, size_t elsize, const char *file, int line)
-{
- return git__crtdbg__reallocarray(NULL, nelem, elsize, file, line);
-}
-
-
#endif
#endif
int git_win32__stack_capture(git_win32__stack__raw_data *pdata, int skip)
{
if (!g_win32_stack_initialized) {
- giterr_set(GITERR_INVALID, "git_win32_stack not initialized.");
+ git_error_set(GIT_ERROR_INVALID, "git_win32_stack not initialized.");
return GIT_ERROR;
}
int detail_len;
if (!g_win32_stack_initialized) {
- giterr_set(GITERR_INVALID, "git_win32_stack not initialized.");
+ git_error_set(GIT_ERROR_INVALID, "git_win32_stack not initialized.");
return GIT_ERROR;
}
newattrs = attrs & ~FILE_ATTRIBUTE_HIDDEN;
if (attrs != newattrs && !SetFileAttributesW(buf, newattrs)) {
- giterr_set(GITERR_OS, "failed to %s hidden bit for '%s'",
+ git_error_set(GIT_ERROR_OS, "failed to %s hidden bit for '%s'",
hidden ? "set" : "unset", path);
return -1;
}
*out = (attrs & FILE_ATTRIBUTE_HIDDEN) ? true : false;
return 0;
}
-
-/**
- * Removes any trailing backslashes from a path, except in the case of a drive
- * letter path (C:\, D:\, etc.). This function cannot fail.
- *
- * @param path The path which should be trimmed.
- * @return The length of the modified string (<= the input length)
- */
-size_t git_win32__path_trim_end(wchar_t *str, size_t len)
-{
- while (1) {
- if (!len || str[len - 1] != L'\\')
- break;
-
- /* Don't trim backslashes from drive letter paths, which
- * are 3 characters long and of the form C:\, D:\, etc. */
- if (len == 3 && git_win32__isalpha(str[0]) && str[1] == ':')
- break;
-
- len--;
- }
-
- str[len] = L'\0';
-
- return len;
-}
-
-/**
- * Removes any of the following namespace prefixes from a path,
- * if found: "\??\", "\\?\", "\\?\UNC\". This function cannot fail.
- *
- * @param path The path which should be converted.
- * @return The length of the modified string (<= the input length)
- */
-size_t git_win32__canonicalize_path(wchar_t *str, size_t len)
-{
- static const wchar_t dosdevices_prefix[] = L"\\\?\?\\";
- static const wchar_t nt_prefix[] = L"\\\\?\\";
- static const wchar_t unc_prefix[] = L"UNC\\";
- size_t to_advance = 0;
-
- /* "\??\" -- DOS Devices prefix */
- if (len >= CONST_STRLEN(dosdevices_prefix) &&
- !wcsncmp(str, dosdevices_prefix, CONST_STRLEN(dosdevices_prefix))) {
- to_advance += CONST_STRLEN(dosdevices_prefix);
- len -= CONST_STRLEN(dosdevices_prefix);
- }
- /* "\\?\" -- NT namespace prefix */
- else if (len >= CONST_STRLEN(nt_prefix) &&
- !wcsncmp(str, nt_prefix, CONST_STRLEN(nt_prefix))) {
- to_advance += CONST_STRLEN(nt_prefix);
- len -= CONST_STRLEN(nt_prefix);
- }
-
- /* "\??\UNC\", "\\?\UNC\" -- UNC prefix */
- if (to_advance && len >= CONST_STRLEN(unc_prefix) &&
- !wcsncmp(str + to_advance, unc_prefix, CONST_STRLEN(unc_prefix))) {
- to_advance += CONST_STRLEN(unc_prefix);
- len -= CONST_STRLEN(unc_prefix);
- }
-
- if (to_advance) {
- memmove(str, str + to_advance, len * sizeof(wchar_t));
- str[len] = L'\0';
- }
-
- return git_win32__path_trim_end(str, len);
-}
*/
extern int git_win32__hidden(bool *hidden, const char *path);
-/**
- * Removes any trailing backslashes from a path, except in the case of a drive
- * letter path (C:\, D:\, etc.). This function cannot fail.
- *
- * @param path The path which should be trimmed.
- * @return The length of the modified string (<= the input length)
- */
-size_t git_win32__path_trim_end(wchar_t *str, size_t len);
-
-/**
- * Removes any of the following namespace prefixes from a path,
- * if found: "\??\", "\\?\", "\\?\UNC\". This function cannot fail.
- *
- * @param path The path which should be converted.
- * @return The length of the modified string (<= the input length)
- */
-size_t git_win32__canonicalize_path(wchar_t *str, size_t len);
-
/**
* Converts a FILETIME structure to a struct timespec.
*
/* st_size gets the UTF-8 length of the target name, in bytes,
* not counting the NULL terminator */
if ((st->st_size = git__utf16_to_8(NULL, 0, target)) < 0) {
- giterr_set(GITERR_OS, "could not convert reparse point name for '%ls'", path);
+ git_error_set(GIT_ERROR_OS, "could not convert reparse point name for '%ls'", path);
return -1;
}
}
&& git_path_contains_file(&buf, "gitdir")
&& git_path_contains_file(&buf, "HEAD");
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return error;
}
wts->strings = (char **)git_vector_detach(&wts->count, NULL, &worktrees);
exit:
- git_buf_free(&path);
+ git_buf_dispose(&path);
return error;
}
goto err;
if (git_futils_readbuffer(&buf, path.ptr) < 0)
goto err;
- git_buf_free(&path);
+ git_buf_dispose(&path);
git_buf_rtrim(&buf);
goto err;
if (git_path_apply_relative(&path, buf.ptr) < 0)
goto err;
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return git_buf_detach(&path);
err:
- git_buf_free(&buf);
- git_buf_free(&path);
+ git_buf_dispose(&buf);
+ git_buf_dispose(&path);
return NULL;
}
goto out;
out:
- git_buf_free(&path);
+ git_buf_dispose(&path);
return err;
}
if ((wt->name = git__strdup(name)) == NULL
|| (wt->commondir_path = git_worktree__read_link(dir, "commondir")) == NULL
|| (wt->gitlink_path = git_worktree__read_link(dir, "gitdir")) == NULL
- || (parent && (wt->parent_path = git__strdup(parent)) == NULL)) {
+ || (parent && (wt->parent_path = git__strdup(parent)) == NULL)
+ || (wt->worktree_path = git_path_dirname(wt->gitlink_path)) == NULL) {
error = -1;
goto out;
}
out:
if (error)
git_worktree_free(wt);
- git_buf_free(&gitdir);
+ git_buf_dispose(&gitdir);
return error;
}
goto out;
out:
- git_buf_free(&path);
+ git_buf_dispose(&path);
if (error)
git_worktree_free(wt);
int error = 0;
if (!git_repository_is_worktree(repo)) {
- giterr_set(GITERR_WORKTREE, "cannot open worktree of a non-worktree repo");
+ git_error_set(GIT_ERROR_WORKTREE, "cannot open worktree of a non-worktree repo");
error = -1;
goto out;
}
out:
git__free(name);
- git_buf_free(&parent);
+ git_buf_dispose(&parent);
return error;
}
return;
git__free(wt->commondir_path);
+ git__free(wt->worktree_path);
git__free(wt->gitlink_path);
git__free(wt->gitdir_path);
git__free(wt->parent_path);
int git_worktree_validate(const git_worktree *wt)
{
- git_buf buf = GIT_BUF_INIT;
- int err = 0;
-
assert(wt);
- git_buf_puts(&buf, wt->gitdir_path);
- if (!is_worktree_dir(buf.ptr)) {
- giterr_set(GITERR_WORKTREE,
+ if (!is_worktree_dir(wt->gitdir_path)) {
+ git_error_set(GIT_ERROR_WORKTREE,
"Worktree gitdir ('%s') is not valid",
wt->gitlink_path);
- err = -1;
- goto out;
+ return GIT_ERROR;
}
- if (!git_path_exists(wt->parent_path)) {
- giterr_set(GITERR_WORKTREE,
+ if (wt->parent_path && !git_path_exists(wt->parent_path)) {
+ git_error_set(GIT_ERROR_WORKTREE,
"Worktree parent directory ('%s') does not exist ",
wt->parent_path);
- err = -2;
- goto out;
+ return GIT_ERROR;
}
if (!git_path_exists(wt->commondir_path)) {
- giterr_set(GITERR_WORKTREE,
+ git_error_set(GIT_ERROR_WORKTREE,
"Worktree common directory ('%s') does not exist ",
wt->commondir_path);
- err = -3;
- goto out;
+ return GIT_ERROR;
}
-out:
- git_buf_free(&buf);
-
- return err;
+ return 0;
}
int git_worktree_add_init_options(git_worktree_add_options *opts,
git_worktree_add_options wtopts = GIT_WORKTREE_ADD_OPTIONS_INIT;
int err;
- GITERR_CHECK_VERSION(
+ GIT_ERROR_CHECK_VERSION(
opts, GIT_WORKTREE_ADD_OPTIONS_VERSION, "git_worktree_add_options");
if (opts)
|| (err = write_wtfile(gitdir.ptr, "gitdir", &buf)) < 0)
goto out;
- /* Create new branch */
- if ((err = git_repository_head(&head, repo)) < 0)
- goto out;
- if ((err = git_commit_lookup(&commit, repo, &head->target.oid)) < 0)
- goto out;
- if ((err = git_branch_create(&ref, repo, name, commit, false)) < 0)
- goto out;
+ /* Set up worktree reference */
+ if (wtopts.ref) {
+ if (!git_reference_is_branch(wtopts.ref)) {
+ git_error_set(GIT_ERROR_WORKTREE, "reference is not a branch");
+ err = -1;
+ goto out;
+ }
+
+ if (git_branch_is_checked_out(wtopts.ref)) {
+ git_error_set(GIT_ERROR_WORKTREE, "reference is already checked out");
+ err = -1;
+ goto out;
+ }
+
+ if ((err = git_reference_dup(&ref, wtopts.ref)) < 0)
+ goto out;
+ } else {
+ if ((err = git_repository_head(&head, repo)) < 0)
+ goto out;
+ if ((err = git_commit_lookup(&commit, repo, &head->target.oid)) < 0)
+ goto out;
+ if ((err = git_branch_create(&ref, repo, name, commit, false)) < 0)
+ goto out;
+ }
/* Set worktree's HEAD */
if ((err = git_repository_create_head(gitdir.ptr, git_reference_name(ref))) < 0)
goto out;
out:
- git_buf_free(&gitdir);
- git_buf_free(&wddir);
- git_buf_free(&buf);
+ git_buf_dispose(&gitdir);
+ git_buf_dispose(&wddir);
+ git_buf_dispose(&buf);
git_reference_free(ref);
git_reference_free(head);
git_commit_free(commit);
wt->locked = 1;
out:
- git_buf_free(&path);
+ git_buf_dispose(&path);
return err;
}
return -1;
if (p_unlink(path.ptr) != 0) {
- git_buf_free(&path);
+ git_buf_dispose(&path);
return -1;
}
wt->locked = 0;
- git_buf_free(&path);
+ git_buf_dispose(&path);
return 0;
}
git_futils_readbuffer(reason, path.ptr);
out:
- git_buf_free(&path);
+ git_buf_dispose(&path);
return ret;
}
+const char *git_worktree_name(const git_worktree *wt)
+{
+ assert(wt);
+ return wt->name;
+}
+
+const char *git_worktree_path(const git_worktree *wt)
+{
+ assert(wt);
+ return wt->worktree_path;
+}
+
int git_worktree_prune_init_options(
git_worktree_prune_options *opts,
unsigned int version)
git_buf reason = GIT_BUF_INIT;
git_worktree_prune_options popts = GIT_WORKTREE_PRUNE_OPTIONS_INIT;
- GITERR_CHECK_VERSION(
+ GIT_ERROR_CHECK_VERSION(
opts, GIT_WORKTREE_PRUNE_OPTIONS_VERSION,
"git_worktree_prune_options");
{
if (!reason.size)
git_buf_attach_notowned(&reason, "no reason given", 15);
- giterr_set(GITERR_WORKTREE, "Not pruning locked working tree: '%s'", reason.ptr);
- git_buf_free(&reason);
+ git_error_set(GIT_ERROR_WORKTREE, "Not pruning locked working tree: '%s'", reason.ptr);
+ git_buf_dispose(&reason);
return 0;
}
if ((popts.flags & GIT_WORKTREE_PRUNE_VALID) == 0 &&
git_worktree_validate(wt) == 0)
{
- giterr_set(GITERR_WORKTREE, "Not pruning valid working tree");
+ git_error_set(GIT_ERROR_WORKTREE, "Not pruning valid working tree");
return 0;
}
char *wtpath;
int err;
- GITERR_CHECK_VERSION(
+ GIT_ERROR_CHECK_VERSION(
opts, GIT_WORKTREE_PRUNE_OPTIONS_VERSION,
"git_worktree_prune_options");
goto out;
if (!git_path_exists(path.ptr))
{
- giterr_set(GITERR_WORKTREE, "Worktree gitdir '%s' does not exist", path.ptr);
+ git_error_set(GIT_ERROR_WORKTREE, "Worktree gitdir '%s' does not exist", path.ptr);
err = -1;
goto out;
}
git_buf_attach(&path, wtpath, 0);
if (!git_path_exists(path.ptr))
{
- giterr_set(GITERR_WORKTREE, "Working tree '%s' does not exist", path.ptr);
+ git_error_set(GIT_ERROR_WORKTREE, "Working tree '%s' does not exist", path.ptr);
err = -1;
goto out;
}
goto out;
out:
- git_buf_free(&path);
+ git_buf_dispose(&path);
return err;
}
* directory. */
char *name;
+ /* Path to the where the worktree lives in the filesystem */
+ char *worktree_path;
/* Path to the .git file in the working tree's repository */
char *gitlink_path;
/* Path to the .git directory inside the parent's
/** Declare a function as always inlined. */
#if defined(_MSC_VER)
# define XDL_INLINE(type) static __inline type
+#elif defined(__GNUC__)
+# define XDL_INLINE(type) static __inline__ type
#else
-# define XDL_INLINE(type) static inline type
+#define XDG_INLINE(type) static type
#endif
typedef struct s_xdpsplit {
* Allocate and setup K vectors to be used by the differential algorithm.
* One is to store the forward path and one to store the backward path.
*/
- GITERR_CHECK_ALLOC_ADD3(&ndiags, xe->xdf1.nreff, xe->xdf2.nreff, 3);
- GITERR_CHECK_ALLOC_MULTIPLY(&allocsize, ndiags, 2);
- GITERR_CHECK_ALLOC_ADD(&allocsize, allocsize, 2);
- GITERR_CHECK_ALLOC_MULTIPLY(&allocsize, allocsize, sizeof(long));
+ GIT_ERROR_CHECK_ALLOC_ADD3(&ndiags, xe->xdf1.nreff, xe->xdf2.nreff, 3);
+ GIT_ERROR_CHECK_ALLOC_MULTIPLY(&allocsize, ndiags, 2);
+ GIT_ERROR_CHECK_ALLOC_ADD(&allocsize, allocsize, 2);
+ GIT_ERROR_CHECK_ALLOC_MULTIPLY(&allocsize, allocsize, sizeof(long));
if (!(kvd = (long *) xdl_malloc(allocsize))) {
xdl_free_env(xe);
index.table_bits = xdl_hashbits(count1);
sz = index.records_size = 1 << index.table_bits;
- GITERR_CHECK_ALLOC_MULTIPLY(&sz, sz, sizeof(struct record *));
+ GIT_ERROR_CHECK_ALLOC_MULTIPLY(&sz, sz, sizeof(struct record *));
if (!(index.records = (struct record **) xdl_malloc(sz)))
goto cleanup;
if (dest)
memcpy(dest + size, recs[i]->ptr, recs[i]->size);
- GITERR_CHECK_ALLOC_ADD(&size, size, recs[i++]->size);
+ GIT_ERROR_CHECK_ALLOC_ADD(&size, size, recs[i++]->size);
}
if (add_nl) {
if (needs_cr) {
if (dest)
dest[size] = '\r';
- GITERR_CHECK_ALLOC_ADD(&size, size, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&size, size, 1);
}
if (dest)
dest[size] = '\n';
- GITERR_CHECK_ALLOC_ADD(&size, size, 1);
+ GIT_ERROR_CHECK_ALLOC_ADD(&size, size, 1);
}
}
dest ? dest + size : NULL) < 0)
return -1;
- GITERR_CHECK_ALLOC_ADD(&size, size, copied);
+ GIT_ERROR_CHECK_ALLOC_ADD(&size, size, copied);
if (!dest) {
- GITERR_CHECK_ALLOC_ADD5(&size, size, marker_size, 1, needs_cr, marker1_size);
+ GIT_ERROR_CHECK_ALLOC_ADD5(&size, size, marker_size, 1, needs_cr, marker1_size);
} else {
memset(dest + size, '<', marker_size);
size += marker_size;
dest ? dest + size : NULL) < 0)
return -1;
- GITERR_CHECK_ALLOC_ADD(&size, size, copied);
+ GIT_ERROR_CHECK_ALLOC_ADD(&size, size, copied);
if (style == XDL_MERGE_DIFF3) {
/* Shared preimage */
if (!dest) {
- GITERR_CHECK_ALLOC_ADD5(&size, size, marker_size, 1, needs_cr, marker3_size);
+ GIT_ERROR_CHECK_ALLOC_ADD5(&size, size, marker_size, 1, needs_cr, marker3_size);
} else {
memset(dest + size, '|', marker_size);
size += marker_size;
if (xdl_orig_copy(&copied, xe1, m->i0, m->chg0, needs_cr, 1,
dest ? dest + size : NULL) < 0)
return -1;
- GITERR_CHECK_ALLOC_ADD(&size, size, copied);
+ GIT_ERROR_CHECK_ALLOC_ADD(&size, size, copied);
}
if (!dest) {
- GITERR_CHECK_ALLOC_ADD4(&size, size, marker_size, 1, needs_cr);
+ GIT_ERROR_CHECK_ALLOC_ADD4(&size, size, marker_size, 1, needs_cr);
} else {
memset(dest + size, '=', marker_size);
size += marker_size;
if (xdl_recs_copy(&copied, xe2, m->i2, m->chg2, needs_cr, 1,
dest ? dest + size : NULL) < 0)
return -1;
- GITERR_CHECK_ALLOC_ADD(&size, size, copied);
+ GIT_ERROR_CHECK_ALLOC_ADD(&size, size, copied);
if (!dest) {
- GITERR_CHECK_ALLOC_ADD5(&size, size, marker_size, 1, needs_cr, marker2_size);
+ GIT_ERROR_CHECK_ALLOC_ADD5(&size, size, marker_size, 1, needs_cr, marker2_size);
} else {
memset(dest + size, '>', marker_size);
size += marker_size;
if (xdl_recs_copy(&copied, xe1, i, m->i1 - i, 0, 0,
dest ? dest + size : NULL) < 0)
return -1;
- GITERR_CHECK_ALLOC_ADD(&size, size, copied);
+ GIT_ERROR_CHECK_ALLOC_ADD(&size, size, copied);
/* Postimage from side #1 */
if (m->mode & 1) {
if (xdl_recs_copy(&copied, xe1, m->i1, m->chg1, needs_cr, (m->mode & 2),
dest ? dest + size : NULL) < 0)
return -1;
- GITERR_CHECK_ALLOC_ADD(&size, size, copied);
+ GIT_ERROR_CHECK_ALLOC_ADD(&size, size, copied);
}
/* Postimage from side #2 */
if (xdl_recs_copy(&copied, xe2, m->i2, m->chg2, 0, 0,
dest ? dest + size : NULL) < 0)
return -1;
- GITERR_CHECK_ALLOC_ADD(&size, size, copied);
+ GIT_ERROR_CHECK_ALLOC_ADD(&size, size, copied);
}
} else
continue;
if (xdl_recs_copy(&copied, xe1, i, xe1->xdf2.nrec - i, 0, 0,
dest ? dest + size : NULL) < 0)
return -1;
- GITERR_CHECK_ALLOC_ADD(&size, size, copied);
+ GIT_ERROR_CHECK_ALLOC_ADD(&size, size, copied);
*out = size;
return 0;
case Z_BUF_ERROR: /* not fatal; we retry with a larger buffer */
return 0;
case Z_MEM_ERROR:
- giterr_set_oom();
+ git_error_set_oom();
break;
default:
if (zs->z.msg)
- giterr_set_str(GITERR_ZLIB, zs->z.msg);
+ git_error_set_str(GIT_ERROR_ZLIB, zs->z.msg);
else
- giterr_set(GITERR_ZLIB, "unknown compression error");
+ git_error_set(GIT_ERROR_ZLIB, "unknown compression error");
}
return -1;
size_t out_remain = *out_len;
if (zstream->in_len && zstream->zerr == Z_STREAM_END) {
- giterr_set(GITERR_ZLIB, "zlib input had trailing garbage");
+ git_error_set(GIT_ERROR_ZLIB, "zlib input had trailing garbage");
return -1;
}
ADD_DEFINITIONS(-DCLAR_TMPDIR=\"libgit2_tests\")
ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64)
+# Ensure that we do not use deprecated functions internally
+ADD_DEFINITIONS(-DGIT_DEPRECATE_HARD)
+
INCLUDE_DIRECTORIES(${CLAR_PATH} ${libgit2_BINARY_DIR}/src)
FILE(GLOB_RECURSE SRC_TEST ${CLAR_PATH}/*/*.c ${CLAR_PATH}/*/*.h)
SET(SRC_CLAR "main.c" "clar_libgit2.c" "clar_libgit2_trace.c" "clar_libgit2_timer.c" "clar.c")
PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/clar.suite)
INCLUDE_DIRECTORIES(${LIBGIT2_INCLUDES})
+INCLUDE_DIRECTORIES(SYSTEM ${LIBGIT2_SYSTEM_INCLUDES})
ADD_EXECUTABLE(libgit2_clar ${SRC_CLAR} ${SRC_TEST} ${LIBGIT2_OBJECTS})
+SET_TARGET_PROPERTIES(libgit2_clar PROPERTIES C_STANDARD 90)
SET_TARGET_PROPERTIES(libgit2_clar PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${libgit2_BINARY_DIR})
IF (${CMAKE_VERSION} VERSION_LESS 2.8.12)
ENDIF ()
ADD_TEST(offline "${libgit2_BINARY_DIR}/libgit2_clar" -v -xonline)
+ADD_TEST(invasive "${libgit2_BINARY_DIR}/libgit2_clar" -v -score::ftruncate -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
ADD_TEST(online "${libgit2_BINARY_DIR}/libgit2_clar" -v -sonline)
ADD_TEST(gitdaemon "${libgit2_BINARY_DIR}/libgit2_clar" -v -sonline::push)
ADD_TEST(ssh "${libgit2_BINARY_DIR}/libgit2_clar" -v -sonline::push -sonline::clone::ssh_cert -sonline::clone::ssh_with_paths)
--- /dev/null
+#include "clar_libgit2.h"
+#include "apply_helpers.h"
+
+struct iterator_compare_data {
+ struct merge_index_entry *expected;
+ size_t cnt;
+ size_t idx;
+};
+
+static int iterator_compare(const git_index_entry *entry, void *_data)
+{
+ git_oid expected_id;
+
+ struct iterator_compare_data *data = (struct iterator_compare_data *)_data;
+
+ cl_assert_equal_i(GIT_INDEX_ENTRY_STAGE(entry), data->expected[data->idx].stage);
+ cl_git_pass(git_oid_fromstr(&expected_id, data->expected[data->idx].oid_str));
+ cl_assert_equal_oid(&entry->id, &expected_id);
+ cl_assert_equal_i(entry->mode, data->expected[data->idx].mode);
+ cl_assert_equal_s(entry->path, data->expected[data->idx].path);
+
+ if (data->idx >= data->cnt)
+ return -1;
+
+ data->idx++;
+
+ return 0;
+}
+
+void validate_apply_workdir(
+ git_repository *repo,
+ struct merge_index_entry *workdir_entries,
+ size_t workdir_cnt)
+{
+ git_index *index;
+ git_iterator *iterator;
+ git_iterator_options opts = GIT_ITERATOR_OPTIONS_INIT;
+ struct iterator_compare_data data = { workdir_entries, workdir_cnt };
+
+ opts.flags |= GIT_ITERATOR_INCLUDE_HASH;
+
+ cl_git_pass(git_repository_index(&index, repo));
+ cl_git_pass(git_iterator_for_workdir(&iterator, repo, index, NULL, &opts));
+
+ cl_git_pass(git_iterator_foreach(iterator, iterator_compare, &data));
+ cl_assert_equal_i(data.idx, data.cnt);
+
+ git_iterator_free(iterator);
+ git_index_free(index);
+}
+
+void validate_apply_index(
+ git_repository *repo,
+ struct merge_index_entry *index_entries,
+ size_t index_cnt)
+{
+ git_index *index;
+ git_iterator *iterator;
+ struct iterator_compare_data data = { index_entries, index_cnt };
+
+ cl_git_pass(git_repository_index(&index, repo));
+ cl_git_pass(git_iterator_for_index(&iterator, repo, index, NULL));
+
+ cl_git_pass(git_iterator_foreach(iterator, iterator_compare, &data));
+ cl_assert_equal_i(data.idx, data.cnt);
+
+ git_iterator_free(iterator);
+ git_index_free(index);
+}
+
+static int iterator_eq(const git_index_entry **entry, void *_data)
+{
+ GIT_UNUSED(_data);
+
+ if (!entry[0] || !entry[1])
+ return -1;
+
+ cl_assert_equal_i(GIT_INDEX_ENTRY_STAGE(entry[0]), GIT_INDEX_ENTRY_STAGE(entry[1]));
+ cl_assert_equal_oid(&entry[0]->id, &entry[1]->id);
+ cl_assert_equal_i(entry[0]->mode, entry[1]->mode);
+ cl_assert_equal_s(entry[0]->path, entry[1]->path);
+
+ return 0;
+}
+
+void validate_index_unchanged(git_repository *repo)
+{
+ git_tree *head;
+ git_index *index;
+ git_iterator *head_iterator, *index_iterator, *iterators[2];
+
+ cl_git_pass(git_repository_head_tree(&head, repo));
+ cl_git_pass(git_repository_index(&index, repo));
+
+ cl_git_pass(git_iterator_for_tree(&head_iterator, head, NULL));
+ cl_git_pass(git_iterator_for_index(&index_iterator, repo, index, NULL));
+
+ iterators[0] = head_iterator;
+ iterators[1] = index_iterator;
+
+ cl_git_pass(git_iterator_walk(iterators, 2, iterator_eq, NULL));
+
+ git_iterator_free(head_iterator);
+ git_iterator_free(index_iterator);
+
+ git_tree_free(head);
+ git_index_free(index);
+}
+
+void validate_workdir_unchanged(git_repository *repo)
+{
+ git_tree *head;
+ git_index *index;
+ git_iterator *head_iterator, *workdir_iterator, *iterators[2];
+ git_iterator_options workdir_opts = GIT_ITERATOR_OPTIONS_INIT;
+
+ cl_git_pass(git_repository_head_tree(&head, repo));
+ cl_git_pass(git_repository_index(&index, repo));
+
+ workdir_opts.flags |= GIT_ITERATOR_INCLUDE_HASH;
+
+ cl_git_pass(git_iterator_for_tree(&head_iterator, head, NULL));
+ cl_git_pass(git_iterator_for_workdir(&workdir_iterator, repo, index, NULL, &workdir_opts));
+
+ iterators[0] = head_iterator;
+ iterators[1] = workdir_iterator;
+
+ cl_git_pass(git_iterator_walk(iterators, 2, iterator_eq, NULL));
+
+ git_iterator_free(head_iterator);
+ git_iterator_free(workdir_iterator);
+
+ git_tree_free(head);
+ git_index_free(index);
+}
--- /dev/null
+#include "../merge/merge_helpers.h"
+
+#define TEST_REPO_PATH "merge-recursive"
+
+#define DIFF_MODIFY_TWO_FILES \
+ "diff --git a/asparagus.txt b/asparagus.txt\n" \
+ "index f516580..ffb36e5 100644\n" \
+ "--- a/asparagus.txt\n" \
+ "+++ b/asparagus.txt\n" \
+ "@@ -1 +1 @@\n" \
+ "-ASPARAGUS SOUP!\n" \
+ "+ASPARAGUS SOUP.\n" \
+ "diff --git a/veal.txt b/veal.txt\n" \
+ "index 94d2c01..a7b0665 100644\n" \
+ "--- a/veal.txt\n" \
+ "+++ b/veal.txt\n" \
+ "@@ -1 +1 @@\n" \
+ "-VEAL SOUP!\n" \
+ "+VEAL SOUP.\n" \
+ "@@ -7 +7 @@ occasionally, then put into it a shin of veal, let it boil two hours\n" \
+ "-longer. take out the slices of ham, and skim off the grease if any\n" \
+ "+longer; take out the slices of ham, and skim off the grease if any\n"
+
+#define DIFF_DELETE_FILE \
+ "diff --git a/gravy.txt b/gravy.txt\n" \
+ "deleted file mode 100644\n" \
+ "index c4e6cca..0000000\n" \
+ "--- a/gravy.txt\n" \
+ "+++ /dev/null\n" \
+ "@@ -1,8 +0,0 @@\n" \
+ "-GRAVY SOUP.\n" \
+ "-\n" \
+ "-Get eight pounds of coarse lean beef--wash it clean and lay it in your\n" \
+ "-pot, put in the same ingredients as for the shin soup, with the same\n" \
+ "-quantity of water, and follow the process directed for that. Strain the\n" \
+ "-soup through a sieve, and serve it up clear, with nothing more than\n" \
+ "-toasted bread in it; two table-spoonsful of mushroom catsup will add a\n" \
+ "-fine flavour to the soup.\n"
+
+#define DIFF_ADD_FILE \
+ "diff --git a/newfile.txt b/newfile.txt\n" \
+ "new file mode 100644\n" \
+ "index 0000000..6370543\n" \
+ "--- /dev/null\n" \
+ "+++ b/newfile.txt\n" \
+ "@@ -0,0 +1,2 @@\n" \
+ "+This is a new file!\n" \
+ "+Added by a patch.\n"
+
+#define DIFF_EXECUTABLE_FILE \
+ "diff --git a/beef.txt b/beef.txt\n" \
+ "old mode 100644\n" \
+ "new mode 100755\n"
+
+#define DIFF_MANY_CHANGES_ONE \
+ "diff --git a/veal.txt b/veal.txt\n" \
+ "index 94d2c01..c9d7d5d 100644\n" \
+ "--- a/veal.txt\n" \
+ "+++ b/veal.txt\n" \
+ "@@ -1,2 +1,2 @@\n" \
+ "-VEAL SOUP!\n" \
+ "+VEAL SOUP\n" \
+ " \n" \
+ "@@ -4,3 +4,2 @@\n" \
+ " spoonful of black pepper pounded, and two of salt, with two or three\n" \
+ "-slices of lean ham; let it boil steadily two hours; skim it\n" \
+ " occasionally, then put into it a shin of veal, let it boil two hours\n" \
+ "@@ -8,3 +7,3 @@\n" \
+ " should rise, take a gill of good cream, mix with it two table-spoonsful\n" \
+ "-of flour very nicely, and the yelks of two eggs beaten well, strain this\n" \
+ "+OF FLOUR very nicely, and the yelks of two eggs beaten well, strain this\n" \
+ " mixture, and add some chopped parsley; pour some soup on by degrees,\n" \
+ "@@ -12,2 +11,3 @@\n" \
+ " boiled two or three minutes to take off the raw taste of the eggs. If\n" \
+ "+Inserted line.\n" \
+ " the cream be not perfectly sweet, and the eggs quite new, the thickening\n" \
+ "@@ -15,3 +15,3 @@\n" \
+ " in, first taking off their skins, by letting them stand a few minutes in\n" \
+ "-hot water, when they may be easily peeled. When made in this way you\n" \
+ "+Changed line.\n" \
+ " must thicken it with the flour only. Any part of the veal may be used,\n"
+
+#define DIFF_MANY_CHANGES_TWO \
+ "diff --git a/veal.txt b/veal.txt\n" \
+ "index 94d2c01..6b943d6 100644\n" \
+ "--- a/veal.txt\n" \
+ "+++ b/veal.txt\n" \
+ "@@ -1,2 +1,2 @@\n" \
+ "-VEAL SOUP!\n" \
+ "+VEAL SOUP!!!\n" \
+ " \n" \
+ "@@ -4,3 +4,2 @@\n" \
+ " spoonful of black pepper pounded, and two of salt, with two or three\n" \
+ "-slices of lean ham; let it boil steadily two hours; skim it\n" \
+ " occasionally, then put into it a shin of veal, let it boil two hours\n" \
+ "@@ -8,3 +7,3 @@\n" \
+ " should rise, take a gill of good cream, mix with it two table-spoonsful\n" \
+ "-of flour very nicely, and the yelks of two eggs beaten well, strain this\n" \
+ "+of flour very nicely, AND the yelks of two eggs beaten well, strain this\n" \
+ " mixture, and add some chopped parsley; pour some soup on by degrees,\n" \
+ "@@ -12,2 +11,3 @@\n" \
+ " boiled two or three minutes to take off the raw taste of the eggs. If\n" \
+ "+New line.\n" \
+ " the cream be not perfectly sweet, and the eggs quite new, the thickening\n" \
+ "@@ -15,4 +15,5 @@\n" \
+ " in, first taking off their skins, by letting them stand a few minutes in\n" \
+ "-hot water, when they may be easily peeled. When made in this way you\n" \
+ "-must thicken it with the flour only. Any part of the veal may be used,\n" \
+ "-but the shin or knuckle is the nicest.\n" \
+ "+HOT water, when they may be easily peeled. When made in this way you\n" \
+ "+must THICKEN it with the flour only. Any part of the veal may be used,\n" \
+ "+but the shin OR knuckle is the nicest.\n" \
+ "+Another new line.\n" \
+
+#define DIFF_RENAME_FILE \
+ "diff --git a/beef.txt b/notbeef.txt\n" \
+ "similarity index 100%\n" \
+ "rename from beef.txt\n" \
+ "rename to notbeef.txt\n"
+
+#define DIFF_RENAME_AND_MODIFY_FILE \
+ "diff --git a/beef.txt b/notbeef.txt\n" \
+ "similarity index 97%\n" \
+ "rename from beef.txt\n" \
+ "rename to notbeef.txt\n" \
+ "index 68f6182..6fa1014 100644\n" \
+ "--- a/beef.txt\n" \
+ "+++ b/notbeef.txt\n" \
+ "@@ -1,4 +1,4 @@\n" \
+ "-BEEF SOUP.\n" \
+ "+THIS IS NOT BEEF SOUP, IT HAS A NEW NAME.\n" \
+ "\n" \
+ " Take the hind shin of beef, cut off all the flesh off the leg-bone,\n" \
+ " which must be taken away entirely, or the soup will be greasy. Wash the\n"
+
+#define DIFF_RENAME_A_TO_B_TO_C \
+ "diff --git a/asparagus.txt b/asparagus.txt\n" \
+ "deleted file mode 100644\n" \
+ "index f516580..0000000\n" \
+ "--- a/asparagus.txt\n" \
+ "+++ /dev/null\n" \
+ "@@ -1,10 +0,0 @@\n" \
+ "-ASPARAGUS SOUP!\n" \
+ "-\n" \
+ "-Take four large bunches of asparagus, scrape it nicely, cut off one inch\n" \
+ "-of the tops, and lay them in water, chop the stalks and put them on the\n" \
+ "-fire with a piece of bacon, a large onion cut up, and pepper and salt;\n" \
+ "-add two quarts of water, boil them till the stalks are quite soft, then\n" \
+ "-pulp them through a sieve, and strain the water to it, which must be put\n" \
+ "-back in the pot; put into it a chicken cut up, with the tops of\n" \
+ "-asparagus which had been laid by, boil it until these last articles are\n" \
+ "-sufficiently done, thicken with flour, butter and milk, and serve it up.\n" \
+ "diff --git a/beef.txt b/beef.txt\n" \
+ "index 68f6182..f516580 100644\n" \
+ "--- a/beef.txt\n" \
+ "+++ b/beef.txt\n" \
+ "@@ -1,22 +1,10 @@\n" \
+ "-BEEF SOUP.\n" \
+ "+ASPARAGUS SOUP!\n" \
+ "\n" \
+ "-Take the hind shin of beef, cut off all the flesh off the leg-bone,\n" \
+ "-which must be taken away entirely, or the soup will be greasy. Wash the\n" \
+ "-meat clean and lay it in a pot, sprinkle over it one small\n" \
+ "-table-spoonful of pounded black pepper, and two of salt; three onions\n" \
+ "-the size of a hen's egg, cut small, six small carrots scraped and cut\n" \
+ "-up, two small turnips pared and cut into dice; pour on three quarts of\n" \
+ "-water, cover the pot close, and keep it gently and steadily boiling five\n" \
+ "-hours, which will leave about three pints of clear soup; do not let the\n" \
+ "-pot boil over, but take off the scum carefully, as it rises. When it has\n" \
+ "-boiled four hours, put in a small bundle of thyme and parsley, and a\n" \
+ "-pint of celery cut small, or a tea-spoonful of celery seed pounded.\n" \
+ "-These latter ingredients would lose their delicate flavour if boiled too\n" \
+ "-much. Just before you take it up, brown it in the following manner: put\n" \
+ "-a small table-spoonful of nice brown sugar into an iron skillet, set it\n" \
+ "-on the fire and stir it till it melts and looks very dark, pour into it\n" \
+ "-a ladle full of the soup, a little at a time; stirring it all the while.\n" \
+ "-Strain this browning and mix it well with the soup; take out the bundle\n" \
+ "-of thyme and parsley, put the nicest pieces of meat in your tureen, and\n" \
+ "-pour on the soup and vegetables; put in some toasted bread cut in dice,\n" \
+ "-and serve it up.\n" \
+ "+Take four large bunches of asparagus, scrape it nicely, cut off one inch\n" \
+ "+of the tops, and lay them in water, chop the stalks and put them on the\n" \
+ "+fire with a piece of bacon, a large onion cut up, and pepper and salt;\n" \
+ "+add two quarts of water, boil them till the stalks are quite soft, then\n" \
+ "+pulp them through a sieve, and strain the water to it, which must be put\n" \
+ "+back in the pot; put into it a chicken cut up, with the tops of\n" \
+ "+asparagus which had been laid by, boil it until these last articles are\n" \
+ "+sufficiently done, thicken with flour, butter and milk, and serve it up.\n" \
+ "diff --git a/notbeef.txt b/notbeef.txt\n" \
+ "new file mode 100644\n" \
+ "index 0000000..68f6182\n" \
+ "--- /dev/null\n" \
+ "+++ b/notbeef.txt\n" \
+ "@@ -0,0 +1,22 @@\n" \
+ "+BEEF SOUP.\n" \
+ "+\n" \
+ "+Take the hind shin of beef, cut off all the flesh off the leg-bone,\n" \
+ "+which must be taken away entirely, or the soup will be greasy. Wash the\n" \
+ "+meat clean and lay it in a pot, sprinkle over it one small\n" \
+ "+table-spoonful of pounded black pepper, and two of salt; three onions\n" \
+ "+the size of a hen's egg, cut small, six small carrots scraped and cut\n" \
+ "+up, two small turnips pared and cut into dice; pour on three quarts of\n" \
+ "+water, cover the pot close, and keep it gently and steadily boiling five\n" \
+ "+hours, which will leave about three pints of clear soup; do not let the\n" \
+ "+pot boil over, but take off the scum carefully, as it rises. When it has\n" \
+ "+boiled four hours, put in a small bundle of thyme and parsley, and a\n" \
+ "+pint of celery cut small, or a tea-spoonful of celery seed pounded.\n" \
+ "+These latter ingredients would lose their delicate flavour if boiled too\n" \
+ "+much. Just before you take it up, brown it in the following manner: put\n" \
+ "+a small table-spoonful of nice brown sugar into an iron skillet, set it\n" \
+ "+on the fire and stir it till it melts and looks very dark, pour into it\n" \
+ "+a ladle full of the soup, a little at a time; stirring it all the while.\n" \
+ "+Strain this browning and mix it well with the soup; take out the bundle\n" \
+ "+of thyme and parsley, put the nicest pieces of meat in your tureen, and\n" \
+ "+pour on the soup and vegetables; put in some toasted bread cut in dice,\n" \
+ "+and serve it up.\n"
+
+#define DIFF_RENAME_A_TO_B_TO_C_EXACT \
+ "diff --git a/asparagus.txt b/beef.txt\n" \
+ "similarity index 100%\n" \
+ "rename from asparagus.txt\n" \
+ "rename to beef.txt\n" \
+ "diff --git a/beef.txt b/notbeef.txt\n" \
+ "similarity index 100%\n" \
+ "rename from beef.txt\n" \
+ "rename to notbeef.txt\n"
+
+#define DIFF_RENAME_CIRCULAR \
+ "diff --git a/asparagus.txt b/beef.txt\n" \
+ "similarity index 100%\n" \
+ "rename from asparagus.txt\n" \
+ "rename to beef.txt\n" \
+ "diff --git a/beef.txt b/notbeef.txt\n" \
+ "similarity index 100%\n" \
+ "rename from beef.txt\n" \
+ "rename to asparagus.txt\n"
+
+#define DIFF_RENAME_2_TO_1 \
+ "diff --git a/asparagus.txt b/2.txt\n" \
+ "similarity index 100%\n" \
+ "rename from asparagus.txt\n" \
+ "rename to 2.txt\n" \
+ "diff --git a/beef.txt b/2.txt\n" \
+ "similarity index 100%\n" \
+ "rename from beef.txt\n" \
+ "rename to 2.txt\n"
+
+#define DIFF_RENAME_1_TO_2 \
+ "diff --git a/asparagus.txt b/2.txt\n" \
+ "similarity index 100%\n" \
+ "rename from asparagus.txt\n" \
+ "rename to 1.txt\n" \
+ "diff --git a/asparagus.txt b/2.txt\n" \
+ "similarity index 100%\n" \
+ "rename from asparagus.txt\n" \
+ "rename to 2.txt\n"
+
+#define DIFF_TWO_DELTAS_ONE_FILE \
+ "diff --git a/beef.txt b/beef.txt\n" \
+ "index 68f6182..235069d 100644\n" \
+ "--- a/beef.txt\n" \
+ "+++ b/beef.txt\n" \
+ "@@ -1,4 +1,4 @@\n" \
+ "-BEEF SOUP.\n" \
+ "+BEEF SOUP!\n" \
+ "\n" \
+ " Take the hind shin of beef, cut off all the flesh off the leg-bone,\n" \
+ " which must be taken away entirely, or the soup will be greasy. Wash the\n" \
+ "diff --git a/beef.txt b/beef.txt\n" \
+ "index 68f6182..e059eb5 100644\n" \
+ "--- a/beef.txt\n" \
+ "+++ b/beef.txt\n" \
+ "@@ -19,4 +19,4 @@ a ladle full of the soup, a little at a time; stirring it all the while.\n" \
+ " Strain this browning and mix it well with the soup; take out the bundle\n" \
+ " of thyme and parsley, put the nicest pieces of meat in your tureen, and\n" \
+ " pour on the soup and vegetables; put in some toasted bread cut in dice,\n" \
+ "-and serve it up.\n" \
+ "+and serve it up!\n"
+
+#define DIFF_TWO_DELTAS_ONE_NEW_FILE \
+ "diff --git a/newfile.txt b/newfile.txt\n" \
+ "new file mode 100644\n" \
+ "index 0000000..6434b13\n" \
+ "--- /dev/null\n" \
+ "+++ b/newfile.txt\n" \
+ "@@ -0,0 +1 @@\n" \
+ "+This is a new file.\n" \
+ "diff --git a/newfile.txt b/newfile.txt\n" \
+ "index 6434b13..08d4c44 100644\n" \
+ "--- a/newfile.txt\n" \
+ "+++ b/newfile.txt\n" \
+ "@@ -1 +1,3 @@\n" \
+ " This is a new file.\n" \
+ "+\n" \
+ "+This is another change to a new file.\n"
+
+#define DIFF_RENAME_AND_MODIFY_DELTAS \
+ "diff --git a/veal.txt b/asdf.txt\n" \
+ "similarity index 96%\n" \
+ "rename from veal.txt\n" \
+ "rename to asdf.txt\n" \
+ "index 94d2c01..292cb60 100644\n" \
+ "--- a/veal.txt\n" \
+ "+++ b/asdf.txt\n" \
+ "@@ -15,4 +15,4 @@ will curdle in the soup. For a change you may put a dozen ripe tomatos\n" \
+ " in, first taking off their skins, by letting them stand a few minutes in\n" \
+ " hot water, when they may be easily peeled. When made in this way you\n" \
+ " must thicken it with the flour only. Any part of the veal may be used,\n" \
+ "-but the shin or knuckle is the nicest.\n" \
+ "+but the shin or knuckle is the nicest!\n" \
+ "diff --git a/asdf.txt b/asdf.txt\n" \
+ "index 292cb60..61c686b 100644\n" \
+ "--- a/asdf.txt\n" \
+ "+++ b/asdf.txt\n" \
+ "@@ -1,4 +1,4 @@\n" \
+ "-VEAL SOUP!\n" \
+ "+VEAL SOUP\n" \
+ "\n" \
+ " Put into a pot three quarts of water, three onions cut small, one\n" \
+ " spoonful of black pepper pounded, and two of salt, with two or three\n"
+
+#define DIFF_RENAME_AFTER_MODIFY \
+ "diff --git a/veal.txt b/veal.txt\n" \
+ "index 292cb60..61c686b 100644\n" \
+ "--- a/veal.txt\n" \
+ "+++ b/veal.txt\n" \
+ "@@ -1,4 +1,4 @@\n" \
+ "-VEAL SOUP!\n" \
+ "+VEAL SOUP\n" \
+ "\n" \
+ " Put into a pot three quarts of water, three onions cut small, one\n" \
+ " spoonful of black pepper pounded, and two of salt, with two or three\n" \
+ "diff --git a/veal.txt b/other.txt\n" \
+ "similarity index 96%\n" \
+ "rename from veal.txt\n" \
+ "rename to other.txt\n" \
+ "index 94d2c01..292cb60 100644\n" \
+ "--- a/veal.txt\n" \
+ "+++ b/other.txt\n" \
+ "@@ -15,4 +15,4 @@ will curdle in the soup. For a change you may put a dozen ripe tomatos\n" \
+ " in, first taking off their skins, by letting them stand a few minutes in\n" \
+ " hot water, when they may be easily peeled. When made in this way you\n" \
+ " must thicken it with the flour only. Any part of the veal may be used,\n" \
+ "-but the shin or knuckle is the nicest.\n" \
+ "+but the shin or knuckle is the nicest!\n"
+
+#define DIFF_RENAME_AFTER_MODIFY_TARGET_PATH \
+ "diff --git a/beef.txt b/beef.txt\n" \
+ "index 292cb60..61c686b 100644\n" \
+ "--- a/beef.txt\n" \
+ "+++ b/beef.txt\n" \
+ "@@ -1,4 +1,4 @@\n" \
+ "-VEAL SOUP!\n" \
+ "+VEAL SOUP\n" \
+ "\n" \
+ " Put into a pot three quarts of water, three onions cut small, one\n" \
+ " spoonful of black pepper pounded, and two of salt, with two or three\n" \
+ "diff --git a/veal.txt b/beef.txt\n" \
+ "similarity index 96%\n" \
+ "rename from veal.txt\n" \
+ "rename to beef.txt\n" \
+ "index 94d2c01..292cb60 100644\n" \
+ "--- a/veal.txt\n" \
+ "+++ b/beef.txt\n" \
+ "@@ -15,4 +15,4 @@ will curdle in the soup. For a change you may put a dozen ripe tomatos\n" \
+ " in, first taking off their skins, by letting them stand a few minutes in\n" \
+ " hot water, when they may be easily peeled. When made in this way you\n" \
+ " must thicken it with the flour only. Any part of the veal may be used,\n" \
+ "-but the shin or knuckle is the nicest.\n" \
+ "+but the shin or knuckle is the nicest!\n"
+
+#define DIFF_RENAME_AND_MODIFY_SOURCE_PATH \
+ "diff --git a/veal.txt b/asdf.txt\n" \
+ "similarity index 96%\n" \
+ "rename from veal.txt\n" \
+ "rename to asdf.txt\n" \
+ "index 94d2c01..292cb60 100644\n" \
+ "--- a/veal.txt\n" \
+ "+++ b/asdf.txt\n" \
+ "@@ -15,4 +15,4 @@ will curdle in the soup. For a change you may put a dozen ripe tomatos\n" \
+ " in, first taking off their skins, by letting them stand a few minutes in\n" \
+ " hot water, when they may be easily peeled. When made in this way you\n" \
+ " must thicken it with the flour only. Any part of the veal may be used,\n" \
+ "-but the shin or knuckle is the nicest.\n" \
+ "+but the shin or knuckle is the nicest!\n" \
+ "diff --git a/veal.txt b/veal.txt\n" \
+ "index 292cb60..61c686b 100644\n" \
+ "--- a/veal.txt\n" \
+ "+++ b/veal.txt\n" \
+ "@@ -1,4 +1,4 @@\n" \
+ "-VEAL SOUP!\n" \
+ "+VEAL SOUP\n" \
+ "\n" \
+ " Put into a pot three quarts of water, three onions cut small, one\n" \
+ " spoonful of black pepper pounded, and two of salt, with two or three\n"
+
+#define DIFF_DELETE_AND_READD_FILE \
+ "diff --git a/asparagus.txt b/asparagus.txt\n" \
+ "deleted file mode 100644\n" \
+ "index f516580..0000000\n" \
+ "--- a/asparagus.txt\n" \
+ "+++ /dev/null\n" \
+ "@@ -1,10 +0,0 @@\n" \
+ "-ASPARAGUS SOUP!\n" \
+ "-\n" \
+ "-Take four large bunches of asparagus, scrape it nicely, cut off one inch\n" \
+ "-of the tops, and lay them in water, chop the stalks and put them on the\n" \
+ "-fire with a piece of bacon, a large onion cut up, and pepper and salt;\n" \
+ "-add two quarts of water, boil them till the stalks are quite soft, then\n" \
+ "-pulp them through a sieve, and strain the water to it, which must be put\n" \
+ "-back in the pot; put into it a chicken cut up, with the tops of\n" \
+ "-asparagus which had been laid by, boil it until these last articles are\n" \
+ "-sufficiently done, thicken with flour, butter and milk, and serve it up.\n" \
+ "diff --git a/asparagus.txt b/asparagus.txt\n" \
+ "new file mode 100644\n" \
+ "index 0000000..2dc7f8b\n" \
+ "--- /dev/null\n" \
+ "+++ b/asparagus.txt\n" \
+ "@@ -0,0 +1 @@\n" \
+ "+New file.\n" \
+
+#define DIFF_REMOVE_FILE_TWICE \
+ "diff --git a/asparagus.txt b/asparagus.txt\n" \
+ "deleted file mode 100644\n" \
+ "index f516580..0000000\n" \
+ "--- a/asparagus.txt\n" \
+ "+++ /dev/null\n" \
+ "@@ -1,10 +0,0 @@\n" \
+ "-ASPARAGUS SOUP!\n" \
+ "-\n" \
+ "-Take four large bunches of asparagus, scrape it nicely, cut off one inch\n" \
+ "-of the tops, and lay them in water, chop the stalks and put them on the\n" \
+ "-fire with a piece of bacon, a large onion cut up, and pepper and salt;\n" \
+ "-add two quarts of water, boil them till the stalks are quite soft, then\n" \
+ "-pulp them through a sieve, and strain the water to it, which must be put\n" \
+ "-back in the pot; put into it a chicken cut up, with the tops of\n" \
+ "-asparagus which had been laid by, boil it until these last articles are\n" \
+ "-sufficiently done, thicken with flour, butter and milk, and serve it up.\n" \
+ "diff --git a/asparagus.txt b/asparagus.txt\n" \
+ "deleted file mode 100644\n" \
+ "index f516580..0000000\n" \
+ "--- a/asparagus.txt\n" \
+ "+++ /dev/null\n" \
+ "@@ -1,10 +0,0 @@\n" \
+ "-ASPARAGUS SOUP!\n" \
+ "-\n" \
+ "-Take four large bunches of asparagus, scrape it nicely, cut off one inch\n" \
+ "-of the tops, and lay them in water, chop the stalks and put them on the\n" \
+ "-fire with a piece of bacon, a large onion cut up, and pepper and salt;\n" \
+ "-add two quarts of water, boil them till the stalks are quite soft, then\n" \
+ "-pulp them through a sieve, and strain the water to it, which must be put\n" \
+ "-back in the pot; put into it a chicken cut up, with the tops of\n" \
+ "-asparagus which had been laid by, boil it until these last articles are\n" \
+ "-sufficiently done, thicken with flour, butter and milk, and serve it up.\n"
+
+void validate_apply_workdir(
+ git_repository *repo,
+ struct merge_index_entry *workdir_entries,
+ size_t workdir_cnt);
+
+void validate_apply_index(
+ git_repository *repo,
+ struct merge_index_entry *index_entries,
+ size_t index_cnt);
+
+void validate_index_unchanged(git_repository *repo);
+void validate_workdir_unchanged(git_repository *repo);
--- /dev/null
+#include "clar_libgit2.h"
+#include "apply_helpers.h"
+
+static git_repository *repo;
+
+#define TEST_REPO_PATH "merge-recursive"
+
+void test_apply_both__initialize(void)
+{
+ git_oid oid;
+ git_commit *commit;
+
+ repo = cl_git_sandbox_init(TEST_REPO_PATH);
+
+ git_oid_fromstr(&oid, "539bd011c4822c560c1d17cab095006b7a10f707");
+ cl_git_pass(git_commit_lookup(&commit, repo, &oid));
+ cl_git_pass(git_reset(repo, (git_object *)commit, GIT_RESET_HARD, NULL));
+ git_commit_free(commit);
+}
+
+void test_apply_both__cleanup(void)
+{
+ cl_git_sandbox_cleanup();
+}
+
+void test_apply_both__generated_diff(void)
+{
+ git_oid a_oid, b_oid;
+ git_commit *a_commit, *b_commit;
+ git_tree *a_tree, *b_tree;
+ git_diff *diff;
+ git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT;
+
+ struct merge_index_entry both_expected[] = {
+ { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
+ };
+ size_t both_expected_cnt = sizeof(both_expected) /
+ sizeof(struct merge_index_entry);
+
+ git_oid_fromstr(&a_oid, "539bd011c4822c560c1d17cab095006b7a10f707");
+ git_oid_fromstr(&b_oid, "7c7bf85e978f1d18c0566f702d2cb7766b9c8d4f");
+ cl_git_pass(git_commit_lookup(&a_commit, repo, &a_oid));
+ cl_git_pass(git_commit_lookup(&b_commit, repo, &b_oid));
+
+ cl_git_pass(git_commit_tree(&a_tree, a_commit));
+ cl_git_pass(git_commit_tree(&b_tree, b_commit));
+
+ cl_git_pass(git_diff_tree_to_tree(&diff, repo, a_tree, b_tree, &diff_opts));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_BOTH, NULL));
+
+ validate_apply_index(repo, both_expected, both_expected_cnt);
+ validate_apply_workdir(repo, both_expected, both_expected_cnt);
+
+ git_diff_free(diff);
+ git_tree_free(a_tree);
+ git_tree_free(b_tree);
+ git_commit_free(a_commit);
+ git_commit_free(b_commit);
+}
+
+void test_apply_both__parsed_diff(void)
+{
+ git_diff *diff;
+
+ struct merge_index_entry both_expected[] = {
+ { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
+ };
+ size_t both_expected_cnt = sizeof(both_expected) /
+ sizeof(struct merge_index_entry);
+
+ cl_git_pass(git_diff_from_buffer(&diff,
+ DIFF_MODIFY_TWO_FILES, strlen(DIFF_MODIFY_TWO_FILES)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_BOTH, NULL));
+
+ validate_apply_index(repo, both_expected, both_expected_cnt);
+ validate_apply_workdir(repo, both_expected, both_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+void test_apply_both__removes_file(void)
+{
+ git_diff *diff;
+
+ struct merge_index_entry both_expected[] = {
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" },
+ };
+ size_t both_expected_cnt = sizeof(both_expected) /
+ sizeof(struct merge_index_entry);
+
+ cl_git_pass(git_diff_from_buffer(&diff, DIFF_DELETE_FILE,
+ strlen(DIFF_DELETE_FILE)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_BOTH, NULL));
+
+ validate_apply_index(repo, both_expected, both_expected_cnt);
+ validate_apply_workdir(repo, both_expected, both_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+void test_apply_both__adds_file(void)
+{
+ git_diff *diff;
+
+ struct merge_index_entry both_expected[] = {
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "6370543fcfedb3e6516ec53b06158f3687dc1447", 0, "newfile.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" },
+ };
+ size_t both_expected_cnt = sizeof(both_expected) /
+ sizeof(struct merge_index_entry);
+
+ cl_git_pass(git_diff_from_buffer(&diff,
+ DIFF_ADD_FILE, strlen(DIFF_ADD_FILE)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_BOTH, NULL));
+
+ validate_apply_index(repo, both_expected, both_expected_cnt);
+ validate_apply_workdir(repo, both_expected, both_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+void test_apply_both__application_failure_leaves_index_unmodified(void)
+{
+ git_diff *diff;
+ git_index *index;
+
+ const char *diff_file = DIFF_MODIFY_TWO_FILES;
+
+ struct merge_index_entry index_expected[] = {
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ };
+ size_t index_expected_cnt = sizeof(index_expected) /
+ sizeof(struct merge_index_entry);
+
+ /* mutate the index */
+ cl_git_pass(git_repository_index(&index, repo));
+ cl_git_pass(git_index_remove(index, "veal.txt", 0));
+ cl_git_pass(git_index_write(index));
+ git_index_free(index);
+
+ cl_git_pass(git_diff_from_buffer(&diff, diff_file, strlen(diff_file)));
+ cl_git_fail_with(GIT_EAPPLYFAIL, git_apply(repo, diff, GIT_APPLY_LOCATION_BOTH, NULL));
+
+ validate_apply_index(repo, index_expected, index_expected_cnt);
+ validate_workdir_unchanged(repo);
+
+ git_diff_free(diff);
+}
+
+void test_apply_both__index_must_match_workdir(void)
+{
+ git_diff *diff;
+ git_index *index;
+ git_index_entry idx_entry;
+
+ const char *diff_file = DIFF_MODIFY_TWO_FILES;
+
+ /*
+ * Append a line to the end of the file in both the index and the
+ * working directory. Although the appended line would allow for
+ * patch application in each, the line appended is different in
+ * each, so the application should not be allowed.
+ */
+ cl_git_append2file("merge-recursive/asparagus.txt",
+ "This is a modification.\n");
+
+ cl_git_pass(git_repository_index(&index, repo));
+
+ memset(&idx_entry, 0, sizeof(git_index_entry));
+ idx_entry.mode = 0100644;
+ idx_entry.path = "asparagus.txt";
+ cl_git_pass(git_oid_fromstr(&idx_entry.id, "06d3fefb8726ab1099acc76e02dfb85e034b2538"));
+ cl_git_pass(git_index_add(index, &idx_entry));
+
+ cl_git_pass(git_index_write(index));
+ git_index_free(index);
+
+ cl_git_pass(git_diff_from_buffer(&diff, diff_file, strlen(diff_file)));
+ cl_git_fail_with(GIT_EAPPLYFAIL, git_apply(repo, diff, GIT_APPLY_LOCATION_BOTH, NULL));
+
+ git_diff_free(diff);
+}
+
+void test_apply_both__index_mode_must_match_workdir(void)
+{
+ git_diff *diff;
+
+ if (!cl_is_chmod_supported())
+ clar__skip();
+
+ /* Set a file in the working directory executable. */
+ cl_must_pass(p_chmod("merge-recursive/asparagus.txt", 0755));
+
+ cl_git_pass(git_diff_from_buffer(&diff, DIFF_MODIFY_TWO_FILES,
+ strlen(DIFF_MODIFY_TWO_FILES)));
+ cl_git_fail_with(GIT_EAPPLYFAIL, git_apply(repo, diff, GIT_APPLY_LOCATION_BOTH, NULL));
+
+ git_diff_free(diff);
+}
+
+void test_apply_both__application_failure_leaves_workdir_unmodified(void)
+{
+ git_diff *diff;
+ git_index *index;
+
+ const char *diff_file = DIFF_MODIFY_TWO_FILES;
+
+ struct merge_index_entry workdir_expected[] = {
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "8684724651336001c5dbce74bed6736d2443958d", 0, "veal.txt" },
+ };
+ size_t workdir_expected_cnt = sizeof(workdir_expected) /
+ sizeof(struct merge_index_entry);
+
+ /* mutate the workdir */
+ cl_git_rewritefile("merge-recursive/veal.txt",
+ "This is a modification.\n");
+
+ cl_git_pass(git_repository_index(&index, repo));
+ cl_git_pass(git_index_add_bypath(index, "veal.txt"));
+ cl_git_pass(git_index_write(index));
+ git_index_free(index);
+
+ cl_git_pass(git_diff_from_buffer(&diff, diff_file, strlen(diff_file)));
+ cl_git_fail_with(GIT_EAPPLYFAIL, git_apply(repo, diff, GIT_APPLY_LOCATION_BOTH, NULL));
+
+ validate_apply_workdir(repo, workdir_expected, workdir_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+void test_apply_both__keeps_nonconflicting_changes(void)
+{
+ git_diff *diff;
+ git_index *index;
+ git_index_entry idx_entry;
+
+ const char *diff_file = DIFF_MODIFY_TWO_FILES;
+
+ struct merge_index_entry index_expected[] = {
+ { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
+ { 0100644, "898d12687fb35be271c27c795a6b32c8b51da79e", 0, "beef.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
+ };
+ size_t index_expected_cnt = sizeof(index_expected) /
+ sizeof(struct merge_index_entry);
+
+ struct merge_index_entry workdir_expected[] = {
+ { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "f75ba05f340c51065cbea2e1fdbfe5fe13144c97", 0, "gravy.txt" },
+ { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
+ };
+ size_t workdir_expected_cnt = sizeof(workdir_expected) /
+ sizeof(struct merge_index_entry);
+
+ /* mutate the index */
+ cl_git_pass(git_repository_index(&index, repo));
+
+ memset(&idx_entry, 0, sizeof(git_index_entry));
+ idx_entry.mode = 0100644;
+ idx_entry.path = "beef.txt";
+ cl_git_pass(git_oid_fromstr(&idx_entry.id, "898d12687fb35be271c27c795a6b32c8b51da79e"));
+ cl_git_pass(git_index_add(index, &idx_entry));
+
+ cl_git_pass(git_index_remove(index, "bouilli.txt", 0));
+ cl_git_pass(git_index_write(index));
+ git_index_free(index);
+
+ /* and mutate the working directory */
+ cl_git_rmfile("merge-recursive/oyster.txt");
+ cl_git_rewritefile("merge-recursive/gravy.txt", "Hello, world.\n");
+
+ cl_git_pass(git_diff_from_buffer(&diff, diff_file, strlen(diff_file)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_BOTH, NULL));
+
+ validate_apply_index(repo, index_expected, index_expected_cnt);
+ validate_apply_workdir(repo, workdir_expected, workdir_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+void test_apply_both__can_apply_nonconflicting_file_changes(void)
+{
+ git_diff *diff;
+ git_index *index;
+
+ const char *diff_file = DIFF_MODIFY_TWO_FILES;
+
+ struct merge_index_entry both_expected[] = {
+ { 0100644, "f8a701c8a1a22c1729ee50faff1111f2d64f96fc", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
+ };
+ size_t both_expected_cnt = sizeof(both_expected) /
+ sizeof(struct merge_index_entry);
+
+ /*
+ * Replace the workdir file with a version that is different than
+ * HEAD but such that the patch still applies cleanly. This item
+ * has a new line appended.
+ */
+ cl_git_append2file("merge-recursive/asparagus.txt",
+ "This line is added in the index and the workdir.\n");
+
+ cl_git_pass(git_repository_index(&index, repo));
+ cl_git_pass(git_index_add_bypath(index, "asparagus.txt"));
+ cl_git_pass(git_index_write(index));
+ git_index_free(index);
+
+ cl_git_pass(git_diff_from_buffer(&diff, diff_file, strlen(diff_file)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_BOTH, NULL));
+
+ validate_apply_index(repo, both_expected, both_expected_cnt);
+ validate_apply_workdir(repo, both_expected, both_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+void test_apply_both__honors_crlf_attributes(void)
+{
+ git_diff *diff;
+ git_oid oid;
+ git_commit *commit;
+
+ const char *diff_file = DIFF_MODIFY_TWO_FILES;
+
+ struct merge_index_entry index_expected[] = {
+ { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
+ };
+ size_t index_expected_cnt = sizeof(index_expected) /
+ sizeof(struct merge_index_entry);
+
+ struct merge_index_entry workdir_expected[] = {
+ { 0100644, "176a458f94e0ea5272ce67c36bf30b6be9caf623", 0, ".gitattributes" },
+ { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
+ };
+ size_t workdir_expected_cnt = sizeof(workdir_expected) /
+ sizeof(struct merge_index_entry);
+
+ cl_git_mkfile("merge-recursive/.gitattributes", "* text=auto\n");
+
+ cl_git_rmfile("merge-recursive/asparagus.txt");
+ cl_git_rmfile("merge-recursive/veal.txt");
+
+ git_oid_fromstr(&oid, "539bd011c4822c560c1d17cab095006b7a10f707");
+ cl_git_pass(git_commit_lookup(&commit, repo, &oid));
+ cl_git_pass(git_reset(repo, (git_object *)commit, GIT_RESET_HARD, NULL));
+ git_commit_free(commit);
+
+ cl_git_pass(git_diff_from_buffer(&diff, diff_file, strlen(diff_file)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_BOTH, NULL));
+
+ validate_apply_index(repo, index_expected, index_expected_cnt);
+ validate_apply_workdir(repo, workdir_expected, workdir_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+void test_apply_both__rename(void)
+{
+ git_diff *diff;
+
+ struct merge_index_entry both_expected[] = {
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "notbeef.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" },
+ };
+ size_t both_expected_cnt = sizeof(both_expected) /
+ sizeof(struct merge_index_entry);
+
+ cl_git_pass(git_diff_from_buffer(&diff, DIFF_RENAME_FILE,
+ strlen(DIFF_RENAME_FILE)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_BOTH, NULL));
+
+ validate_apply_index(repo, both_expected, both_expected_cnt);
+ validate_apply_workdir(repo, both_expected, both_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+void test_apply_both__rename_and_modify(void)
+{
+ git_diff *diff;
+
+ struct merge_index_entry both_expected[] = {
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "6fa10147f00fe1fab1d5e835529a9dad53db8552", 0, "notbeef.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" },
+ };
+ size_t both_expected_cnt = sizeof(both_expected) /
+ sizeof(struct merge_index_entry);
+
+ cl_git_pass(git_diff_from_buffer(&diff, DIFF_RENAME_AND_MODIFY_FILE,
+ strlen(DIFF_RENAME_AND_MODIFY_FILE)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_BOTH, NULL));
+
+ validate_apply_index(repo, both_expected, both_expected_cnt);
+ validate_apply_workdir(repo, both_expected, both_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+void test_apply_both__rename_a_to_b_to_c(void)
+{
+ git_diff *diff;
+
+ struct merge_index_entry both_expected[] = {
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "notbeef.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" },
+ };
+ size_t both_expected_cnt = sizeof(both_expected) /
+ sizeof(struct merge_index_entry);
+
+ cl_git_pass(git_diff_from_buffer(&diff, DIFF_RENAME_A_TO_B_TO_C,
+ strlen(DIFF_RENAME_A_TO_B_TO_C)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_BOTH, NULL));
+
+ validate_apply_index(repo, both_expected, both_expected_cnt);
+ validate_apply_workdir(repo, both_expected, both_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+void test_apply_both__rename_a_to_b_to_c_exact(void)
+{
+ git_diff *diff;
+
+ struct merge_index_entry both_expected[] = {
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "notbeef.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" },
+ };
+ size_t both_expected_cnt = sizeof(both_expected) /
+ sizeof(struct merge_index_entry);
+
+ cl_git_pass(git_diff_from_buffer(&diff, DIFF_RENAME_A_TO_B_TO_C_EXACT,
+ strlen(DIFF_RENAME_A_TO_B_TO_C_EXACT)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_BOTH, NULL));
+
+ validate_apply_index(repo, both_expected, both_expected_cnt);
+ validate_apply_workdir(repo, both_expected, both_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+void test_apply_both__rename_circular(void)
+{
+ git_diff *diff;
+
+ struct merge_index_entry both_expected[] = {
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "asparagus.txt" },
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" }
+ };
+ size_t both_expected_cnt = sizeof(both_expected) /
+ sizeof(struct merge_index_entry);
+
+ cl_git_pass(git_diff_from_buffer(&diff, DIFF_RENAME_CIRCULAR,
+ strlen(DIFF_RENAME_CIRCULAR)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_BOTH, NULL));
+
+ validate_apply_index(repo, both_expected, both_expected_cnt);
+ validate_apply_workdir(repo, both_expected, both_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+void test_apply_both__rename_2_to_1(void)
+{
+ git_diff *diff;
+
+ struct merge_index_entry both_expected[] = {
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "2.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" }
+ };
+ size_t both_expected_cnt = sizeof(both_expected) /
+ sizeof(struct merge_index_entry);
+
+ cl_git_pass(git_diff_from_buffer(&diff, DIFF_RENAME_2_TO_1,
+ strlen(DIFF_RENAME_2_TO_1)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_BOTH, NULL));
+
+ validate_apply_index(repo, both_expected, both_expected_cnt);
+ validate_apply_workdir(repo, both_expected, both_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+void test_apply_both__rename_1_to_2(void)
+{
+ git_diff *diff;
+
+ struct merge_index_entry both_expected[] = {
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "1.txt" },
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "2.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" }
+ };
+ size_t both_expected_cnt = sizeof(both_expected) /
+ sizeof(struct merge_index_entry);
+
+ cl_git_pass(git_diff_from_buffer(&diff, DIFF_RENAME_1_TO_2,
+ strlen(DIFF_RENAME_1_TO_2)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_BOTH, NULL));
+
+ validate_apply_index(repo, both_expected, both_expected_cnt);
+ validate_apply_workdir(repo, both_expected, both_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+void test_apply_both__two_deltas_one_file(void)
+{
+ git_diff *diff;
+
+ struct merge_index_entry both_expected[] = {
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
+ { 0100644, "0a9fd4415635e72573f0f6b5e68084cfe18f5075", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" }
+ };
+ size_t both_expected_cnt = sizeof(both_expected) /
+ sizeof(struct merge_index_entry);
+
+ cl_git_pass(git_diff_from_buffer(&diff, DIFF_TWO_DELTAS_ONE_FILE,
+ strlen(DIFF_TWO_DELTAS_ONE_FILE)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_BOTH, NULL));
+
+ validate_apply_index(repo, both_expected, both_expected_cnt);
+ validate_apply_workdir(repo, both_expected, both_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+void test_apply_both__two_deltas_one_new_file(void)
+{
+ git_diff *diff;
+
+ struct merge_index_entry both_expected[] = {
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "08d4c445cf0078f3d9b604b82f32f4d87e083325", 0, "newfile.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" }
+ };
+ size_t both_expected_cnt = sizeof(both_expected) /
+ sizeof(struct merge_index_entry);
+
+ cl_git_pass(git_diff_from_buffer(&diff, DIFF_TWO_DELTAS_ONE_NEW_FILE,
+ strlen(DIFF_TWO_DELTAS_ONE_NEW_FILE)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_BOTH, NULL));
+
+ validate_apply_index(repo, both_expected, both_expected_cnt);
+ validate_apply_workdir(repo, both_expected, both_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+void test_apply_both__rename_and_modify_deltas(void)
+{
+ git_diff *diff;
+
+ struct merge_index_entry both_expected[] = {
+ { 0100644, "61c686bed39684eee8a2757ceb1291004a21333f", 0, "asdf.txt" },
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ };
+ size_t both_expected_cnt = sizeof(both_expected) /
+ sizeof(struct merge_index_entry);
+
+ cl_git_pass(git_diff_from_buffer(&diff, DIFF_RENAME_AND_MODIFY_DELTAS,
+ strlen(DIFF_RENAME_AND_MODIFY_DELTAS)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_BOTH, NULL));
+
+ validate_apply_index(repo, both_expected, both_expected_cnt);
+ validate_apply_workdir(repo, both_expected, both_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+void test_apply_both__rename_delta_after_modify_delta(void)
+{
+ git_diff *diff;
+
+ struct merge_index_entry both_expected[] = {
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "292cb60ce5e25c337c5b6e12957bbbfe1be4bf49", 0, "other.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "c8c120f466591bbe3b8867361d5ec3cdd9fda756", 0, "veal.txt" }
+ };
+ size_t both_expected_cnt = sizeof(both_expected) /
+ sizeof(struct merge_index_entry);
+
+ cl_git_pass(git_diff_from_buffer(&diff, DIFF_RENAME_AFTER_MODIFY,
+ strlen(DIFF_RENAME_AFTER_MODIFY)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_BOTH, NULL));
+
+ validate_apply_index(repo, both_expected, both_expected_cnt);
+ validate_apply_workdir(repo, both_expected, both_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+void test_apply_both__cant_rename_after_modify_nonexistent_target_path(void)
+{
+ git_diff *diff;
+
+ cl_git_pass(git_diff_from_buffer(&diff, DIFF_RENAME_AFTER_MODIFY_TARGET_PATH,
+ strlen(DIFF_RENAME_AFTER_MODIFY_TARGET_PATH)));
+ cl_git_fail(git_apply(repo, diff, GIT_APPLY_LOCATION_BOTH, NULL));
+
+ git_diff_free(diff);
+}
+
+void test_apply_both__cant_modify_source_path_after_rename(void)
+{
+ git_diff *diff;
+
+ cl_git_pass(git_diff_from_buffer(&diff, DIFF_RENAME_AND_MODIFY_SOURCE_PATH,
+ strlen(DIFF_RENAME_AND_MODIFY_SOURCE_PATH)));
+ cl_git_fail(git_apply(repo, diff, GIT_APPLY_LOCATION_BOTH, NULL));
+
+ git_diff_free(diff);
+}
+
+void test_apply_both__readd_deleted_file(void)
+{
+ git_diff *diff;
+
+ struct merge_index_entry both_expected[] = {
+ { 0100644, "2dc7f8b24ba27f3888368bd180df03ff4c6c6fab", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" }
+ };
+ size_t both_expected_cnt = sizeof(both_expected) /
+ sizeof(struct merge_index_entry);
+
+ cl_git_pass(git_diff_from_buffer(&diff, DIFF_DELETE_AND_READD_FILE,
+ strlen(DIFF_DELETE_AND_READD_FILE)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_BOTH, NULL));
+
+ validate_apply_index(repo, both_expected, both_expected_cnt);
+ validate_apply_workdir(repo, both_expected, both_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+void test_apply_both__cant_remove_file_twice(void)
+{
+ git_diff *diff;
+
+ cl_git_pass(git_diff_from_buffer(&diff, DIFF_REMOVE_FILE_TWICE,
+ strlen(DIFF_REMOVE_FILE_TWICE)));
+ cl_git_fail(git_apply(repo, diff, GIT_APPLY_LOCATION_BOTH, NULL));
+
+ git_diff_free(diff);
+}
--- /dev/null
+#include "clar_libgit2.h"
+#include "apply_helpers.h"
+
+static git_repository *repo;
+
+#define TEST_REPO_PATH "merge-recursive"
+
+void test_apply_callbacks__initialize(void)
+{
+ git_oid oid;
+ git_commit *commit;
+
+ repo = cl_git_sandbox_init(TEST_REPO_PATH);
+
+ git_oid_fromstr(&oid, "539bd011c4822c560c1d17cab095006b7a10f707");
+ cl_git_pass(git_commit_lookup(&commit, repo, &oid));
+ cl_git_pass(git_reset(repo, (git_object *)commit, GIT_RESET_HARD, NULL));
+ git_commit_free(commit);
+}
+
+void test_apply_callbacks__cleanup(void)
+{
+ cl_git_sandbox_cleanup();
+}
+
+static int delta_abort_cb(const git_diff_delta *delta, void *payload)
+{
+ GIT_UNUSED(payload);
+
+ if (!strcmp(delta->old_file.path, "veal.txt"))
+ return -99;
+
+ return 0;
+}
+
+void test_apply_callbacks__delta_aborts(void)
+{
+ git_diff *diff;
+ git_apply_options opts = GIT_APPLY_OPTIONS_INIT;
+
+ opts.delta_cb = delta_abort_cb;
+
+ cl_git_pass(git_diff_from_buffer(&diff,
+ DIFF_MODIFY_TWO_FILES, strlen(DIFF_MODIFY_TWO_FILES)));
+ cl_git_fail_with(-99,
+ git_apply(repo, diff, GIT_APPLY_LOCATION_INDEX, &opts));
+
+ validate_index_unchanged(repo);
+ validate_workdir_unchanged(repo);
+
+ git_diff_free(diff);
+}
+
+static int delta_skip_cb(const git_diff_delta *delta, void *payload)
+{
+ GIT_UNUSED(payload);
+
+ if (!strcmp(delta->old_file.path, "asparagus.txt"))
+ return 1;
+
+ return 0;
+}
+
+void test_apply_callbacks__delta_can_skip(void)
+{
+ git_diff *diff;
+ git_apply_options opts = GIT_APPLY_OPTIONS_INIT;
+
+ struct merge_index_entry workdir_expected[] = {
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
+ };
+ size_t workdir_expected_cnt = sizeof(workdir_expected) /
+ sizeof(struct merge_index_entry);
+
+ opts.delta_cb = delta_skip_cb;
+
+ cl_git_pass(git_diff_from_buffer(&diff,
+ DIFF_MODIFY_TWO_FILES, strlen(DIFF_MODIFY_TWO_FILES)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_WORKDIR, &opts));
+
+ validate_index_unchanged(repo);
+ validate_apply_workdir(repo, workdir_expected, workdir_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+static int hunk_skip_odds_cb(const git_diff_hunk *hunk, void *payload)
+{
+ int *count = (int *)payload;
+ GIT_UNUSED(hunk);
+
+ return ((*count)++ % 2 == 1);
+}
+
+void test_apply_callbacks__hunk_can_skip(void)
+{
+ git_diff *diff;
+ git_apply_options opts = GIT_APPLY_OPTIONS_INIT;
+ int count = 0;
+
+ struct merge_index_entry workdir_expected[] = {
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "06f751b6ba4f017ddbf4248015768300268e092a", 0, "veal.txt" },
+ };
+ size_t workdir_expected_cnt = sizeof(workdir_expected) /
+ sizeof(struct merge_index_entry);
+
+ opts.hunk_cb = hunk_skip_odds_cb;
+ opts.payload = &count;
+
+ cl_git_pass(git_diff_from_buffer(&diff,
+ DIFF_MANY_CHANGES_ONE, strlen(DIFF_MANY_CHANGES_ONE)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_WORKDIR, &opts));
+
+ validate_index_unchanged(repo);
+ validate_apply_workdir(repo, workdir_expected, workdir_expected_cnt);
+
+ git_diff_free(diff);
+}
cl_assert_equal_s(patch_expected, patchbuf.ptr);
}
- error = git_apply__patch(&result, &filename, &mode, old ? old->ptr : NULL, old ? old->size : 0, patch);
+ error = git_apply__patch(&result, &filename, &mode, old ? old->ptr : NULL, old ? old->size : 0, patch, NULL);
if (error == 0 && new == NULL) {
cl_assert_equal_i(0, result.size);
}
git__free(filename);
- git_buf_free(&result);
- git_buf_free(&patchbuf);
+ git_buf_dispose(&result);
+ git_buf_dispose(&patchbuf);
git_patch_free(patch);
return error;
PATCH_ORIGINAL_TO_PREPEND_NOCONTEXT, &diff_opts));
}
+void test_apply_fromdiff__prepend_and_change(void)
+{
+ cl_git_pass(apply_buf(
+ FILE_ORIGINAL, "file.txt",
+ FILE_PREPEND_AND_CHANGE, "file.txt",
+ PATCH_ORIGINAL_TO_PREPEND_AND_CHANGE, NULL));
+}
+
+void test_apply_fromdiff__prepend_and_change_nocontext(void)
+{
+ git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT;
+ diff_opts.context_lines = 0;
+
+ cl_git_pass(apply_buf(
+ FILE_ORIGINAL, "file.txt",
+ FILE_PREPEND_AND_CHANGE, "file.txt",
+ PATCH_ORIGINAL_TO_PREPEND_AND_CHANGE_NOCONTEXT, &diff_opts));
+}
+
+void test_apply_fromdiff__delete_and_change(void)
+{
+ cl_git_pass(apply_buf(
+ FILE_ORIGINAL, "file.txt",
+ FILE_DELETE_AND_CHANGE, "file.txt",
+ PATCH_ORIGINAL_TO_DELETE_AND_CHANGE, NULL));
+}
+
+void test_apply_fromdiff__delete_and_change_nocontext(void)
+{
+ git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT;
+ diff_opts.context_lines = 0;
+
+ cl_git_pass(apply_buf(
+ FILE_ORIGINAL, "file.txt",
+ FILE_DELETE_AND_CHANGE, "file.txt",
+ PATCH_ORIGINAL_TO_DELETE_AND_CHANGE_NOCONTEXT, &diff_opts));
+}
+
+void test_apply_fromdiff__delete_firstline(void)
+{
+ cl_git_pass(apply_buf(
+ FILE_ORIGINAL, "file.txt",
+ FILE_DELETE_FIRSTLINE, "file.txt",
+ PATCH_ORIGINAL_TO_DELETE_FIRSTLINE, NULL));
+}
+
void test_apply_fromdiff__append(void)
{
cl_git_pass(apply_buf(
cl_git_pass(git_patch_from_buffer(&patch, patchfile, strlen(patchfile), NULL));
- error = git_apply__patch(&result, &filename, &mode, old, old_len, patch);
+ error = git_apply__patch(&result, &filename, &mode, old, old_len, patch, NULL);
if (error == 0) {
cl_assert_equal_i(new_len, result.size);
- cl_assert(memcmp(new, result.ptr, new_len) == 0);
+ if (new_len)
+ cl_assert(memcmp(new, result.ptr, new_len) == 0);
cl_assert_equal_s(filename_expected, filename);
cl_assert_equal_i(mode_expected, mode);
}
git__free(filename);
- git_buf_free(&result);
- git_buf_free(&patchbuf);
+ git_buf_dispose(&result);
+ git_buf_dispose(&patchbuf);
git_patch_free(patch);
return error;
error = apply_patchfile(old, old_len, new, new_len, patchfile, filename_expected, mode_expected);
- git_buf_free(&validated);
+ git_buf_dispose(&validated);
git_patch_free(patch_fromdiff);
return error;
--- /dev/null
+#include "clar_libgit2.h"
+#include "apply_helpers.h"
+
+static git_repository *repo;
+
+#define TEST_REPO_PATH "merge-recursive"
+
+void test_apply_index__initialize(void)
+{
+ git_oid oid;
+ git_commit *commit;
+
+ repo = cl_git_sandbox_init(TEST_REPO_PATH);
+
+ git_oid_fromstr(&oid, "539bd011c4822c560c1d17cab095006b7a10f707");
+ cl_git_pass(git_commit_lookup(&commit, repo, &oid));
+ cl_git_pass(git_reset(repo, (git_object *)commit, GIT_RESET_HARD, NULL));
+ git_commit_free(commit);
+}
+
+void test_apply_index__cleanup(void)
+{
+ cl_git_sandbox_cleanup();
+}
+
+void test_apply_index__generate_diff(void)
+{
+ git_oid a_oid, b_oid;
+ git_commit *a_commit, *b_commit;
+ git_tree *a_tree, *b_tree;
+ git_diff *diff;
+ git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT;
+
+ struct merge_index_entry index_expected[] = {
+ { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
+ };
+ size_t index_expected_cnt = sizeof(index_expected) /
+ sizeof(struct merge_index_entry);
+
+ git_oid_fromstr(&a_oid, "539bd011c4822c560c1d17cab095006b7a10f707");
+ git_oid_fromstr(&b_oid, "7c7bf85e978f1d18c0566f702d2cb7766b9c8d4f");
+ cl_git_pass(git_commit_lookup(&a_commit, repo, &a_oid));
+ cl_git_pass(git_commit_lookup(&b_commit, repo, &b_oid));
+
+ cl_git_pass(git_commit_tree(&a_tree, a_commit));
+ cl_git_pass(git_commit_tree(&b_tree, b_commit));
+
+ cl_git_pass(git_diff_tree_to_tree(&diff, repo, a_tree, b_tree, &diff_opts));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_INDEX, NULL));
+
+ validate_apply_index(repo, index_expected, index_expected_cnt);
+ validate_workdir_unchanged(repo);
+
+ git_diff_free(diff);
+ git_tree_free(a_tree);
+ git_tree_free(b_tree);
+ git_commit_free(a_commit);
+ git_commit_free(b_commit);
+}
+
+void test_apply_index__parsed_diff(void)
+{
+ git_diff *diff;
+
+ struct merge_index_entry index_expected[] = {
+ { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
+ };
+ size_t index_expected_cnt = sizeof(index_expected) /
+ sizeof(struct merge_index_entry);
+
+ cl_git_pass(git_diff_from_buffer(&diff,
+ DIFF_MODIFY_TWO_FILES, strlen(DIFF_MODIFY_TWO_FILES)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_INDEX, NULL));
+
+ validate_apply_index(repo, index_expected, index_expected_cnt);
+ validate_workdir_unchanged(repo);
+
+ git_diff_free(diff);
+}
+
+void test_apply_index__removes_file(void)
+{
+ git_diff *diff;
+
+ struct merge_index_entry index_expected[] = {
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" },
+ };
+ size_t index_expected_cnt = sizeof(index_expected) /
+ sizeof(struct merge_index_entry);
+
+ cl_git_pass(git_diff_from_buffer(&diff, DIFF_DELETE_FILE,
+ strlen(DIFF_DELETE_FILE)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_INDEX, NULL));
+
+ validate_apply_index(repo, index_expected, index_expected_cnt);
+ validate_workdir_unchanged(repo);
+
+ git_diff_free(diff);
+}
+
+void test_apply_index__adds_file(void)
+{
+ git_diff *diff;
+
+ struct merge_index_entry index_expected[] = {
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "6370543fcfedb3e6516ec53b06158f3687dc1447", 0, "newfile.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" },
+ };
+ size_t index_expected_cnt = sizeof(index_expected) /
+ sizeof(struct merge_index_entry);
+
+ cl_git_pass(git_diff_from_buffer(&diff,
+ DIFF_ADD_FILE, strlen(DIFF_ADD_FILE)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_INDEX, NULL));
+
+ validate_apply_index(repo, index_expected, index_expected_cnt);
+ validate_workdir_unchanged(repo);
+
+ git_diff_free(diff);
+}
+
+void test_apply_index__modified_workdir_with_unmodified_index_is_ok(void)
+{
+ git_diff *diff;
+
+ const char *diff_file = DIFF_MODIFY_TWO_FILES;
+
+ struct merge_index_entry index_expected[] = {
+ { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
+ };
+ size_t index_expected_cnt = sizeof(index_expected) /
+ sizeof(struct merge_index_entry);
+
+ struct merge_index_entry workdir_expected[] = {
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "f75ba05f340c51065cbea2e1fdbfe5fe13144c97", 0, "veal.txt" }
+ };
+ size_t workdir_expected_cnt = sizeof(workdir_expected) /
+ sizeof(struct merge_index_entry);
+
+ /* mutate the workdir and leave the index matching HEAD */
+ cl_git_rmfile("merge-recursive/asparagus.txt");
+ cl_git_rewritefile("merge-recursive/veal.txt", "Hello, world.\n");
+
+ cl_git_pass(git_diff_from_buffer(&diff, diff_file, strlen(diff_file)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_INDEX, NULL));
+
+ validate_apply_index(repo, index_expected, index_expected_cnt);
+ validate_apply_workdir(repo, workdir_expected, workdir_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+void test_apply_index__application_failure_leaves_index_unmodified(void)
+{
+ git_diff *diff;
+ git_index *index;
+
+ const char *diff_file = DIFF_MODIFY_TWO_FILES;
+
+ struct merge_index_entry index_expected[] = {
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ };
+ size_t index_expected_cnt = sizeof(index_expected) /
+ sizeof(struct merge_index_entry);
+
+ /* mutate the index */
+ cl_git_pass(git_repository_index(&index, repo));
+ cl_git_pass(git_index_remove(index, "veal.txt", 0));
+ cl_git_pass(git_index_write(index));
+ git_index_free(index);
+
+ cl_git_pass(git_diff_from_buffer(&diff, diff_file, strlen(diff_file)));
+ cl_git_fail_with(GIT_EAPPLYFAIL, git_apply(repo, diff, GIT_APPLY_LOCATION_INDEX, NULL));
+
+ validate_apply_index(repo, index_expected, index_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+void test_apply_index__keeps_nonconflicting_changes(void)
+{
+ git_diff *diff;
+ git_index *index;
+ git_index_entry idx_entry;
+
+ const char *diff_file = DIFF_MODIFY_TWO_FILES;
+
+ struct merge_index_entry index_expected[] = {
+ { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
+ { 0100644, "898d12687fb35be271c27c795a6b32c8b51da79e", 0, "beef.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
+ };
+ size_t index_expected_cnt = sizeof(index_expected) /
+ sizeof(struct merge_index_entry);
+
+ /* mutate the index */
+ cl_git_pass(git_repository_index(&index, repo));
+
+ memset(&idx_entry, 0, sizeof(git_index_entry));
+ idx_entry.mode = 0100644;
+ idx_entry.path = "beef.txt";
+ cl_git_pass(git_oid_fromstr(&idx_entry.id, "898d12687fb35be271c27c795a6b32c8b51da79e"));
+ cl_git_pass(git_index_add(index, &idx_entry));
+
+ cl_git_pass(git_index_remove(index, "bouilli.txt", 0));
+ cl_git_pass(git_index_write(index));
+ git_index_free(index);
+
+ cl_git_pass(git_diff_from_buffer(&diff, diff_file, strlen(diff_file)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_INDEX, NULL));
+
+ validate_apply_index(repo, index_expected, index_expected_cnt);
+ validate_workdir_unchanged(repo);
+
+ git_diff_free(diff);
+}
+
+void test_apply_index__can_apply_nonconflicting_file_changes(void)
+{
+ git_diff *diff;
+ git_index *index;
+ git_index_entry idx_entry;
+
+ const char *diff_file = DIFF_MODIFY_TWO_FILES;
+
+ struct merge_index_entry index_expected[] = {
+ { 0100644, "4f2d1645dee99ced096877911de540c65ade2ef8", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
+ };
+ size_t index_expected_cnt = sizeof(index_expected) /
+ sizeof(struct merge_index_entry);
+
+ /*
+ * Replace the index entry with a version that is different than
+ * HEAD but such that the patch still applies cleanly. This item
+ * has a new line appended.
+ */
+
+ cl_git_pass(git_repository_index(&index, repo));
+
+ memset(&idx_entry, 0, sizeof(git_index_entry));
+ idx_entry.mode = 0100644;
+ idx_entry.path = "asparagus.txt";
+ cl_git_pass(git_oid_fromstr(&idx_entry.id, "06d3fefb8726ab1099acc76e02dfb85e034b2538"));
+ cl_git_pass(git_index_add(index, &idx_entry));
+
+ cl_git_pass(git_index_write(index));
+ git_index_free(index);
+
+ cl_git_pass(git_diff_from_buffer(&diff, diff_file, strlen(diff_file)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_INDEX, NULL));
+
+ validate_apply_index(repo, index_expected, index_expected_cnt);
+ validate_workdir_unchanged(repo);
+
+ git_diff_free(diff);
+}
+
+void test_apply_index__change_mode(void)
+{
+ git_diff *diff;
+
+ const char *diff_file = DIFF_EXECUTABLE_FILE;
+
+ struct merge_index_entry index_expected[] = {
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
+ { 0100755, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" },
+ };
+ size_t index_expected_cnt = sizeof(index_expected) /
+ sizeof(struct merge_index_entry);
+
+ cl_git_pass(git_diff_from_buffer(&diff, diff_file, strlen(diff_file)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_INDEX, NULL));
+
+ validate_apply_index(repo, index_expected, index_expected_cnt);
+ validate_workdir_unchanged(repo);
+
+ git_diff_free(diff);
+}
--- /dev/null
+#include "clar_libgit2.h"
+#include "git2/sys/repository.h"
+
+#include "apply.h"
+#include "repository.h"
+#include "buf_text.h"
+
+#include "../patch/patch_common.h"
+
+static git_repository *repo = NULL;
+
+void test_apply_partial__initialize(void)
+{
+ repo = cl_git_sandbox_init("renames");
+}
+
+void test_apply_partial__cleanup(void)
+{
+ cl_git_sandbox_cleanup();
+}
+
+static int skip_addition(
+ const git_diff_hunk *hunk,
+ void *payload)
+{
+ GIT_UNUSED(payload);
+
+ return (hunk->new_lines > hunk->old_lines) ? 1 : 0;
+}
+
+static int skip_deletion(
+ const git_diff_hunk *hunk,
+ void *payload)
+{
+ GIT_UNUSED(payload);
+
+ return (hunk->new_lines < hunk->old_lines) ? 1 : 0;
+}
+
+static int skip_change(
+ const git_diff_hunk *hunk,
+ void *payload)
+{
+ GIT_UNUSED(payload);
+
+ return (hunk->new_lines == hunk->old_lines) ? 1 : 0;
+}
+
+static int abort_addition(
+ const git_diff_hunk *hunk,
+ void *payload)
+{
+ GIT_UNUSED(payload);
+
+ return (hunk->new_lines > hunk->old_lines) ? GIT_EUSER : 0;
+}
+
+static int abort_deletion(
+ const git_diff_hunk *hunk,
+ void *payload)
+{
+ GIT_UNUSED(payload);
+
+ return (hunk->new_lines < hunk->old_lines) ? GIT_EUSER : 0;
+}
+
+static int abort_change(
+ const git_diff_hunk *hunk,
+ void *payload)
+{
+ GIT_UNUSED(payload);
+
+ return (hunk->new_lines == hunk->old_lines) ? GIT_EUSER : 0;
+}
+
+static int apply_buf(
+ const char *old,
+ const char *oldname,
+ const char *new,
+ const char *newname,
+ const char *expected,
+ const git_diff_options *diff_opts,
+ git_apply_hunk_cb hunk_cb,
+ void *payload)
+{
+ git_patch *patch;
+ git_buf result = GIT_BUF_INIT;
+ git_buf patchbuf = GIT_BUF_INIT;
+ git_apply_options opts = GIT_APPLY_OPTIONS_INIT;
+ char *filename;
+ unsigned int mode;
+ int error;
+ size_t oldsize = strlen(old);
+ size_t newsize = strlen(new);
+
+ opts.hunk_cb = hunk_cb;
+ opts.payload = payload;
+
+ cl_git_pass(git_patch_from_buffers(&patch, old, oldsize, oldname, new, newsize, newname, diff_opts));
+ if ((error = git_apply__patch(&result, &filename, &mode, old, oldsize, patch, &opts)) == 0) {
+ cl_assert_equal_s(expected, result.ptr);
+ cl_assert_equal_s(newname, filename);
+ cl_assert_equal_i(0100644, mode);
+ }
+
+ git__free(filename);
+ git_buf_dispose(&result);
+ git_buf_dispose(&patchbuf);
+ git_patch_free(patch);
+
+ return error;
+}
+
+void test_apply_partial__prepend_and_change_skip_addition(void)
+{
+ cl_git_pass(apply_buf(
+ FILE_ORIGINAL, "file.txt",
+ FILE_PREPEND_AND_CHANGE, "file.txt",
+ FILE_ORIGINAL, NULL, skip_addition, NULL));
+}
+
+void test_apply_partial__prepend_and_change_nocontext_skip_addition(void)
+{
+ git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT;
+ diff_opts.context_lines = 0;
+
+ cl_git_pass(apply_buf(
+ FILE_ORIGINAL, "file.txt",
+ FILE_PREPEND_AND_CHANGE, "file.txt",
+ FILE_CHANGE_MIDDLE, &diff_opts, skip_addition, NULL));
+}
+
+void test_apply_partial__prepend_and_change_nocontext_abort_addition(void)
+{
+ git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT;
+ diff_opts.context_lines = 0;
+
+ cl_git_fail(apply_buf(
+ FILE_ORIGINAL, "file.txt",
+ FILE_PREPEND_AND_CHANGE, "file.txt",
+ FILE_ORIGINAL, &diff_opts, abort_addition, NULL));
+}
+
+void test_apply_partial__prepend_and_change_skip_change(void)
+{
+ cl_git_pass(apply_buf(
+ FILE_ORIGINAL, "file.txt",
+ FILE_PREPEND_AND_CHANGE, "file.txt",
+ FILE_PREPEND_AND_CHANGE, NULL, skip_change, NULL));
+}
+
+void test_apply_partial__prepend_and_change_nocontext_skip_change(void)
+{
+ git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT;
+ diff_opts.context_lines = 0;
+
+ cl_git_pass(apply_buf(
+ FILE_ORIGINAL, "file.txt",
+ FILE_PREPEND_AND_CHANGE, "file.txt",
+ FILE_PREPEND, &diff_opts, skip_change, NULL));
+}
+
+void test_apply_partial__prepend_and_change_nocontext_abort_change(void)
+{
+ git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT;
+ diff_opts.context_lines = 0;
+
+ cl_git_fail(apply_buf(
+ FILE_ORIGINAL, "file.txt",
+ FILE_PREPEND_AND_CHANGE, "file.txt",
+ FILE_PREPEND, &diff_opts, abort_change, NULL));
+}
+
+void test_apply_partial__delete_and_change_skip_deletion(void)
+{
+ cl_git_pass(apply_buf(
+ FILE_ORIGINAL, "file.txt",
+ FILE_DELETE_AND_CHANGE, "file.txt",
+ FILE_ORIGINAL, NULL, skip_deletion, NULL));
+}
+
+void test_apply_partial__delete_and_change_nocontext_skip_deletion(void)
+{
+ git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT;
+ diff_opts.context_lines = 0;
+
+ cl_git_pass(apply_buf(
+ FILE_ORIGINAL, "file.txt",
+ FILE_DELETE_AND_CHANGE, "file.txt",
+ FILE_CHANGE_MIDDLE, &diff_opts, skip_deletion, NULL));
+}
+
+void test_apply_partial__delete_and_change_nocontext_abort_deletion(void)
+{
+ git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT;
+ diff_opts.context_lines = 0;
+
+ cl_git_fail(apply_buf(
+ FILE_ORIGINAL, "file.txt",
+ FILE_DELETE_AND_CHANGE, "file.txt",
+ FILE_ORIGINAL, &diff_opts, abort_deletion, NULL));
+}
+
+void test_apply_partial__delete_and_change_skip_change(void)
+{
+ cl_git_pass(apply_buf(
+ FILE_ORIGINAL, "file.txt",
+ FILE_DELETE_AND_CHANGE, "file.txt",
+ FILE_DELETE_AND_CHANGE, NULL, skip_change, NULL));
+}
+
+void test_apply_partial__delete_and_change_nocontext_skip_change(void)
+{
+ git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT;
+ diff_opts.context_lines = 0;
+
+ cl_git_pass(apply_buf(
+ FILE_ORIGINAL, "file.txt",
+ FILE_DELETE_AND_CHANGE, "file.txt",
+ FILE_DELETE_FIRSTLINE, &diff_opts, skip_change, NULL));
+}
+
+void test_apply_partial__delete_and_change_nocontext_abort_change(void)
+{
+ git_diff_options diff_opts = GIT_DIFF_OPTIONS_INIT;
+ diff_opts.context_lines = 0;
+
+ cl_git_fail(apply_buf(
+ FILE_ORIGINAL, "file.txt",
+ FILE_DELETE_AND_CHANGE, "file.txt",
+ FILE_DELETE_FIRSTLINE, &diff_opts, abort_change, NULL));
+}
--- /dev/null
+#include "clar_libgit2.h"
+#include "../merge/merge_helpers.h"
+
+static git_repository *repo;
+
+#define TEST_REPO_PATH "merge-recursive"
+
+
+void test_apply_tree__initialize(void)
+{
+ repo = cl_git_sandbox_init(TEST_REPO_PATH);
+}
+
+void test_apply_tree__cleanup(void)
+{
+ cl_git_sandbox_cleanup();
+}
+
+void test_apply_tree__one(void)
+{
+ git_oid a_oid, b_oid;
+ git_commit *a_commit, *b_commit;
+ git_tree *a_tree, *b_tree;
+ git_diff *diff;
+ git_index *index = NULL;
+ git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
+
+ struct merge_index_entry expected[] = {
+ { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
+ };
+
+ git_oid_fromstr(&a_oid, "539bd011c4822c560c1d17cab095006b7a10f707");
+ git_oid_fromstr(&b_oid, "7c7bf85e978f1d18c0566f702d2cb7766b9c8d4f");
+
+ cl_git_pass(git_commit_lookup(&a_commit, repo, &a_oid));
+ cl_git_pass(git_commit_lookup(&b_commit, repo, &b_oid));
+
+ cl_git_pass(git_commit_tree(&a_tree, a_commit));
+ cl_git_pass(git_commit_tree(&b_tree, b_commit));
+
+ cl_git_pass(git_diff_tree_to_tree(&diff, repo, a_tree, b_tree, &opts));
+
+ cl_git_pass(git_apply_to_tree(&index, repo, a_tree, diff, NULL));
+ merge_test_index(index, expected, 6);
+
+ git_index_free(index);
+ git_diff_free(diff);
+ git_tree_free(a_tree);
+ git_tree_free(b_tree);
+ git_commit_free(a_commit);
+ git_commit_free(b_commit);
+}
+
--- /dev/null
+#include "clar_libgit2.h"
+#include "apply_helpers.h"
+
+static git_repository *repo;
+
+#define TEST_REPO_PATH "merge-recursive"
+
+void test_apply_workdir__initialize(void)
+{
+ git_oid oid;
+ git_commit *commit;
+
+ repo = cl_git_sandbox_init(TEST_REPO_PATH);
+
+ git_oid_fromstr(&oid, "539bd011c4822c560c1d17cab095006b7a10f707");
+ cl_git_pass(git_commit_lookup(&commit, repo, &oid));
+ cl_git_pass(git_reset(repo, (git_object *)commit, GIT_RESET_HARD, NULL));
+ git_commit_free(commit);
+}
+
+void test_apply_workdir__cleanup(void)
+{
+ cl_git_sandbox_cleanup();
+}
+
+void test_apply_workdir__generated_diff(void)
+{
+ git_oid a_oid, b_oid;
+ git_commit *a_commit, *b_commit;
+ git_tree *a_tree, *b_tree;
+ git_diff *diff;
+ git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
+
+ struct merge_index_entry workdir_expected[] = {
+ { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
+ };
+ size_t workdir_expected_cnt = sizeof(workdir_expected) /
+ sizeof(struct merge_index_entry);
+
+ git_oid_fromstr(&a_oid, "539bd011c4822c560c1d17cab095006b7a10f707");
+ git_oid_fromstr(&b_oid, "7c7bf85e978f1d18c0566f702d2cb7766b9c8d4f"); cl_git_pass(git_commit_lookup(&a_commit, repo, &a_oid));
+ cl_git_pass(git_commit_lookup(&b_commit, repo, &b_oid));
+
+ cl_git_pass(git_commit_tree(&a_tree, a_commit));
+ cl_git_pass(git_commit_tree(&b_tree, b_commit));
+
+ cl_git_pass(git_diff_tree_to_tree(&diff, repo, a_tree, b_tree, &opts));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_WORKDIR, NULL));
+
+ validate_index_unchanged(repo);
+ validate_apply_workdir(repo, workdir_expected, workdir_expected_cnt);
+
+ git_diff_free(diff);
+ git_tree_free(a_tree);
+ git_tree_free(b_tree);
+ git_commit_free(a_commit);
+ git_commit_free(b_commit);
+}
+
+void test_apply_workdir__parsed_diff(void)
+{
+ git_diff *diff;
+
+ struct merge_index_entry workdir_expected[] = {
+ { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
+ };
+ size_t workdir_expected_cnt = sizeof(workdir_expected) /
+ sizeof(struct merge_index_entry);
+
+ cl_git_pass(git_diff_from_buffer(&diff,
+ DIFF_MODIFY_TWO_FILES, strlen(DIFF_MODIFY_TWO_FILES)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_WORKDIR, NULL));
+
+ validate_index_unchanged(repo);
+ validate_apply_workdir(repo, workdir_expected, workdir_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+void test_apply_workdir__removes_file(void)
+{
+ git_diff *diff;
+
+ struct merge_index_entry workdir_expected[] = {
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" },
+ };
+ size_t workdir_expected_cnt = sizeof(workdir_expected) /
+ sizeof(struct merge_index_entry);
+
+ cl_git_pass(git_diff_from_buffer(&diff, DIFF_DELETE_FILE,
+ strlen(DIFF_DELETE_FILE)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_WORKDIR, NULL));
+
+ validate_index_unchanged(repo);
+ validate_apply_workdir(repo, workdir_expected, workdir_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+void test_apply_workdir__adds_file(void)
+{
+ git_diff *diff;
+
+ struct merge_index_entry workdir_expected[] = {
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "6370543fcfedb3e6516ec53b06158f3687dc1447", 0, "newfile.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" },
+ };
+ size_t workdir_expected_cnt = sizeof(workdir_expected) /
+ sizeof(struct merge_index_entry);
+
+ cl_git_pass(git_diff_from_buffer(&diff,
+ DIFF_ADD_FILE, strlen(DIFF_ADD_FILE)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_WORKDIR, NULL));
+
+ validate_index_unchanged(repo);
+ validate_apply_workdir(repo, workdir_expected, workdir_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+void test_apply_workdir__modified_index_with_unmodified_workdir_is_ok(void)
+{
+ git_index *index;
+ git_index_entry idx_entry = {{0}};
+ git_diff *diff;
+
+ const char *diff_file = DIFF_MODIFY_TWO_FILES;
+
+ struct merge_index_entry index_expected[] = {
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "veal.txt" }
+ };
+ size_t index_expected_cnt = sizeof(index_expected) /
+ sizeof(struct merge_index_entry);
+
+ struct merge_index_entry workdir_expected[] = {
+ { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
+ };
+ size_t workdir_expected_cnt = sizeof(workdir_expected) /
+ sizeof(struct merge_index_entry);
+
+ /* mutate the index and leave the workdir matching HEAD */
+ cl_git_pass(git_repository_index(&index, repo));
+
+ idx_entry.mode = 0100644;
+ idx_entry.path = "veal.txt";
+ cl_git_pass(git_oid_fromstr(&idx_entry.id, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d"));
+
+ cl_git_pass(git_index_add(index, &idx_entry));
+ cl_git_pass(git_index_remove(index, "asparagus.txt", 0));
+ cl_git_pass(git_index_write(index));
+
+ cl_git_pass(git_diff_from_buffer(&diff, diff_file, strlen(diff_file)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_WORKDIR, NULL));
+
+ validate_apply_index(repo, index_expected, index_expected_cnt);
+ validate_apply_workdir(repo, workdir_expected, workdir_expected_cnt);
+
+ git_index_free(index);
+ git_diff_free(diff);
+}
+
+void test_apply_workdir__application_failure_leaves_workdir_unmodified(void)
+{
+ git_diff *diff;
+
+ const char *diff_file = DIFF_MODIFY_TWO_FILES;
+
+ struct merge_index_entry workdir_expected[] = {
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "8684724651336001c5dbce74bed6736d2443958d", 0, "veal.txt" },
+ };
+ size_t workdir_expected_cnt = sizeof(workdir_expected) /
+ sizeof(struct merge_index_entry);
+
+ /* mutate the workdir */
+ cl_git_rewritefile("merge-recursive/veal.txt",
+ "This is a modification.\n");
+
+ cl_git_pass(git_diff_from_buffer(&diff, diff_file, strlen(diff_file)));
+ cl_git_fail_with(GIT_EAPPLYFAIL, git_apply(repo, diff, GIT_APPLY_LOCATION_WORKDIR, NULL));
+
+ validate_apply_workdir(repo, workdir_expected, workdir_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+void test_apply_workdir__keeps_nonconflicting_changes(void)
+{
+ git_diff *diff;
+
+ struct merge_index_entry workdir_expected[] = {
+ { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "f75ba05f340c51065cbea2e1fdbfe5fe13144c97", 0, "gravy.txt" },
+ { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
+ };
+ size_t workdir_expected_cnt = sizeof(workdir_expected) /
+ sizeof(struct merge_index_entry);
+
+ cl_git_rmfile("merge-recursive/oyster.txt");
+ cl_git_rewritefile("merge-recursive/gravy.txt", "Hello, world.\n");
+
+ cl_git_pass(git_diff_from_buffer(&diff,
+ DIFF_MODIFY_TWO_FILES, strlen(DIFF_MODIFY_TWO_FILES)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_WORKDIR, NULL));
+
+ validate_index_unchanged(repo);
+ validate_apply_workdir(repo, workdir_expected, workdir_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+void test_apply_workdir__can_apply_nonconflicting_file_changes(void)
+{
+ git_diff *diff;
+
+ const char *diff_file = DIFF_MODIFY_TWO_FILES;
+
+ struct merge_index_entry workdir_expected[] = {
+ { 0100644, "5db1a0fef164cb66cc0c00d35cc5af979ddc1a64", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
+ };
+ size_t workdir_expected_cnt = sizeof(workdir_expected) /
+ sizeof(struct merge_index_entry);
+
+ /*
+ * Replace the workdir file with a version that is different than
+ * HEAD but such that the patch still applies cleanly. This item
+ * has a new line appended.
+ */
+ cl_git_append2file("merge-recursive/asparagus.txt",
+ "This line is added in the workdir.\n");
+
+ cl_git_pass(git_diff_from_buffer(&diff, diff_file, strlen(diff_file)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_WORKDIR, NULL));
+
+ validate_index_unchanged(repo);
+ validate_apply_workdir(repo, workdir_expected, workdir_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+void test_apply_workdir__change_mode(void)
+{
+#ifndef GIT_WIN32
+ git_diff *diff;
+
+ const char *diff_file = DIFF_EXECUTABLE_FILE;
+
+ struct merge_index_entry workdir_expected[] = {
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
+ { 0100755, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" },
+ };
+ size_t workdir_expected_cnt = sizeof(workdir_expected) /
+ sizeof(struct merge_index_entry);
+
+ cl_git_pass(git_diff_from_buffer(&diff, diff_file, strlen(diff_file)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_WORKDIR, NULL));
+
+ validate_index_unchanged(repo);
+ validate_apply_workdir(repo, workdir_expected, workdir_expected_cnt);
+
+ git_diff_free(diff);
+#endif
+}
+
+void test_apply_workdir__apply_many_changes_one(void)
+{
+ git_diff *diff;
+ git_apply_options opts = GIT_APPLY_OPTIONS_INIT;
+
+ struct merge_index_entry workdir_expected[] = {
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "c9d7d5d58088bc91f6e06f17ca3a205091568d3a", 0, "veal.txt" },
+ };
+ size_t workdir_expected_cnt = sizeof(workdir_expected) /
+ sizeof(struct merge_index_entry);
+
+ cl_git_pass(git_diff_from_buffer(&diff,
+ DIFF_MANY_CHANGES_ONE, strlen(DIFF_MANY_CHANGES_ONE)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_WORKDIR, &opts));
+
+ validate_index_unchanged(repo);
+ validate_apply_workdir(repo, workdir_expected, workdir_expected_cnt);
+
+ git_diff_free(diff);
+}
+
+void test_apply_workdir__apply_many_changes_two(void)
+{
+ git_diff *diff;
+ git_apply_options opts = GIT_APPLY_OPTIONS_INIT;
+
+ struct merge_index_entry workdir_expected[] = {
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "6b943d65af6d8db74d747284fa4ca7d716ad5bbb", 0, "veal.txt" },
+ };
+ size_t workdir_expected_cnt = sizeof(workdir_expected) /
+ sizeof(struct merge_index_entry);
+
+ cl_git_pass(git_diff_from_buffer(&diff,
+ DIFF_MANY_CHANGES_TWO, strlen(DIFF_MANY_CHANGES_TWO)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_WORKDIR, &opts));
+
+ validate_index_unchanged(repo);
+ validate_apply_workdir(repo, workdir_expected, workdir_expected_cnt);
+
+ git_diff_free(diff);
+}
cl_git_pass(git_buf_joinpath(&buf, "attr", filename));
cl_git_rewritefile(git_buf_cstr(&buf), content);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
static void assert_proper_normalization(git_index *index, const char *filename, const char *expected_sha)
git_buf_puts(&buf1, test_string);
cl_assert(strlen(git_buf_cstr(&buf1)) == strlen(test_string) * 2);
- git_buf_free(&buf1);
+ git_buf_dispose(&buf1);
}
void test_buf_basic__resize_incremental(void)
cl_assert_equal_i(5, buf1.size);
cl_assert(buf1.asize > 8);
- git_buf_free(&buf1);
+ git_buf_dispose(&buf1);
}
void test_buf_basic__printf(void)
git_buf_printf(&buf2, "%s %d", "woop", 42);
cl_assert(git_buf_oom(&buf2) == 0);
cl_assert_equal_s(git_buf_cstr(&buf2), "shoop da 23 woop 42");
- git_buf_free(&buf2);
+ git_buf_dispose(&buf2);
}
#include "clar_libgit2.h"
#include "buffer.h"
-/*
- * We want to use some ridiculous size that `malloc` will fail with
- * but that does not otherwise interfere with testing. On Linux, choose
- * a number that is large enough to fail immediately but small enough
- * that valgrind doesn't believe it to erroneously be a negative number.
- * On macOS, choose a number that is large enough to fail immediately
- * without having libc print warnings to stderr.
- */
-#if defined(GIT_ARCH_64) && defined(__linux__)
-# define TOOBIG 0x0fffffffffffffff
-#elif defined(__linux__)
-# define TOOBIG 0x0fffffff
-#elif defined(GIT_ARCH_64)
-# define TOOBIG 0xffffffffffffff00
-#else
-# define TOOBIG 0xffffff00
-#endif
-
-/**
- * If we make a ridiculously large request the first time we
- * actually allocate some space in the git_buf, the realloc()
- * will fail. And because the git_buf_grow() wrapper always
- * sets mark_oom, the code in git_buf_try_grow() will free
- * the internal buffer and set it to git_buf__oom.
- *
- * We initialized the internal buffer to (the static variable)
- * git_buf__initbuf. The purpose of this test is to make sure
- * that we don't try to free the static buffer.
- */
+/* Override default allocators with ones that will fail predictably. */
+
+static git_allocator std_alloc;
+static git_allocator oom_alloc;
+
+static void *oom_malloc(size_t n, const char *file, int line)
+{
+ /* Reject any allocation of more than 100 bytes */
+ return (n > 100) ? NULL : std_alloc.gmalloc(n, file, line);
+}
+
+static void *oom_realloc(void *p, size_t n, const char *file, int line)
+{
+ /* Reject any allocation of more than 100 bytes */
+ return (n > 100) ? NULL : std_alloc.grealloc(p, n, file, line);
+}
+
+void test_buf_oom__initialize(void)
+{
+ git_stdalloc_init_allocator(&std_alloc);
+ git_stdalloc_init_allocator(&oom_alloc);
+
+ oom_alloc.gmalloc = oom_malloc;
+ oom_alloc.grealloc = oom_realloc;
+
+ cl_git_pass(git_libgit2_opts(GIT_OPT_SET_ALLOCATOR, &oom_alloc));
+}
+
+void test_buf_oom__cleanup(void)
+{
+ cl_git_pass(git_libgit2_opts(GIT_OPT_SET_ALLOCATOR, NULL));
+}
+
void test_buf_oom__grow(void)
{
git_buf buf = GIT_BUF_INIT;
- git_buf_clear(&buf);
+ cl_git_pass(git_buf_grow(&buf, 42));
+ cl_assert(!git_buf_oom(&buf));
- cl_assert(git_buf_grow(&buf, TOOBIG) == -1);
+ cl_assert(git_buf_grow(&buf, 101) == -1);
cl_assert(git_buf_oom(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_buf_oom__grow_by(void)
{
git_buf buf = GIT_BUF_INIT;
- buf.size = SIZE_MAX-10;
+ cl_git_pass(git_buf_grow_by(&buf, 42));
+ cl_assert(!git_buf_oom(&buf));
- cl_assert(git_buf_grow_by(&buf, 50) == -1);
+ cl_assert(git_buf_grow_by(&buf, 101) == -1);
cl_assert(git_buf_oom(&buf));
}
cl_assert_equal_s(expected, git_buf_cstr(&out));
cl_assert_equal_i(strlen(expected), git_buf_len(&out));
- git_buf_free(&in);
- git_buf_free(&out);
+ git_buf_dispose(&in);
+ git_buf_dispose(&out);
}
void test_buf_percent__decode_succeeds(void)
cl_assert_equal_s(expected, git_buf_cstr(&buf));
cl_assert_equal_i(strlen(expected), git_buf_len(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_buf_quote__quote_succeeds(void)
cl_assert_equal_s(expected, git_buf_cstr(&buf));
cl_assert_equal_i(strlen(expected), git_buf_len(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
static void expect_unquote_fail(const char *quoted)
cl_git_pass(git_buf_puts(&buf, quoted));
cl_git_fail(git_buf_unquote(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_buf_quote__unquote_succeeds(void)
}
void test_buf_splice__cleanup(void) {
- git_buf_free(&_buf);
+ git_buf_dispose(&_buf);
}
void test_buf_splice__preprend(void)
/* Verify that the lenna.jpg file was checked out correctly */
cl_git_pass(git_oid_fromstr(&check, "8ab005d890fe53f65eda14b23672f60d9f4ec5a1"));
- cl_git_pass(git_odb_hashfile(&oid, "binaryunicode/lenna.jpg", GIT_OBJ_BLOB));
+ cl_git_pass(git_odb_hashfile(&oid, "binaryunicode/lenna.jpg", GIT_OBJECT_BLOB));
cl_assert_equal_oid(&oid, &check);
/* Verify that the text file was checked out correctly */
cl_git_pass(git_oid_fromstr(&check, "965b223880dd4249e2c66a0cc0b4cffe1dc40f5a"));
- cl_git_pass(git_odb_hashfile(&oid, "binaryunicode/utf16_withbom_noeol_crlf.txt", GIT_OBJ_BLOB));
+ cl_git_pass(git_odb_hashfile(&oid, "binaryunicode/utf16_withbom_noeol_crlf.txt", GIT_OBJECT_BLOB));
cl_assert_equal_oid(&oid, &check);
}
git_buf bname = GIT_BUF_INIT;
cl_git_pass(git_reference_lookup(&head, repo, GIT_HEAD_FILE));
- cl_assert_(git_reference_type(head) == GIT_REF_SYMBOLIC, branch);
+ cl_assert_(git_reference_type(head) == GIT_REFERENCE_SYMBOLIC, branch);
cl_git_pass(git_buf_joinpath(&bname, "refs/heads", branch));
cl_assert_equal_s(bname.ptr, git_reference_symbolic_target(head));
git_reference_free(head);
- git_buf_free(&bname);
+ git_buf_dispose(&bname);
}
void reset_index_to_treeish(git_object *treeish)
git_index *index;
git_repository *repo = git_object_owner(treeish);
- cl_git_pass(git_object_peel(&tree, treeish, GIT_OBJ_TREE));
+ cl_git_pass(git_object_peel(&tree, treeish, GIT_OBJECT_TREE));
cl_git_pass(git_repository_index(&index, repo));
cl_git_pass(git_index_read_tree(index, (git_tree *)tree));
#include "git2/repository.h"
#include "git2/sys/index.h"
#include "fileops.h"
+#include "repository.h"
static git_repository *g_repo;
static git_index *g_index;
if (entries[i].stage == 3 && (i == 0 || strcmp(entries[i-1].path, entries[i].path) != 0 || entries[i-1].stage != 2))
p_unlink(git_buf_cstr(&path));
- git_index_remove_bypath(g_index, entries[i].path);
+ cl_git_pass(git_index_remove_bypath(g_index, entries[i].path));
}
for (i = 0; i < entries_len; i++) {
memset(&entry, 0x0, sizeof(git_index_entry));
entry.mode = entries[i].mode;
- GIT_IDXENTRY_STAGE_SET(&entry, entries[i].stage);
+ GIT_INDEX_ENTRY_STAGE_SET(&entry, entries[i].stage);
git_oid_fromstr(&entry.id, entries[i].oid_str);
entry.path = entries[i].path;
cl_git_pass(git_index_add(g_index, &entry));
}
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
static void create_index_names(struct checkout_name_entry *entries, size_t entries_len)
};
create_index(checkout_index_entries, 3);
- git_index_write(g_index);
+ cl_git_pass(git_index_write(g_index));
}
static void ensure_workdir_contents(const char *path, const char *contents)
cl_git_pass(git_futils_readbuffer(&data_buf, git_buf_cstr(&fullpath)));
cl_assert(strcmp(git_buf_cstr(&data_buf), contents) == 0);
- git_buf_free(&fullpath);
- git_buf_free(&data_buf);
+ git_buf_dispose(&fullpath);
+ git_buf_dispose(&data_buf);
}
static void ensure_workdir_oid(const char *path, const char *oid_str)
git_oid expected, actual;
cl_git_pass(git_oid_fromstr(&expected, oid_str));
- cl_git_pass(git_repository_hashfile(&actual, g_repo, path, GIT_OBJ_BLOB, NULL));
+ cl_git_pass(git_repository_hashfile(&actual, g_repo, path, GIT_OBJECT_BLOB, NULL));
cl_assert_equal_oid(&expected, &actual);
}
cl_git_pass(p_stat(git_buf_cstr(&fullpath), &st));
cl_assert_equal_i((mode & S_IRWXU), (st.st_mode & S_IRWXU));
- git_buf_free(&fullpath);
+ git_buf_dispose(&fullpath);
#endif
}
ensure_workdir_oid(path, oid_str);
}
-static void ensure_workdir_link(const char *path, const char *target)
+static void ensure_workdir_link(
+ git_repository *repo,
+ const char *path,
+ const char *target)
{
-#ifdef GIT_WIN32
- ensure_workdir_contents(path, target);
-#else
- git_buf fullpath = GIT_BUF_INIT;
- char actual[1024];
- struct stat st;
- int len;
+ int symlinks;
- cl_git_pass(
- git_buf_joinpath(&fullpath, git_repository_workdir(g_repo), path));
+ cl_git_pass(git_repository__cvar(&symlinks, repo, GIT_CVAR_SYMLINKS));
- cl_git_pass(p_lstat(git_buf_cstr(&fullpath), &st));
- cl_assert(S_ISLNK(st.st_mode));
+ if (!symlinks) {
+ ensure_workdir_contents(path, target);
+ } else {
+ git_buf fullpath = GIT_BUF_INIT;
+ char actual[1024];
+ struct stat st;
+ int len;
- cl_assert((len = p_readlink(git_buf_cstr(&fullpath), actual, 1024)) > 0);
- actual[len] = '\0';
- cl_assert(strcmp(actual, target) == 0);
+ cl_git_pass(
+ git_buf_joinpath(&fullpath, git_repository_workdir(g_repo), path));
- git_buf_free(&fullpath);
-#endif
+ cl_git_pass(p_lstat(git_buf_cstr(&fullpath), &st));
+ cl_assert(S_ISLNK(st.st_mode));
+
+ cl_assert((len = p_readlink(git_buf_cstr(&fullpath), actual, 1024)) > 0);
+ actual[len] = '\0';
+ cl_assert(strcmp(actual, target) == 0);
+
+ git_buf_dispose(&fullpath);
+ }
}
void test_checkout_conflict__ignored(void)
};
create_index(checkout_index_entries, 3);
- git_index_write(g_index);
+ cl_git_pass(git_index_write(g_index));
cl_git_pass(git_checkout_index(g_repo, g_index, &opts));
opts.checkout_strategy |= GIT_CHECKOUT_SAFE;
create_index(checkout_index_entries, 12);
- git_index_write(g_index);
+ cl_git_pass(git_index_write(g_index));
cl_git_pass(git_checkout_index(g_repo, g_index, &opts));
opts.their_label = "branch";
create_index(checkout_index_entries, 12);
- git_index_write(g_index);
+ cl_git_pass(git_index_write(g_index));
cl_git_pass(git_checkout_index(g_repo, g_index, &opts));
opts.checkout_strategy |= GIT_CHECKOUT_SAFE;
create_index(checkout_index_entries, 12);
- git_index_write(g_index);
+ cl_git_pass(git_index_write(g_index));
cl_git_pass(git_checkout_index(g_repo, g_index, &opts));
opts.checkout_strategy |= GIT_CHECKOUT_SAFE;
create_index(checkout_index_entries, 5);
- git_index_write(g_index);
+ cl_git_pass(git_index_write(g_index));
cl_git_pass(git_checkout_index(g_repo, g_index, &opts));
/* Conflicts with links always keep the ours side (even with -Xtheirs) */
- ensure_workdir_link("link-1", LINK_OURS_TARGET);
- ensure_workdir_link("link-2", LINK_OURS_TARGET);
+ ensure_workdir_link(g_repo, "link-1", LINK_OURS_TARGET);
+ ensure_workdir_link(g_repo, "link-2", LINK_OURS_TARGET);
}
void test_checkout_conflict__add_add(void)
opts.checkout_strategy |= GIT_CHECKOUT_SAFE;
create_index(checkout_index_entries, 2);
- git_index_write(g_index);
+ cl_git_pass(git_index_write(g_index));
cl_git_pass(git_checkout_index(g_repo, g_index, &opts));
opts.checkout_strategy |= GIT_CHECKOUT_SAFE;
create_index(checkout_index_entries, 18);
- git_index_write(g_index);
+ cl_git_pass(git_index_write(g_index));
cl_git_pass(git_checkout_index(g_repo, g_index, &opts));
create_index(checkout_index_entries, 41);
create_index_names(checkout_name_entries, 9);
- git_index_write(g_index);
+ cl_git_pass(git_index_write(g_index));
cl_git_pass(git_checkout_index(g_repo, g_index, &opts));
void test_checkout_conflict__rename_keep_ours(void)
{
git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
-
+
struct checkout_index_entry checkout_index_entries[] = {
{ 0100644, "68c6c84b091926c7d90aa6a79b2bc3bb6adccd8e", 0, "0a-no-change.txt" },
{ 0100644, "f0ce2b8e4986084d9b308fb72709e414c23eb5e6", 0, "0b-duplicated-in-ours.txt" },
{ 0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11", 2, "7-both-renamed.txt" },
{ 0100644, "b69fe837e4cecfd4c9a40cdca7c138468687df07", 3, "7-both-renamed.txt" }
};
-
+
struct checkout_name_entry checkout_name_entries[] = {
{
"3a-renamed-in-ours-deleted-in-theirs.txt",
"3a-newname-in-ours-deleted-in-theirs.txt",
""
},
-
+
{
"3b-renamed-in-theirs-deleted-in-ours.txt",
"",
"3b-newname-in-theirs-deleted-in-ours.txt"
},
-
+
{
"4a-renamed-in-ours-added-in-theirs.txt",
"4a-newname-in-ours-added-in-theirs.txt",
""
},
-
+
{
"4b-renamed-in-theirs-added-in-ours.txt",
"",
"4b-newname-in-theirs-added-in-ours.txt"
},
-
+
{
"5a-renamed-in-ours-added-in-theirs.txt",
"5a-newname-in-ours-added-in-theirs.txt",
"5a-renamed-in-ours-added-in-theirs.txt"
},
-
+
{
"5b-renamed-in-theirs-added-in-ours.txt",
"5b-renamed-in-theirs-added-in-ours.txt",
"5b-newname-in-theirs-added-in-ours.txt"
},
-
+
{
"6-both-renamed-1-to-2.txt",
"6-both-renamed-1-to-2-ours.txt",
"6-both-renamed-1-to-2-theirs.txt"
},
-
+
{
"7-both-renamed-side-1.txt",
"7-both-renamed.txt",
"7-both-renamed-side-1.txt"
},
-
+
{
"7-both-renamed-side-2.txt",
"7-both-renamed-side-2.txt",
"7-both-renamed.txt"
}
};
-
+
opts.checkout_strategy |= GIT_CHECKOUT_SAFE | GIT_CHECKOUT_USE_OURS;
-
+
create_index(checkout_index_entries, 41);
create_index_names(checkout_name_entries, 9);
- git_index_write(g_index);
-
+ cl_git_pass(git_index_write(g_index));
+
cl_git_pass(git_checkout_index(g_repo, g_index, &opts));
-
+
ensure_workdir("0a-no-change.txt",
0100644, "68c6c84b091926c7d90aa6a79b2bc3bb6adccd8e");
-
+
ensure_workdir("0b-duplicated-in-ours.txt",
0100644, "f0ce2b8e4986084d9b308fb72709e414c23eb5e6");
-
+
ensure_workdir("0b-rewritten-in-ours.txt",
0100644, "e376fbdd06ebf021c92724da9f26f44212734e3e");
-
+
ensure_workdir("0c-duplicated-in-theirs.txt",
0100644, "2f56120107d680129a5d9791b521cb1e73a2ed31");
-
+
ensure_workdir("0c-rewritten-in-theirs.txt",
0100644, "efc9121fdedaf08ba180b53ebfbcf71bd488ed09");
-
+
ensure_workdir("1a-newname-in-ours-edited-in-theirs.txt",
0100644, "0d872f8e871a30208305978ecbf9e66d864f1638");
-
+
ensure_workdir("1a-newname-in-ours.txt",
0100644, "d0d4594e16f2e19107e3fa7ea63e7aaaff305ffb");
-
+
ensure_workdir("1b-newname-in-theirs-edited-in-ours.txt",
0100644, "ed9523e62e453e50dd9be1606af19399b96e397a");
-
+
ensure_workdir("1b-newname-in-theirs.txt",
0100644, "2b5f1f181ee3b58ea751f5dd5d8f9b445520a136");
-
+
ensure_workdir("2-newname-in-both.txt",
0100644, "178940b450f238a56c0d75b7955cb57b38191982");
ensure_workdir("3a-newname-in-ours-deleted-in-theirs.txt",
0100644, "18cb316b1cefa0f8a6946f0e201a8e1a6f845ab9");
-
+
ensure_workdir("3b-newname-in-theirs-deleted-in-ours.txt",
0100644, "36219b49367146cb2e6a1555b5a9ebd4d0328495");
-
+
ensure_workdir("4a-newname-in-ours-added-in-theirs.txt",
0100644, "227792b52aaa0b238bea00ec7e509b02623f168c");
-
+
ensure_workdir("4b-newname-in-theirs-added-in-ours.txt",
0100644, "de872ee3618b894992e9d1e18ba2ebe256a112f9");
-
+
ensure_workdir("5a-newname-in-ours-added-in-theirs.txt",
0100644, "d3719a5ae8e4d92276b5313ce976f6ee5af2b436");
-
+
ensure_workdir("5b-newname-in-theirs-added-in-ours.txt",
0100644, "385c8a0f26ddf79e9041e15e17dc352ed2c4cced");
ensure_workdir("6-both-renamed-1-to-2-ours.txt",
0100644, "d8fa77b6833082c1ea36b7828a582d4c43882450");
-
+
ensure_workdir("7-both-renamed.txt",
0100644, "b42712cfe99a1a500b2a51fe984e0b8a7702ba11");
}
create_index(checkout_index_entries, 24);
create_index_names(checkout_name_entries, 6);
- git_index_write(g_index);
+ cl_git_pass(git_index_write(g_index));
/* Add some files on disk that conflict with the names that would be chosen
* for the files written for each side. */
opts.checkout_strategy |= GIT_CHECKOUT_UPDATE_ONLY;
create_index(checkout_index_entries, 3);
- git_index_write(g_index);
+ cl_git_pass(git_index_write(g_index));
cl_git_pass(p_mkdir("merge-resolve/directory_file-two", 0777));
cl_git_rewritefile("merge-resolve/directory_file-two/file", CONFLICTING_OURS_FILE);
opts.paths = patharray;
create_index(checkout_index_entries, 12);
- git_index_write(g_index);
+ cl_git_pass(git_index_write(g_index));
cl_git_pass(git_checkout_index(g_repo, g_index, &opts));
create_index(checkout_index_entries, 12);
- git_index_write(g_index);
+ cl_git_pass(git_index_write(g_index));
cl_git_pass(git_checkout_index(g_repo, g_index, &opts));
static const char *systype;
static git_buf expected_fixture = GIT_BUF_INIT;
+static int unlink_file(void *payload, git_buf *path)
+{
+ char *fn;
+
+ cl_assert(fn = git_path_basename(path->ptr));
+
+ GIT_UNUSED(payload);
+
+ if (strcmp(fn, ".git"))
+ cl_must_pass(p_unlink(path->ptr));
+
+ git__free(fn);
+ return 0;
+}
+
void test_checkout_crlf__initialize(void)
{
+ git_buf reponame = GIT_BUF_INIT;
+
g_repo = cl_git_sandbox_init("crlf");
+ /*
+ * remove the contents of the working directory so that we can
+ * check out over it.
+ */
+ cl_git_pass(git_buf_puts(&reponame, "crlf"));
+ cl_git_pass(git_path_direach(&reponame, 0, unlink_file, NULL));
+
if (GIT_EOL_NATIVE == GIT_EOL_CRLF)
systype = "windows";
else
systype = "posix";
+
+ git_buf_dispose(&reponame);
}
void test_checkout_crlf__cleanup(void)
if (expected_fixture.size) {
cl_fixture_cleanup(expected_fixture.ptr);
- git_buf_free(&expected_fixture);
+ git_buf_dispose(&expected_fixture);
}
}
git_path_basename(actual_path->ptr), systype, cd->autocrlf, cd->attrs);
clar__fail(__FILE__, __LINE__,
"checked out contents did not match expected", details.ptr, 0);
- git_buf_free(&details);
+ git_buf_dispose(&details);
}
git__free(basename);
- git_buf_free(&expected_contents);
- git_buf_free(&actual_contents);
- git_buf_free(&expected_path);
+ git_buf_dispose(&expected_contents);
+ git_buf_dispose(&actual_contents);
+ git_buf_dispose(&expected_path);
return 0;
}
{
git_buf attrbuf = GIT_BUF_INIT;
git_buf expected_dirname = GIT_BUF_INIT;
+ git_buf systype_and_direction = GIT_BUF_INIT;
git_buf sandboxname = GIT_BUF_INIT;
git_buf reponame = GIT_BUF_INIT;
git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
struct compare_data compare_data = { NULL, autocrlf, attrs };
const char *c;
- git_buf_puts(&reponame, "crlf");
+ cl_git_pass(git_buf_puts(&reponame, "crlf"));
- git_buf_puts(&sandboxname, "autocrlf_");
- git_buf_puts(&sandboxname, autocrlf);
+ cl_git_pass(git_buf_puts(&systype_and_direction, systype));
+ cl_git_pass(git_buf_puts(&systype_and_direction, "_to_workdir"));
+
+ cl_git_pass(git_buf_puts(&sandboxname, "autocrlf_"));
+ cl_git_pass(git_buf_puts(&sandboxname, autocrlf));
if (*attrs) {
- git_buf_puts(&sandboxname, ",");
+ cl_git_pass(git_buf_puts(&sandboxname, ","));
for (c = attrs; *c; c++) {
if (*c == ' ')
- git_buf_putc(&sandboxname, ',');
+ cl_git_pass(git_buf_putc(&sandboxname, ','));
else if (*c == '=')
- git_buf_putc(&sandboxname, '_');
+ cl_git_pass(git_buf_putc(&sandboxname, '_'));
else
- git_buf_putc(&sandboxname, *c);
+ cl_git_pass(git_buf_putc(&sandboxname, *c));
}
- git_buf_printf(&attrbuf, "* %s\n", attrs);
+ cl_git_pass(git_buf_printf(&attrbuf, "* %s\n", attrs));
cl_git_mkfile("crlf/.gitattributes", attrbuf.ptr);
}
cl_repo_set_string(g_repo, "core.autocrlf", autocrlf);
- git_buf_joinpath(&expected_dirname, systype, sandboxname.ptr);
- git_buf_joinpath(&expected_fixture, "crlf_data", expected_dirname.ptr);
+ cl_git_pass(git_buf_joinpath(&expected_dirname, systype_and_direction.ptr, sandboxname.ptr));
+ cl_git_pass(git_buf_joinpath(&expected_fixture, "crlf_data", expected_dirname.ptr));
cl_fixture_sandbox(expected_fixture.ptr);
opts.checkout_strategy = GIT_CHECKOUT_FORCE;
- git_checkout_head(g_repo, &opts);
+ cl_git_pass(git_checkout_head(g_repo, &opts));
compare_data.dirname = sandboxname.ptr;
cl_git_pass(git_path_direach(&reponame, 0, compare_file, &compare_data));
cl_fixture_cleanup(expected_fixture.ptr);
- git_buf_free(&expected_fixture);
-
- git_buf_free(&attrbuf);
- git_buf_free(&expected_fixture);
- git_buf_free(&expected_dirname);
- git_buf_free(&sandboxname);
- git_buf_free(&reponame);
+ git_buf_dispose(&expected_fixture);
+
+ git_buf_dispose(&attrbuf);
+ git_buf_dispose(&expected_fixture);
+ git_buf_dispose(&expected_dirname);
+ git_buf_dispose(&sandboxname);
+ git_buf_dispose(&systype_and_direction);
+ git_buf_dispose(&reponame);
}
static void empty_workdir(const char *name)
{
git_vector contents = GIT_VECTOR_INIT;
+ char *basename;
+ int cmp;
size_t i;
const char *fn;
- git_path_dirload(&contents, name, 0, 0);
+ cl_git_pass(git_path_dirload(&contents, name, 0, 0));
git_vector_foreach(&contents, i, fn) {
- char *basename = git_path_basename(fn);
- int cmp = strncasecmp(basename, ".git", 4);
+ cl_assert(basename = git_path_basename(fn));
+ cmp = strncasecmp(basename, ".git", 4);
git__free(basename);
- if (cmp == 0)
- continue;
- p_unlink(fn);
+ if (cmp)
+ cl_git_pass(p_unlink(fn));
}
git_vector_free_deep(&contents);
}
const char *autocrlf[] = { "true", "false", "input", NULL };
const char *attrs[] = { "", "-crlf", "-text", "eol=crlf", "eol=lf",
"text", "text eol=crlf", "text eol=lf",
- "text=auto", "text=auto eol=crlf", "text=auto eol=lf",
+ "text=auto", "text=auto eol=crlf", "text=auto eol=lf",
NULL };
const char **a, **b;
p_unlink("crlf/more1.identlf");
p_unlink("crlf/more2.identcrlf");
- git_checkout_head(g_repo, &opts);
+ cl_git_pass(git_checkout_head(g_repo, &opts));
cl_assert_equal_file(
ALL_LF_TEXT_AS_CRLF
cl_repo_set_bool(g_repo, "core.autocrlf", false);
- git_checkout_head(g_repo, &opts);
+ cl_git_pass(git_checkout_head(g_repo, &opts));
check_file_contents("./crlf/all-lf", ALL_LF_TEXT_RAW);
check_file_contents("./crlf/all-crlf", ALL_CRLF_TEXT_RAW);
cl_repo_set_bool(g_repo, "core.autocrlf", true);
- git_checkout_head(g_repo, &opts);
+ cl_git_pass(git_checkout_head(g_repo, &opts));
check_file_contents("./crlf/all-lf", ALL_LF_TEXT_AS_CRLF);
check_file_contents("./crlf/all-crlf", ALL_CRLF_TEXT_AS_CRLF);
cl_repo_set_string(g_repo, "core.autocrlf", "input");
- git_checkout_head(g_repo, &opts);
+ cl_git_pass(git_checkout_head(g_repo, &opts));
check_file_contents("./crlf/all-lf", ALL_LF_TEXT_RAW);
check_file_contents("./crlf/all-crlf", ALL_CRLF_TEXT_RAW);
cl_repo_set_bool(g_repo, "core.autocrlf", false);
- git_checkout_head(g_repo, &opts);
+ cl_git_pass(git_checkout_head(g_repo, &opts));
if (GIT_EOL_NATIVE == GIT_EOL_CRLF) {
check_file_contents("./crlf/all-lf", ALL_LF_TEXT_AS_CRLF);
cl_repo_set_bool(g_repo, "core.autocrlf", true);
- git_checkout_head(g_repo, &opts);
+ cl_git_pass(git_checkout_head(g_repo, &opts));
check_file_contents("./crlf/all-lf", ALL_LF_TEXT_AS_CRLF);
check_file_contents("./crlf/all-crlf", ALL_CRLF_TEXT_AS_CRLF);
cl_repo_set_string(g_repo, "core.autocrlf", "input");
- git_checkout_head(g_repo, &opts);
+ cl_git_pass(git_checkout_head(g_repo, &opts));
check_file_contents("./crlf/all-lf", ALL_LF_TEXT_RAW);
check_file_contents("./crlf/all-crlf", ALL_CRLF_TEXT_RAW);
cl_repo_set_bool(g_repo, "core.autocrlf", true);
- git_repository_set_head(g_repo, "refs/heads/empty-files");
- git_checkout_head(g_repo, &opts);
+ cl_git_pass(git_repository_set_head(g_repo, "refs/heads/empty-files"));
+ cl_git_pass(git_checkout_head(g_repo, &opts));
check_file_contents("./crlf/test1.txt", "");
#include "git2/checkout.h"
#include "refs.h"
#include "path.h"
+#include "repository.h"
#ifdef GIT_WIN32
# include <windows.h>
cl_skip();
cl_git_pass(git_reference_name_to_id(&id, repo, "refs/heads/dir"));
- cl_git_pass(git_object_lookup(&obj, repo, &id, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&obj, repo, &id, GIT_OBJECT_ANY));
git_checkout_init_options(&checkout_opts, GIT_CHECKOUT_OPTIONS_VERSION);
checkout_opts.checkout_strategy = GIT_CHECKOUT_NONE;
static char *get_filename(const char *in)
{
-#ifdef GIT_WIN32
- HANDLE fh;
- HMODULE kerneldll;
- char *filename;
-
- typedef DWORD (__stdcall *getfinalpathname)(HANDLE, LPSTR, DWORD, DWORD);
- getfinalpathname getfinalpathfn;
-
- cl_assert(filename = malloc(MAX_PATH));
- cl_assert(kerneldll = LoadLibrary("kernel32.dll"));
- cl_assert(getfinalpathfn = (getfinalpathname)GetProcAddress(kerneldll, "GetFinalPathNameByHandleA"));
-
- cl_assert(fh = CreateFileA(in, FILE_READ_ATTRIBUTES | STANDARD_RIGHTS_READ, FILE_SHARE_READ,
- NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL));
-
- cl_win32_pass(getfinalpathfn(fh, filename, MAX_PATH, VOLUME_NAME_DOS));
-
- CloseHandle(fh);
-
- git_path_mkposix(filename);
-
- return filename;
-#else
char *search_dirname, *search_filename, *filename = NULL;
git_buf out = GIT_BUF_INIT;
DIR *dir;
git__free(search_dirname);
git__free(search_filename);
- git_buf_free(&out);
+ git_buf_dispose(&out);
return filename;
-#endif
}
static void assert_name_is(const char *expected)
free(actual);
}
+static int symlink_or_fake(git_repository *repo, const char *a, const char *b)
+{
+ int symlinks;
+
+ cl_git_pass(git_repository__cvar(&symlinks, repo, GIT_CVAR_SYMLINKS));
+
+ if (symlinks)
+ return p_symlink(a, b);
+ else
+ return git_futils_fake_symlink(a, b);
+}
+
void test_checkout_icase__refuses_to_overwrite_files_for_files(void)
{
checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE|GIT_CHECKOUT_RECREATE_MISSING;
{
checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE|GIT_CHECKOUT_RECREATE_MISSING;
- cl_must_pass(p_symlink("../tmp", "testrepo/BRANCH_FILE.txt"));
+ cl_must_pass(symlink_or_fake(repo, "../tmp", "testrepo/BRANCH_FILE.txt"));
cl_git_fail(git_checkout_tree(repo, obj, &checkout_opts));
{
checkout_opts.checkout_strategy = GIT_CHECKOUT_FORCE;
- cl_must_pass(p_symlink("../tmp", "testrepo/NEW.txt"));
+ cl_must_pass(symlink_or_fake(repo, "../tmp", "testrepo/NEW.txt"));
cl_git_pass(git_checkout_tree(repo, obj, &checkout_opts));
{
checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE|GIT_CHECKOUT_RECREATE_MISSING;
- cl_must_pass(p_symlink("..", "testrepo/A"));
+ cl_must_pass(symlink_or_fake(repo, "..", "testrepo/A"));
cl_git_fail(git_checkout_tree(repo, obj, &checkout_opts));
{
checkout_opts.checkout_strategy = GIT_CHECKOUT_FORCE;
- cl_must_pass(p_symlink("..", "testrepo/A"));
+ cl_must_pass(symlink_or_fake(repo, "..", "testrepo/A"));
cl_git_pass(git_checkout_tree(repo, obj, &checkout_opts));
checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE;
cl_git_pass(git_reference_lookup_resolved(&orig_ref, repo, "HEAD", 100));
- cl_git_pass(git_object_lookup(&orig, repo, git_reference_target(orig_ref), GIT_OBJ_COMMIT));
+ cl_git_pass(git_object_lookup(&orig, repo, git_reference_target(orig_ref), GIT_OBJECT_COMMIT));
cl_git_pass(git_reset(repo, (git_object *)orig, GIT_RESET_HARD, NULL));
cl_must_pass(p_mkdir("testrepo/AB", 0777));
cl_git_write2file("testrepo/AB/C/3.txt", "Foobar!\n", 8, O_RDWR|O_CREAT, 0666);
cl_git_pass(git_reference_name_to_id(&oid, repo, "refs/heads/subtrees"));
- cl_git_pass(git_object_lookup(&subtrees, repo, &oid, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&subtrees, repo, &oid, GIT_OBJECT_ANY));
cl_git_fail(git_checkout_tree(repo, subtrees, &checkout_opts));
#include "fileops.h"
#include "repository.h"
#include "remote.h"
+#include "repo/repo_helpers.h"
static git_repository *g_repo;
+static git_buf g_global_path = GIT_BUF_INIT;
void test_checkout_index__initialize(void)
{
cl_git_rewritefile(
"./testrepo/.gitattributes",
"* text eol=lf\n");
+
+ git_libgit2_opts(GIT_OPT_GET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL,
+ &g_global_path);
}
void test_checkout_index__cleanup(void)
{
+ git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL,
+ g_global_path.ptr);
+ git_buf_dispose(&g_global_path);
+
cl_git_sandbox_cleanup();
- /* try to remove alternative dir */
- if (git_path_isdir("alternative"))
- git_futils_rmdir_r("alternative", NULL, GIT_RMDIR_REMOVE_FILES);
+ /* try to remove directories created by tests */
+ cl_fixture_cleanup("alternative");
+ cl_fixture_cleanup("symlink");
+ cl_fixture_cleanup("symlink.git");
+ cl_fixture_cleanup("tmp_global_path");
}
void test_checkout_index__cannot_checkout_a_bare_repository(void)
{
- test_checkout_index__cleanup();
-
+ cl_git_sandbox_cleanup();
g_repo = cl_git_sandbox_init("testrepo.git");
cl_git_fail(git_checkout_index(g_repo, NULL, NULL));
#endif
}
-void test_checkout_index__honor_coresymlinks_default(void)
+static void populate_symlink_workdir(void)
{
git_repository *repo;
git_remote *origin;
git_object *target;
- char cwd[GIT_PATH_MAX];
const char *url = git_repository_path(g_repo);
- cl_assert(getcwd(cwd, sizeof(cwd)) != NULL);
- cl_assert_equal_i(0, p_mkdir("readonly", 0555)); // Read-only directory
- cl_assert_equal_i(0, chdir("readonly"));
cl_git_pass(git_repository_init(&repo, "../symlink.git", true));
- cl_assert_equal_i(0, chdir(cwd));
- cl_assert_equal_i(0, p_mkdir("symlink", 0777));
cl_git_pass(git_repository_set_workdir(repo, "symlink", 1));
+ /* Delete the `origin` repo (if it exists) so we can recreate it. */
+ git_remote_delete(repo, GIT_REMOTE_ORIGIN);
+
cl_git_pass(git_remote_create(&origin, repo, GIT_REMOTE_ORIGIN, url));
cl_git_pass(git_remote_fetch(origin, NULL, NULL, NULL));
git_remote_free(origin);
cl_git_pass(git_reset(repo, target, GIT_RESET_HARD, NULL));
git_object_free(target);
git_repository_free(repo);
+}
+
+void test_checkout_index__honor_coresymlinks_default_true(void)
+{
+ char link_data[GIT_PATH_MAX];
+ int link_size = GIT_PATH_MAX;
+
+ cl_must_pass(p_mkdir("symlink", 0777));
+
+ if (!filesystem_supports_symlinks("symlink/test"))
+ cl_skip();
#ifdef GIT_WIN32
+ /*
+ * Windows explicitly requires the global configuration to have
+ * core.symlinks=true in addition to actual filesystem support.
+ */
+ create_tmp_global_config("tmp_global_path", "core.symlinks", "true");
+#endif
+
+ populate_symlink_workdir();
+
+ link_size = p_readlink("./symlink/link_to_new.txt", link_data, link_size);
+ cl_assert(link_size >= 0);
+
+ link_data[link_size] = '\0';
+ cl_assert_equal_i(link_size, strlen("new.txt"));
+ cl_assert_equal_s(link_data, "new.txt");
+ check_file_contents("./symlink/link_to_new.txt", "my new file\n");
+}
+
+void test_checkout_index__honor_coresymlinks_default_false(void)
+{
+ cl_must_pass(p_mkdir("symlink", 0777));
+
+#ifndef GIT_WIN32
+ /*
+ * This test is largely for Windows platforms to ensure that
+ * we respect an unset core.symlinks even when the platform
+ * supports symlinks. Bail entirely on POSIX platforms that
+ * do support symlinks.
+ */
+ if (filesystem_supports_symlinks("symlink/test"))
+ cl_skip();
+#endif
+
+ populate_symlink_workdir();
check_file_contents("./symlink/link_to_new.txt", "new.txt");
-#else
- {
- char link_data[1024];
- size_t link_size = 1024;
-
- link_size = p_readlink("./symlink/link_to_new.txt", link_data, link_size);
- link_data[link_size] = '\0';
- cl_assert_equal_i(link_size, strlen("new.txt"));
- cl_assert_equal_s(link_data, "new.txt");
- check_file_contents("./symlink/link_to_new.txt", "my new file\n");
+}
+
+void test_checkout_index__coresymlinks_set_to_true_fails_when_unsupported(void)
+{
+ git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
+
+ if (filesystem_supports_symlinks("testrepo/test")) {
+ cl_skip();
}
-#endif
- cl_fixture_cleanup("symlink");
+ cl_repo_set_bool(g_repo, "core.symlinks", true);
+
+ opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_RECREATE_MISSING;
+ cl_git_fail(git_checkout_index(g_repo, NULL, &opts));
}
void test_checkout_index__honor_coresymlinks_setting_set_to_true(void)
{
git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
+ char link_data[GIT_PATH_MAX];
+ size_t link_size = GIT_PATH_MAX;
+
+ if (!filesystem_supports_symlinks("testrepo/test")) {
+ cl_skip();
+ }
cl_repo_set_bool(g_repo, "core.symlinks", true);
cl_git_pass(git_checkout_index(g_repo, NULL, &opts));
-#ifdef GIT_WIN32
- check_file_contents("./testrepo/link_to_new.txt", "new.txt");
-#else
- {
- char link_data[1024];
- size_t link_size = 1024;
-
- link_size = p_readlink("./testrepo/link_to_new.txt", link_data, link_size);
- link_data[link_size] = '\0';
- cl_assert_equal_i(link_size, strlen("new.txt"));
- cl_assert_equal_s(link_data, "new.txt");
- check_file_contents("./testrepo/link_to_new.txt", "my new file\n");
- }
-#endif
+ link_size = p_readlink("./testrepo/link_to_new.txt", link_data, link_size);
+ link_data[link_size] = '\0';
+ cl_assert_equal_i(link_size, strlen("new.txt"));
+ cl_assert_equal_s(link_data, "new.txt");
+ check_file_contents("./testrepo/link_to_new.txt", "my new file\n");
}
void test_checkout_index__honor_coresymlinks_setting_set_to_false(void)
cl_assert(git_path_isfile("./testrepo/path0/file0"));
opts.checkout_strategy =
- GIT_CHECKOUT_SAFE |
+ GIT_CHECKOUT_SAFE |
GIT_CHECKOUT_RECREATE_MISSING |
GIT_CHECKOUT_ALLOW_CONFLICTS;
cl_git_pass(git_checkout_index(g_repo, index, &opts));
opts.version = 1024;
cl_git_fail(git_checkout_index(g_repo, NULL, &opts));
- err = giterr_last();
- cl_assert_equal_i(err->klass, GITERR_INVALID);
+ err = git_error_last();
+ cl_assert_equal_i(err->klass, GIT_ERROR_INVALID);
opts.version = 0;
- giterr_clear();
+ git_error_clear();
cl_git_fail(git_checkout_index(g_repo, NULL, &opts));
- err = giterr_last();
- cl_assert_equal_i(err->klass, GITERR_INVALID);
+ err = git_error_last();
+ cl_assert_equal_i(err->klass, GIT_ERROR_INVALID);
}
void test_checkout_index__can_update_prefixed_files(void)
void test_checkout_index__can_checkout_a_newly_initialized_repository(void)
{
- test_checkout_index__cleanup();
-
+ cl_git_sandbox_cleanup();
g_repo = cl_git_sandbox_init("empty_standard_repo");
+
cl_git_remove_placeholders(git_repository_path(g_repo), "dummy-marker.txt");
cl_git_pass(git_checkout_index(g_repo, NULL, NULL));
{
git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
- test_checkout_index__cleanup();
-
+ cl_git_sandbox_cleanup();
g_repo = cl_git_sandbox_init("issue_1397");
cl_repo_set_bool(g_repo, "core.autocrlf", true);
checkout_counts cts;
memset(&cts, 0, sizeof(cts));
- test_checkout_index__cleanup();
-
+ cl_git_sandbox_cleanup();
g_repo = cl_git_sandbox_init("testrepo.git");
cl_assert(git_repository_is_bare(g_repo));
entry.path = path;
git_oid_fromstr(&entry.id, "d427e0b2e138501a3d15cc376077a3631e15bd46");
- GIT_IDXENTRY_STAGE_SET(&entry, 1);
+ GIT_INDEX_ENTRY_STAGE_SET(&entry, 1);
cl_git_pass(git_index_add(index, &entry));
git_oid_fromstr(&entry.id, "4e886e602529caa9ab11d71f86634bd1b6e0de10");
- GIT_IDXENTRY_STAGE_SET(&entry, 2);
+ GIT_INDEX_ENTRY_STAGE_SET(&entry, 2);
cl_git_pass(git_index_add(index, &entry));
git_oid_fromstr(&entry.id, "2bd0a343aeef7a2cf0d158478966a6e587ff3863");
- GIT_IDXENTRY_STAGE_SET(&entry, 3);
+ GIT_INDEX_ENTRY_STAGE_SET(&entry, 3);
cl_git_pass(git_index_add(index, &entry));
}
"=======\n"
"this file is changed in branch and master\n"
">>>>>>> theirs\n") == 0);
- git_buf_free(&conflicting_buf);
+ git_buf_dispose(&conflicting_buf);
git_index_free(index);
}
"=======\r\n"
"this file is changed in branch and master\r\n"
">>>>>>> theirs\r\n") == 0);
- git_buf_free(&conflicting_buf);
+ git_buf_dispose(&conflicting_buf);
git_index_free(index);
#endif
cl_assert(!git_path_exists(path.ptr));
git_commit_free(commit);
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
static void test_checkout_fails(const char *refname, const char *filename)
cl_assert(!git_path_exists(path.ptr));
git_commit_free(commit);
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
/* A tree that contains ".git" as a tree, with a blob inside
opts.checkout_strategy = GIT_CHECKOUT_FORCE;
cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/dir"));
- cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJECT_ANY));
cl_git_pass(git_checkout_tree(g_repo, obj, &opts));
cl_git_pass(git_repository_set_head(g_repo, "refs/heads/dir"));
opts.checkout_strategy = GIT_CHECKOUT_SAFE;
cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/subtrees"));
- cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJECT_ANY));
cl_git_pass(git_checkout_tree(g_repo, obj, &opts));
cl_git_pass(git_repository_set_head(g_repo, "refs/heads/subtrees"));
opts.checkout_strategy = GIT_CHECKOUT_FORCE;
cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/dir"));
- cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJECT_ANY));
cl_git_pass(git_checkout_tree(g_repo, obj, &opts));
cl_git_pass(git_repository_set_head(g_repo, "refs/heads/dir"));
cl_assert_equal_i(1, ignored);
cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/subtrees"));
- cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJECT_ANY));
error = git_checkout_tree(g_repo, obj, &opts);
opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_UPDATE_ONLY;
cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/dir"));
- cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJECT_ANY));
cl_git_pass(git_checkout_tree(g_repo, obj, &opts));
cl_git_pass(git_repository_set_head(g_repo, "refs/heads/dir"));
/* Hack-ishy workaound to ensure *all* the index entries
* match the content of the tree
*/
- cl_git_pass(git_object_peel(&hack_tree, g_object, GIT_OBJ_TREE));
+ cl_git_pass(git_object_peel(&hack_tree, g_object, GIT_OBJECT_TREE));
cl_git_pass(git_index_read_tree(index, (git_tree *)hack_tree));
+ cl_git_pass(git_index_write(index));
git_object_free(hack_tree);
git_object_free(g_object);
g_object = NULL;
/* Create a conflicting file */
cl_git_pass(git_buf_joinpath(&file_path, "./testrepo", entry_path));
cl_git_mkfile(git_buf_cstr(&file_path), new_content);
- git_buf_free(&file_path);
+ git_buf_dispose(&file_path);
/* Trying to checkout the original commit */
cl_git_pass(git_revparse_single(&g_object, g_repo, commit_sha));
assert_on_branch(g_repo, "master");
cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/dir"));
- cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJECT_ANY));
ca.filename = "new.txt";
ca.error = -5555;
cl_git_mkfile("./testrepo/this-is-dir/contained_file", "content\n");
cl_git_pass(git_index_add_bypath(index, "this-is-dir/contained_file"));
- git_index_write_tree(&tree_id, index);
+ cl_git_pass(git_index_write(index));
+
+ cl_git_pass(git_index_write_tree(&tree_id, index));
cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_id));
cl_git_pass(p_unlink("./testrepo/this-is-dir/contained_file"));
opts.checkout_strategy = GIT_CHECKOUT_FORCE;
cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/dir"));
- cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJECT_ANY));
cl_git_pass(git_checkout_tree(g_repo, obj, &opts));
opts.checkout_strategy = GIT_CHECKOUT_FORCE;
cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/dir"));
- cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJECT_ANY));
cl_git_pass(git_checkout_tree(g_repo, obj, &opts));
cl_git_pass(p_chdir("testrepo/a"));
cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/master"));
- cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJECT_ANY));
cl_git_fail(git_checkout_tree(g_repo, obj, &opts));
GIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES;
cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/dir"));
- cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJECT_ANY));
cl_git_pass(git_checkout_tree(g_repo, obj, &opts));
cl_git_pass(p_chdir("testrepo/a"));
cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/master"));
- cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJECT_ANY));
cl_git_pass(git_checkout_tree(g_repo, obj, &opts));
opts.notify_payload = &cts;
cl_git_pass(git_reference_name_to_id(&oid, g_repo, "HEAD"));
- cl_git_pass(git_object_lookup(&g_object, g_repo, &oid, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&g_object, g_repo, &oid, GIT_OBJECT_ANY));
cl_git_fail(git_checkout_tree(g_repo, g_object, &opts));
void test_checkout_tree__extremely_long_file_name(void)
{
- // A utf-8 string with 83 characters, but 249 bytes.
+ /* A utf-8 string with 83 characters, but 249 bytes. */
const char *longname = "\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97";
char path[1024];
memset(&entry, 0x0, sizeof(git_index_entry));
entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&entry, 1);
+ GIT_INDEX_ENTRY_STAGE_SET(&entry, 1);
git_oid_fromstr(&entry.id, "d427e0b2e138501a3d15cc376077a3631e15bd46");
entry.path = path;
cl_git_pass(git_index_add(index, &entry));
- GIT_IDXENTRY_STAGE_SET(&entry, 2);
+ GIT_INDEX_ENTRY_STAGE_SET(&entry, 2);
git_oid_fromstr(&entry.id, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf");
cl_git_pass(git_index_add(index, &entry));
- GIT_IDXENTRY_STAGE_SET(&entry, 3);
+ GIT_INDEX_ENTRY_STAGE_SET(&entry, 3);
git_oid_fromstr(&entry.id, "2bd0a343aeef7a2cf0d158478966a6e587ff3863");
cl_git_pass(git_index_add(index, &entry));
- git_index_write(index);
+ cl_git_pass(git_index_write(index));
git_index_free(index);
}
opts.checkout_strategy = GIT_CHECKOUT_SAFE;
cl_git_pass(git_reference_name_to_id(&oid, g_repo, "HEAD"));
- cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJECT_ANY));
create_conflict("conflicts.txt");
result = GIT_PERMS_IS_EXEC(st.st_mode) ?
GIT_FILEMODE_BLOB_EXECUTABLE : GIT_FILEMODE_BLOB;
- git_buf_free(&fullpath);
+ git_buf_dispose(&fullpath);
return result;
}
git_commit *commit;
git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
git_index *index;
-
+
cl_git_pass(git_oid_fromstr(&commit_id, "afe4393b2b2a965f06acf2ca9658eaa01e0cd6b6"));
cl_git_pass(git_commit_lookup(&commit, g_repo, &commit_id));
create_conflict("other.txt");
cl_git_mkfile("testrepo/other.txt", "This is another conflict file.\n");
- git_index_write(index);
+ cl_git_pass(git_index_write(index));
cl_git_pass(git_checkout_tree(g_repo, (const git_object *)commit, &opts));
git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
git_index *index;
const char *path = "executable.txt";
-
+
cl_git_pass(git_oid_fromstr(&commit_id, "afe4393b2b2a965f06acf2ca9658eaa01e0cd6b6"));
cl_git_pass(git_commit_lookup(&commit, g_repo, &commit_id));
create_conflict("other.txt");
cl_git_mkfile("testrepo/other.txt", "This is another conflict file.\n");
- git_index_write(index);
+ cl_git_pass(git_index_write(index));
cl_git_pass(git_checkout_tree(g_repo, (const git_object *)commit, &opts));
cl_git_pass(git_checkout_tree(g_repo, (git_object *)master_commit, &opts));
cl_git_pass(git_repository_set_head(g_repo, "refs/heads/master"));
-
+
assert_on_branch(g_repo, "master");
cl_assert(git_path_isfile("testrepo/README"));
opts.checkout_strategy = GIT_CHECKOUT_FORCE;
cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/dir"));
- cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJECT_ANY));
cl_git_pass(git_checkout_tree(g_repo, obj, &opts));
opts.paths.count = 2;
cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/ident"));
- cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJECT_ANY));
cl_git_pass(git_checkout_tree(g_repo, obj, &opts));
cl_assert_equal_strn(ident1.ptr, "# $Id: ", 7);
cl_assert_equal_strn(ident2.ptr, "# $Id: ", 7);
- git_buf_free(&ident1);
- git_buf_free(&ident2);
+ git_buf_dispose(&ident1);
+ git_buf_dispose(&ident2);
git_object_free(obj);
}
GIT_CHECKOUT_FORCE | GIT_CHECKOUT_DONT_UPDATE_INDEX;
cl_git_pass(git_reference_name_to_id(&oid, g_repo, "HEAD"));
- cl_git_pass(git_object_lookup(&head, g_repo, &oid, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&head, g_repo, &oid, GIT_OBJECT_ANY));
cl_git_pass(git_reset(g_repo, head, GIT_RESET_HARD, &g_opts));
GIT_CHECKOUT_FORCE | GIT_CHECKOUT_DONT_WRITE_INDEX;
cl_git_pass(git_reference_name_to_id(&oid, g_repo, "HEAD"));
- cl_git_pass(git_object_lookup(&head, g_repo, &oid, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&head, g_repo, &oid, GIT_OBJECT_ANY));
cl_git_pass(git_reset(g_repo, head, GIT_RESET_HARD, &g_opts));
opts.checkout_strategy = GIT_CHECKOUT_SAFE;
cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/subtrees"));
- cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJECT_ANY));
cl_git_pass(git_checkout_tree(g_repo, obj, &opts));
cl_git_pass(git_repository_set_head(g_repo, "refs/heads/subtrees"));
size_t conflicts = 0;
assert_on_branch(g_repo, "master");
+
cl_git_pass(git_repository_head(&head, g_repo));
- cl_git_pass(git_reference_peel(&obj, head, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel(&obj, head, GIT_OBJECT_COMMIT));
cl_git_pass(git_reset(g_repo, obj, GIT_RESET_HARD, NULL));
assert_on_branch(g_repo, "master");
cl_git_pass(git_repository_index(&index, g_repo));
cl_git_pass(git_repository_head(&head, g_repo));
- cl_git_pass(git_reference_peel(&obj, head, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel(&obj, head, GIT_OBJECT_COMMIT));
cl_git_pass(git_reset(g_repo, obj, GIT_RESET_HARD, NULL));
assert_status_entrycount(g_repo, 0);
cl_must_pass(p_chmod("testrepo/README", 0755));
cl_must_pass(git_index_add_bypath(index, "README"));
+ cl_git_pass(git_index_write(index));
assert_status_entrycount(g_repo, 1);
+
cl_git_pass(git_checkout_tree(g_repo, obj, &g_opts));
+ cl_git_pass(git_index_write(index));
+
assert_status_entrycount(g_repo, 0);
git_object_free(obj);
{
cl_git_pass(git_checkout_tree(g_repo, NULL, NULL));
}
+
+static void modify_index_ondisk(void)
+{
+ git_repository *other_repo;
+ git_index *other_index;
+ git_index_entry entry = {{0}};
+
+ cl_git_pass(git_repository_open(&other_repo, git_repository_workdir(g_repo)));
+ cl_git_pass(git_repository_index(&other_index, other_repo));
+
+ cl_git_pass(git_oid_fromstr(&entry.id, "1385f264afb75a56a5bec74243be9b367ba4ca08"));
+ entry.mode = 0100644;
+ entry.path = "README";
+
+ cl_git_pass(git_index_add(other_index, &entry));
+ cl_git_pass(git_index_write(other_index));
+
+ git_index_free(other_index);
+ git_repository_free(other_repo);
+}
+
+static void modify_index_and_checkout_tree(git_checkout_options *opts)
+{
+ git_index *index;
+ git_reference *head;
+ git_object *obj;
+
+ /* External changes to the index are maintained by default */
+ cl_git_pass(git_repository_index(&index, g_repo));
+ cl_git_pass(git_repository_head(&head, g_repo));
+ cl_git_pass(git_reference_peel(&obj, head, GIT_OBJECT_COMMIT));
+
+ cl_git_pass(git_reset(g_repo, obj, GIT_RESET_HARD, NULL));
+ assert_status_entrycount(g_repo, 0);
+
+ modify_index_ondisk();
+
+ /* The file in the index remains modified */
+ cl_git_pass(git_checkout_tree(g_repo, obj, opts));
+
+ git_object_free(obj);
+ git_reference_free(head);
+ git_index_free(index);
+}
+
+void test_checkout_tree__retains_external_index_changes(void)
+{
+ git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
+
+ opts.checkout_strategy = GIT_CHECKOUT_SAFE;
+
+ modify_index_and_checkout_tree(&opts);
+ assert_status_entrycount(g_repo, 1);
+}
+
+void test_checkout_tree__no_index_refresh(void)
+{
+ git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
+
+ opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_NO_REFRESH;
+
+ modify_index_and_checkout_tree(&opts);
+ assert_status_entrycount(g_repo, 0);
+}
root = git_repository_workdir(repo);
cl_assert(root);
- cl_git_pass(git_object_lookup(&obj, repo, id, GIT_OBJ_ANY));
- cl_git_pass(git_object_peel((git_object **)&tree, obj, GIT_OBJ_TREE));
+ cl_git_pass(git_object_lookup(&obj, repo, id, GIT_OBJECT_ANY));
+ cl_git_pass(git_object_peel((git_object **)&tree, obj, GIT_OBJECT_TREE));
git_object_free(obj);
max_i = git_tree_entrycount(tree);
cl_git_pass(git_buf_joinpath(&path, root, git_tree_entry_name(te)));
switch (git_tree_entry_type(te)) {
- case GIT_OBJ_COMMIT:
+ case GIT_OBJECT_COMMIT:
assert_dir_exists(path.ptr);
break;
- case GIT_OBJ_TREE:
+ case GIT_OBJECT_TREE:
assert_dir_exists(path.ptr);
if (recurse)
assert_workdir_matches_tree(
repo, git_tree_entry_id(te), path.ptr, true);
break;
- case GIT_OBJ_BLOB:
+ case GIT_OBJECT_BLOB:
switch (git_tree_entry_filemode(te)) {
case GIT_FILEMODE_BLOB:
case GIT_FILEMODE_BLOB_EXECUTABLE:
}
git_tree_free(tree);
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
void test_checkout_typechange__checkout_typechanges_safe(void)
git_buf_joinpath(&dirtypath, git_repository_workdir(submodule_repo), "dirty"));
force_create_file(git_buf_cstr(&dirtypath));
- git_buf_free(&dirtypath);
- git_buf_free(&submodulepath);
+ git_buf_dispose(&dirtypath);
+ git_buf_dispose(&submodulepath);
git_repository_free(submodule_repo);
return 0;
static git_repository *repo;
static git_index *repo_index;
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_cherrypick_workdir__initialize(void)
{
repo = cl_git_sandbox_init(TEST_REPO_PATH);
git_commit_free(commit);
git_commit_free(head);
- git_buf_free(&mergemsg_buf);
- git_buf_free(&conflicting_buf);
+ git_buf_dispose(&mergemsg_buf);
+ git_buf_dispose(&conflicting_buf);
}
/* git reset --hard bafbf6912c09505ac60575cd43d3f2aba3bd84d8
"\tfile3.txt.renamed\n" \
"\tfile3.txt.renamed_on_branch\n") == 0);
- git_buf_free(&mergemsg_buf);
+ git_buf_dispose(&mergemsg_buf);
git_commit_free(commit);
git_commit_free(head);
}
git_cherrypick_options opts = GIT_CHERRYPICK_OPTIONS_INIT;
cl_git_pass(git_repository_head(&head, repo));
- cl_git_pass(git_reference_peel((git_object **)&commit, head, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel((git_object **)&commit, head, GIT_OBJECT_COMMIT));
opts.mainline = 1;
cl_must_fail(git_cherrypick(repo, commit, &opts));
const char *cl_fixture(const char *fixture_name);
void cl_fixture_sandbox(const char *fixture_name);
void cl_fixture_cleanup(const char *fixture_name);
+const char *cl_fixture_basename(const char *fixture_name);
#endif
/**
return _path;
}
-static const char *
-fixture_basename(const char *fixture_name)
-{
- const char *p;
-
- for (p = fixture_name; *p; p++) {
- if (p[0] == '/' && p[1] && p[1] != '/')
- fixture_name = p+1;
- }
-
- return fixture_name;
-}
-
#ifdef CLAR_FIXTURE_PATH
const char *cl_fixture(const char *fixture_name)
{
fs_copy(cl_fixture(fixture_name), _clar_path);
}
+const char *cl_fixture_basename(const char *fixture_name)
+{
+ const char *p;
+
+ for (p = fixture_name; *p; p++) {
+ if (p[0] == '/' && p[1] && p[1] != '/')
+ fixture_name = p+1;
+ }
+
+ return fixture_name;
+}
+
void cl_fixture_cleanup(const char *fixture_name)
{
- fs_rm(fixture_path(_clar_path, fixture_basename(fixture_name)));
+ fs_rm(fixture_path(_clar_path, cl_fixture_basename(fixture_name)));
}
#endif
+#ifdef __APPLE__
+#include <sys/syslimits.h>
+#endif
+
static char _clar_path[4096];
static int
continue;
if (is_valid_tmp_path(env)) {
+#ifdef __APPLE__
+ if (length >= PATH_MAX && realpath(env, buffer) != NULL)
+ return 0;
+#endif
strncpy(buffer, env, length);
return 0;
}
/* If the environment doesn't say anything, try to use /tmp */
if (is_valid_tmp_path("/tmp")) {
+#ifdef __APPLE__
+ if (length >= PATH_MAX && realpath("/tmp", buffer) != NULL)
+ return 0;
+#endif
strncpy(buffer, "/tmp", length);
return 0;
}
int error, int expected, const char *file, int line, const char *fncall)
{
char msg[4096];
- const git_error *last = giterr_last();
+ const git_error *last = git_error_last();
if (expected)
p_snprintf(msg, 4096, "error %d (expected %d) - %s",
git_repository *cl_git_sandbox_init(const char *sandbox)
{
+ /* Get the name of the sandbox folder which will be created */
+ const char *basename = cl_fixture_basename(sandbox);
+
/* Copy the whole sandbox folder from our fixtures to our test sandbox
* area. After this it can be accessed with `./sandbox`
*/
cl_fixture_sandbox(sandbox);
_cl_sandbox = sandbox;
- cl_git_pass(p_chdir(sandbox));
+ cl_git_pass(p_chdir(basename));
/* If this is not a bare repo, then rename `sandbox/.gitted` to
* `sandbox/.git` which must be done since we cannot store a folder
cl_git_pass(p_chdir(".."));
/* Now open the sandbox repository and make it available for tests */
- cl_git_pass(git_repository_open(&_cl_repo, sandbox));
+ cl_git_pass(git_repository_open(&_cl_repo, basename));
/* Adjust configs after copying to new filesystem */
cl_git_pass(git_repository_reinit_filesystem(_cl_repo, 0));
git_repository_free(_cl_repo);
_cl_repo = NULL;
- cl_git_pass(git_repository_open(&_cl_repo, _cl_sandbox));
+ cl_git_pass(git_repository_open(
+ &_cl_repo, cl_fixture_basename(_cl_sandbox)));
}
return _cl_repo;
cl_assert(url_buf.size < 4096);
strncpy(url, git_buf_cstr(&url_buf), 4096);
- git_buf_free(&url_buf);
- git_buf_free(&path_buf);
+ git_buf_dispose(&url_buf);
+ git_buf_dispose(&path_buf);
return url;
}
+const char *cl_git_sandbox_path(int is_dir, ...)
+{
+ const char *path = NULL;
+ static char _temp[GIT_PATH_MAX];
+ git_buf buf = GIT_BUF_INIT;
+ va_list arg;
+
+ cl_git_pass(git_buf_sets(&buf, clar_sandbox_path()));
+
+ va_start(arg, is_dir);
+
+ while ((path = va_arg(arg, const char *)) != NULL) {
+ cl_git_pass(git_buf_joinpath(&buf, buf.ptr, path));
+ }
+ va_end(arg);
+
+ cl_git_pass(git_path_prettify(&buf, buf.ptr, NULL));
+ if (is_dir)
+ git_path_to_dir(&buf);
+
+ /* make sure we won't truncate */
+ cl_assert(git_buf_len(&buf) < sizeof(_temp));
+ git_buf_copy_cstr(_temp, sizeof(_temp), &buf);
+
+ git_buf_dispose(&buf);
+
+ return _temp;
+}
+
typedef struct {
const char *filename;
size_t filename_len;
error = remove_placeholders_recurs(&data, &buffer);
- git_buf_free(&buffer);
+ git_buf_dispose(&buffer);
return error;
}
git_config *config;
cl_git_pass(git_repository_config(&config, repo));
if (git_config_get_bool(&val, config, cfg) < 0)
- giterr_clear();
+ git_error_clear();
git_config_free(config);
return val;
}
cl_git_pass(git_path_prettify(&path, "home", NULL));
cl_git_pass(git_libgit2_opts(
GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, path.ptr));
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
void cl_sandbox_set_search_path_defaults(void)
git_libgit2_opts(
GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_PROGRAMDATA, path.ptr);
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
#ifdef GIT_WIN32
supported = (shortname != NULL);
git__free(shortname);
- git_buf_free(&longpath);
+ git_buf_dispose(&longpath);
return supported;
}
#define cl_git_expect(expr, expected, file, line) do { \
int _lg2_error; \
- giterr_clear(); \
+ git_error_clear(); \
if ((_lg2_error = (expr)) != expected) \
cl_git_report_failure(_lg2_error, expected, file, line, "Function call failed: " #expr); \
} while (0)
* calls that are supposed to fail!
*/
#define cl_git_fail(expr) do { \
- giterr_clear(); \
+ git_error_clear(); \
if ((expr) == 0) \
cl_git_report_failure(0, 0, __FILE__, __LINE__, "Function call succeeded: " #expr); \
} while (0)
#define cl_win32_pass(expr) do { \
int _win32_res; \
if ((_win32_res = (expr)) == 0) { \
- giterr_set(GITERR_OS, "Returned: %d, system error code: %d", _win32_res, GetLastError()); \
+ git_error_set(GIT_ERROR_OS, "Returned: %d, system error code: %lu", _win32_res, GetLastError()); \
cl_git_report_failure(_win32_res, 0, __FILE__, __LINE__, "System call failed: " #expr); \
} \
} while(0)
#endif
#define cl_git_thread_pass_(__threaderr, __expr, __file, __line) do { \
- giterr_clear(); \
+ git_error_clear(); \
if ((((cl_git_thread_err *)__threaderr)->error = (__expr)) != 0) { \
- const git_error *_last = giterr_last(); \
+ const git_error *_last = git_error_last(); \
((cl_git_thread_err *)__threaderr)->file = __file; \
((cl_git_thread_err *)__threaderr)->line = __line; \
((cl_git_thread_err *)__threaderr)->expr = "Function call failed: " #__expr; \
void cl_git_sandbox_cleanup(void);
git_repository *cl_git_sandbox_reopen(void);
+/*
+ * build a sandbox-relative from path segments
+ * is_dir will add a trailing slash
+ * vararg must be a NULL-terminated char * list
+ */
+const char *cl_git_sandbox_path(int is_dir, ...);
+
/* Local-repo url helpers */
const char* cl_git_fixture_url(const char *fixturename);
const char* cl_git_path_url(const char *path);
cl_git_pass(git_branch_upstream_name(&buf, g_repo_cloned, local_name));
cl_assert_equal_s(expected_tracked_branch_name, buf.ptr);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
/* ...and the name of the remote... */
cl_git_pass(git_branch_remote_name(&buf, g_repo_cloned, expected_tracked_branch_name));
cl_assert_equal_s(expected_remote_name, buf.ptr);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
/* ...even when the remote HEAD is unborn as well */
cl_assert_equal_i(GIT_ENOTFOUND, git_reference_lookup(&ref, g_repo_cloned,
cl_assert_equal_i(1, git_clone__should_clone_local(path, GIT_CLONE_LOCAL_NO_LINKS));
cl_assert_equal_i(0, git_clone__should_clone_local(path, GIT_CLONE_NO_LOCAL));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_clone_local__hardlinks(void)
cl_assert_equal_i(3, st.st_nlink);
#endif
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_repository_free(repo);
cl_git_pass(git_futils_rmdir_r("./clone.git", NULL, GIT_RMDIR_REMOVE_FILES));
git_remote_free(remote);
git_repository_free(repo);
- git_buf_free(&unc);
- git_buf_free(&git_unc);
+ git_buf_dispose(&unc);
+ git_buf_dispose(&git_unc);
cl_git_pass(git_futils_rmdir_r("./clone.git", NULL, GIT_RMDIR_REMOVE_FILES));
#endif
git_remote_free(remote);
git_repository_free(repo);
- git_buf_free(&git_unc);
+ git_buf_dispose(&git_unc);
cl_git_pass(git_futils_rmdir_r("./clone.git", NULL, GIT_RMDIR_REMOVE_FILES));
#endif
cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(g_repo), "master.txt"));
cl_assert_equal_i(false, git_path_isfile(git_buf_cstr(&path)));
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
void test_clone_nonetwork__can_checkout_given_branch(void)
memset(&entry, 0, sizeof(git_index_entry));
entry.path = file_path;
entry.mode = GIT_FILEMODE_BLOB;
- cl_git_pass(git_odb_write(&entry.id, odb, file_content, strlen(file_content), GIT_OBJ_BLOB));
+ cl_git_pass(git_odb_write(&entry.id, odb, file_content, strlen(file_content), GIT_OBJECT_BLOB));
cl_git_pass(git_index_add(index, &entry));
cl_git_pass(git_index_write_tree_to(&tree_id, index, stage));
git_reflog_free(log);
- git_buf_free(&expected_message);
+ git_buf_dispose(&expected_message);
}
void test_clone_nonetwork__clone_updates_reflog_properly(void)
#include "commit.h"
#include "signature.h"
-// Fixture setup
+/* Fixture setup */
static git_repository *g_repo;
void test_commit_parse__initialize(void)
{
}
-// Header parsing
+/* Header parsing */
typedef struct {
const char *line;
const char *header;
}
-// Signature parsing
+/* Signature parsing */
typedef struct {
const char *string;
const char *header;
{"committer Vicent Marti <tanoku@gmail.com> 123456 +0000 \n", "committer ", "Vicent Marti", "tanoku@gmail.com", 123456, 0},
{"committer Vicent Marti <tanoku@gmail.com> 123456 +0100 \n", "committer ", "Vicent Marti", "tanoku@gmail.com", 123456, 60},
{"committer Vicent Marti <tanoku@gmail.com> 123456 -0100 \n", "committer ", "Vicent Marti", "tanoku@gmail.com", 123456, -60},
- // Parse a signature without an author field
+ /* Parse a signature without an author field */
{"committer <tanoku@gmail.com> 123456 -0100 \n", "committer ", "", "tanoku@gmail.com", 123456, -60},
- // Parse a signature without an author field
+ /* Parse a signature without an author field */
{"committer <tanoku@gmail.com> 123456 -0100 \n", "committer ", "", "tanoku@gmail.com", 123456, -60},
- // Parse a signature with an empty author field
+ /* Parse a signature with an empty author field */
{"committer <tanoku@gmail.com> 123456 -0100 \n", "committer ", "", "tanoku@gmail.com", 123456, -60},
- // Parse a signature with an empty email field
+ /* Parse a signature with an empty email field */
{"committer Vicent Marti <> 123456 -0100 \n", "committer ", "Vicent Marti", "", 123456, -60},
- // Parse a signature with an empty email field
+ /* Parse a signature with an empty email field */
{"committer Vicent Marti < > 123456 -0100 \n", "committer ", "Vicent Marti", "", 123456, -60},
- // Parse a signature with empty name and email
+ /* Parse a signature with empty name and email */
{"committer <> 123456 -0100 \n", "committer ", "", "", 123456, -60},
- // Parse a signature with empty name and email
+ /* Parse a signature with empty name and email */
{"committer <> 123456 -0100 \n", "committer ", "", "", 123456, -60},
- // Parse a signature with empty name and email
+ /* Parse a signature with empty name and email */
{"committer < > 123456 -0100 \n", "committer ", "", "", 123456, -60},
- // Parse an obviously invalid signature
+ /* Parse an obviously invalid signature */
{"committer foo<@bar> 123456 -0100 \n", "committer ", "foo", "@bar", 123456, -60},
- // Parse an obviously invalid signature
+ /* Parse an obviously invalid signature */
{"committer foo<@bar> 123456 -0100 \n", "committer ", "foo", "@bar", 123456, -60},
- // Parse an obviously invalid signature
+ /* Parse an obviously invalid signature */
{"committer <>\n", "committer ", "", "", 0, 0},
{"committer Vicent Marti <tanoku@gmail.com> 123456 -1500 \n", "committer ", "Vicent Marti", "tanoku@gmail.com", 123456, 0},
{"committer Vicent Marti <tanoku@gmail.com> 123456 +0163 \n", "committer ", "Vicent Marti", "tanoku@gmail.com", 123456, 0},
static char *failing_commit_cases[] = {
-// empty commit
+/* empty commit */
"",
-// random garbage
+/* random garbage */
"asd97sa9du902e9a0jdsuusad09as9du098709aweu8987sd\n",
-// broken endlines 1
+/* broken endlines 1 */
"tree f6c0dad3c7b3481caa9d73db21f91964894a945b\r\n\
parent 05452d6349abcd67aa396dfb28660d765d8b2a36\r\n\
author Vicent Marti <tanoku@gmail.com> 1273848544 +0200\r\n\
committer Vicent Marti <tanoku@gmail.com> 1273848544 +0200\r\n\
\r\n\
a test commit with broken endlines\r\n",
-// broken endlines 2
+/* broken endlines 2 */
"tree f6c0dad3c7b3481caa9d73db21f91964894a945b\
parent 05452d6349abcd67aa396dfb28660d765d8b2a36\
author Vicent Marti <tanoku@gmail.com> 1273848544 +0200\
committer Vicent Marti <tanoku@gmail.com> 1273848544 +0200\
\
another test commit with broken endlines",
-// starting endlines
+/* starting endlines */
"\ntree f6c0dad3c7b3481caa9d73db21f91964894a945b\n\
parent 05452d6349abcd67aa396dfb28660d765d8b2a36\n\
author Vicent Marti <tanoku@gmail.com> 1273848544 +0200\n\
committer Vicent Marti <tanoku@gmail.com> 1273848544 +0200\n\
\n\
a test commit with a starting endline\n",
-// corrupted commit 1
+/* corrupted commit 1 */
"tree f6c0dad3c7b3481caa9d73db21f91964894a945b\n\
parent 05452d6349abcd67aa396df",
-// corrupted commit 2
+/* corrupted commit 2 */
"tree f6c0dad3c7b3481caa9d73db21f91964894a945b\n\
parent ",
-// corrupted commit 3
+/* corrupted commit 3 */
"tree f6c0dad3c7b3481caa9d73db21f91964894a945b\n\
parent ",
-// corrupted commit 4
+/* corrupted commit 4 */
"tree f6c0dad3c7b3481caa9d73db21f91964894a945b\n\
par",
};
static char *passing_commit_cases[] = {
-// simple commit with no message
+/* simple commit with no message */
"tree 1810dff58d8a660512d4832e740f692884338ccd\n\
author Vicent Marti <tanoku@gmail.com> 1273848544 +0200\n\
committer Vicent Marti <tanoku@gmail.com> 1273848544 +0200\n\
\n",
-// simple commit, no parent
+/* simple commit, no parent */
"tree 1810dff58d8a660512d4832e740f692884338ccd\n\
author Vicent Marti <tanoku@gmail.com> 1273848544 +0200\n\
committer Vicent Marti <tanoku@gmail.com> 1273848544 +0200\n\
\n\
a simple commit which works\n",
-// simple commit, no parent, no newline in message
+/* simple commit, no parent, no newline in message */
"tree 1810dff58d8a660512d4832e740f692884338ccd\n\
author Vicent Marti <tanoku@gmail.com> 1273848544 +0200\n\
committer Vicent Marti <tanoku@gmail.com> 1273848544 +0200\n\
\n\
a simple commit which works",
-// simple commit, 1 parent
+/* simple commit, 1 parent */
"tree 1810dff58d8a660512d4832e740f692884338ccd\n\
parent e90810b8df3e80c413d903f631643c716887138d\n\
author Vicent Marti <tanoku@gmail.com> 1273848544 +0200\n\
}
-// query the details on a parsed commit
+/* query the details on a parsed commit */
void test_commit_parse__details0(void) {
static const char *commit_ids[] = {
"a4a7dce85cf63874e984719f4fdd239f5145052f", /* 0 */
old_parent = parent;
cl_git_pass(git_commit_parent(&parent, commit, p));
cl_assert(parent != NULL);
- cl_assert(git_commit_author(parent) != NULL); // is it really a commit?
+ cl_assert(git_commit_author(parent) != NULL); /* is it really a commit? */
}
git_commit_free(old_parent);
git_commit_free(parent);
cl_git_pass(git_commit_header_field(&buf, commit, "committer"));
cl_assert_equal_s("Vicent Marti <tanoku@gmail.com> 1273848544 +0200", buf.ptr);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_commit__free(commit);
}
cl_git_pass(git_repository_odb__weakptr(&odb, g_repo));
- cl_git_pass(git_odb_write(&commit_id, odb, passing_commit_cases[4], strlen(passing_commit_cases[4]), GIT_OBJ_COMMIT));
+ cl_git_pass(git_odb_write(&commit_id, odb, passing_commit_cases[4], strlen(passing_commit_cases[4]), GIT_OBJECT_COMMIT));
cl_git_pass(git_commit_extract_signature(&signature, &signed_data, g_repo, &commit_id, NULL));
cl_assert_equal_s(gpgsig, signature.ptr);
/* Try to parse a tree */
cl_git_pass(git_oid_fromstr(&commit_id, "45dd856fdd4d89b884c340ba0e047752d9b085d6"));
cl_git_fail_with(GIT_ENOTFOUND, git_commit_extract_signature(&signature, &signed_data, g_repo, &commit_id, NULL));
- cl_assert_equal_i(GITERR_INVALID, giterr_last()->klass);
+ cl_assert_equal_i(GIT_ERROR_INVALID, git_error_last()->klass);
/* Try to parse an unsigned commit */
- cl_git_pass(git_odb_write(&commit_id, odb, passing_commit_cases[1], strlen(passing_commit_cases[1]), GIT_OBJ_COMMIT));
+ cl_git_pass(git_odb_write(&commit_id, odb, passing_commit_cases[1], strlen(passing_commit_cases[1]), GIT_OBJECT_COMMIT));
cl_git_fail_with(GIT_ENOTFOUND, git_commit_extract_signature(&signature, &signed_data, g_repo, &commit_id, NULL));
- cl_assert_equal_i(GITERR_OBJECT, giterr_last()->klass);
+ cl_assert_equal_i(GIT_ERROR_OBJECT, git_error_last()->klass);
/* Parse the commit with a single-line signature */
git_buf_clear(&signature);
git_buf_clear(&signed_data);
- cl_git_pass(git_odb_write(&commit_id, odb, oneline_signature, strlen(oneline_signature), GIT_OBJ_COMMIT));
+ cl_git_pass(git_odb_write(&commit_id, odb, oneline_signature, strlen(oneline_signature), GIT_OBJECT_COMMIT));
cl_git_pass(git_commit_extract_signature(&signature, &signed_data, g_repo, &commit_id, NULL));
cl_assert_equal_s("bad", signature.ptr);
cl_assert_equal_s(oneline_data, signed_data.ptr);
- git_buf_free(&signature);
- git_buf_free(&signed_data);
+ git_buf_dispose(&signature);
+ git_buf_dispose(&signed_data);
}
assert_name_and_email("nulltoken \xe2\x98\xba", "emeric.fermas@gmail.com", "nulltoken \xe2\x98\xba", "emeric.fermas@gmail.com");
}
+void test_commit_signature__timezone_does_not_read_oob(void)
+{
+ const char *header = "A <a@example.com> 1461698487 +1234", *header_end;
+ git_signature *sig;
+
+ /* Let the buffer end midway between the timezone offeset's "+12" and "34" */
+ header_end = header + strlen(header) - 2;
+
+ sig = git__calloc(1, sizeof(git_signature));
+ cl_assert(sig);
+
+ cl_git_pass(git_signature__parse(sig, &header, header_end, NULL, '\0'));
+ cl_assert_equal_s(sig->name, "A");
+ cl_assert_equal_s(sig->email, "a@example.com");
+ cl_assert_equal_i(sig->when.time, 1461698487);
+ cl_assert_equal_i(sig->when.offset, 12);
+
+ git_signature_free(sig);
+}
+
void test_commit_signature__angle_brackets_in_names_are_not_supported(void)
{
cl_git_fail(try_build_signature("<Phil Haack", "phil@haack", 1234567890, 60));
void test_commit_signature__create_empties(void)
{
- // can not create a signature with empty name or email
+ /* can not create a signature with empty name or email */
cl_git_pass(try_build_signature("nulltoken", "emeric.fermas@gmail.com", 1234567890, 60));
cl_git_fail(try_build_signature("", "emeric.fermas@gmail.com", 1234567890, 60));
void test_commit_signature__create_one_char(void)
{
- // creating a one character signature
+ /* creating a one character signature */
assert_name_and_email("x", "foo@bar.baz", "x", "foo@bar.baz");
}
void test_commit_signature__create_two_char(void)
{
- // creating a two character signature
+ /* creating a two character signature */
assert_name_and_email("xx", "foo@bar.baz", "xx", "foo@bar.baz");
}
void test_commit_signature__create_zero_char(void)
{
- // creating a zero character signature
+ /* creating a zero character signature */
git_signature *sign;
cl_git_fail(git_signature_new(&sign, "", "x@y.z", 1234567890, 60));
cl_assert(sign == NULL);
static git_reference *head, *branch;
static git_commit *commit;
-// Fixture setup
+/* Fixture setup */
static git_repository *g_repo;
void test_commit_write__initialize(void)
{
}
-// write a new commit object from memory to disk
+/* write a new commit object from memory to disk */
void test_commit_write__from_memory(void)
{
git_oid tree_id, parent_id, commit_id;
This is a root commit and should be the only one in this branch\n\
");
- git_buf_free(&commit);
+ git_buf_dispose(&commit);
git_tree_free(tree);
git_commit_free(parent);
git_signature_free(author);
git_signature_free(committer);
}
-// create a root commit
+/* create a root commit */
void test_commit_write__root(void)
{
git_oid tree_id, commit_id;
/* First we need to update HEAD so it points to our non-existant branch */
cl_git_pass(git_reference_lookup(&head, g_repo, "HEAD"));
- cl_assert(git_reference_type(head) == GIT_REF_SYMBOLIC);
+ cl_assert(git_reference_type(head) == GIT_REFERENCE_SYMBOLIC);
head_old = git__strdup(git_reference_symbolic_target(head));
cl_assert(head_old != NULL);
git_reference_free(head);
cl_git_pass(git_config_new(&cfg));
cl_git_fail(git_config_add_backend(cfg, &backend, 0, NULL, false));
- err = giterr_last();
- cl_assert_equal_i(GITERR_INVALID, err->klass);
+ err = git_error_last();
+ cl_assert_equal_i(GIT_ERROR_INVALID, err->klass);
- giterr_clear();
+ git_error_clear();
backend.version = 1024;
cl_git_fail(git_config_add_backend(cfg, &backend, 0, NULL, false));
- err = giterr_last();
- cl_assert_equal_i(GITERR_INVALID, err->klass);
+ err = git_error_last();
+ cl_assert_equal_i(GIT_ERROR_INVALID, err->klass);
git_config_free(cfg);
}
git_config_get_string_buf(&buf, cfg, "foo.bar"));
}
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_config_free(cfg);
}
assert_condition_includes("gitdir", path.ptr, false);
git__free(sandbox_path);
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
void test_config_conditionals__gitdir_i(void)
assert_condition_includes("gitdir/i", path.ptr, true);
git__free(sandbox_path);
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
void test_config_conditionals__invalid_conditional_fails(void)
cl_git_pass(git_config_get_string_buf(&buf, config, name));
cl_assert_equal_s(expected_value, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
static int count_config_entries_cb(
cl_git_pass(git_config_get_string_buf(&buf, cfg, "core.stringglobal"));
cl_assert_equal_s("don't find me!", buf.ptr);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_config_free(cfg);
}
cl_git_pass(git_config_get_string_buf(&buf, single_level_cfg, "core.stringglobal"));
cl_assert_equal_s("don't find me!", buf.ptr);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_config_free(single_level_cfg);
}
cl_git_pass(git_libgit2_opts(
GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_SYSTEM, path.ptr));
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
void test_config_global__cleanup(void)
cl_git_pass(git_config_get_string_buf(&buf, selected, key));
cl_assert_equal_s(str, buf.ptr);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_config_free(selected);
git_config_free(xdg);
git_config_free(cfg);
cl_git_pass(git_config_open_ondisk(&cfg, config_path.ptr));
cl_git_pass(git_config_set_string(cfg, "programdata.var", "even higher level"));
- git_buf_free(&config_path);
+ git_buf_dispose(&config_path);
git_config_free(cfg);
git_config_open_default(&cfg);
cl_assert_equal_s("even higher level", var_contents.ptr);
git_config_free(cfg);
- git_buf_free(&var_contents);
+ git_buf_dispose(&var_contents);
cl_git_pass(git_repository_init(&repo, "./foo.git", true));
cl_git_pass(git_repository_config(&cfg, repo));
cl_assert_equal_s("even higher level", var_contents.ptr);
git_config_free(cfg);
- git_buf_free(&var_contents);
+ git_buf_dispose(&var_contents);
git_repository_free(repo);
cl_fixture_cleanup("./foo.git");
}
void test_config_include__cleanup(void)
{
git_config_free(cfg);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_config_include__relative(void)
cl_git_pass(git_buf_printf(&buf, "[include]\npath = %s/config-included", cl_fixture("config")));
cl_git_mkfile("config-include-absolute", git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
cl_git_pass(git_config_open_ondisk(&cfg, "config-include-absolute"));
cl_git_pass(git_config_get_string_buf(&buf, cfg, "foo.bar.baz"));
{
cl_git_mkfile("including", "[include]\npath = nonexistentfile\n[foo]\nbar = baz");
- giterr_clear();
+ git_error_clear();
cl_git_pass(git_config_open_ondisk(&cfg, "including"));
- cl_assert(giterr_last() == NULL);
+ cl_assert(git_error_last() == NULL);
cl_git_pass(git_config_get_string_buf(&buf, cfg, "foo.bar"));
cl_assert_equal_s("baz", git_buf_cstr(&buf));
cl_git_pass(git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, cl_fixture("config")));
cl_git_mkfile("including", "[include]\npath = ~/.nonexistentfile\n[foo]\nbar = baz");
- giterr_clear();
+ git_error_clear();
cl_git_pass(git_config_open_ondisk(&cfg, "including"));
- cl_assert(giterr_last() == NULL);
+ cl_assert(git_error_last() == NULL);
cl_git_pass(git_config_get_string_buf(&buf, cfg, "foo.bar"));
cl_assert_equal_s("baz", git_buf_cstr(&buf));
--- /dev/null
+#include "clar_libgit2.h"
+
+#include "config_backend.h"
+
+static git_config_backend *backend;
+
+void test_config_memory__initialize(void)
+{
+ backend = NULL;
+}
+
+void test_config_memory__cleanup(void)
+{
+ git_config_backend_free(backend);
+}
+
+static void assert_config_contains(git_config_backend *backend,
+ const char *name, const char *value)
+{
+ git_config_entry *entry;
+ cl_git_pass(git_config_backend_get_string(&entry, backend, name));
+ cl_assert_equal_s(entry->value, value);
+}
+
+struct expected_entry {
+ const char *name;
+ const char *value;
+ int seen;
+};
+
+static int contains_all_cb(const git_config_entry *entry, void *payload)
+{
+ struct expected_entry *entries = (struct expected_entry *) payload;
+ int i;
+
+ for (i = 0; entries[i].name; i++) {
+ if (strcmp(entries[i].name, entry->name) ||
+ strcmp(entries[i].value , entry->value))
+ continue;
+
+ if (entries[i].seen)
+ cl_fail("Entry seen more than once");
+ entries[i].seen = 1;
+ return 0;
+ }
+
+ cl_fail("Unexpected entry");
+ return -1;
+}
+
+static void assert_config_contains_all(git_config_backend *backend,
+ struct expected_entry *entries)
+{
+ int i;
+
+ cl_git_pass(git_config_backend_foreach(backend, contains_all_cb, entries));
+
+ for (i = 0; entries[i].name; i++)
+ cl_assert(entries[i].seen);
+}
+
+static void setup_backend(const char *cfg)
+{
+ cl_git_pass(git_config_backend_from_string(&backend, cfg, strlen(cfg)));
+ cl_git_pass(git_config_backend_open(backend, 0, NULL));
+}
+
+void test_config_memory__write_operations_fail(void)
+{
+ setup_backend("");
+ cl_git_fail(git_config_backend_set_string(backend, "general.foo", "var"));
+ cl_git_fail(git_config_backend_delete(backend, "general.foo"));
+ cl_git_fail(git_config_backend_lock(backend));
+ cl_git_fail(git_config_backend_unlock(backend, 0));
+}
+
+void test_config_memory__simple(void)
+{
+ setup_backend(
+ "[general]\n"
+ "foo=bar\n");
+
+ assert_config_contains(backend, "general.foo", "bar");
+}
+
+void test_config_memory__malformed_fails_to_open(void)
+{
+ const char *cfg =
+ "[general\n"
+ "foo=bar\n";
+ cl_git_pass(git_config_backend_from_string(&backend, cfg, strlen(cfg)));
+ cl_git_fail(git_config_backend_open(backend, 0, NULL));
+}
+
+void test_config_memory__multiple_vars(void)
+{
+ setup_backend(
+ "[general]\n"
+ "foo=bar\n"
+ "key=value\n");
+ assert_config_contains(backend, "general.foo", "bar");
+ assert_config_contains(backend, "general.key", "value");
+}
+
+void test_config_memory__multiple_sections(void)
+{
+ setup_backend(
+ "[general]\n"
+ "foo=bar\n"
+ "\n"
+ "[other]\n"
+ "key=value\n");
+ assert_config_contains(backend, "general.foo", "bar");
+ assert_config_contains(backend, "other.key", "value");
+}
+
+void test_config_memory__multivar_gets_correct_string(void)
+{
+ setup_backend(
+ "[general]\n"
+ "foo=bar1\n"
+ "foo=bar2\n");
+ assert_config_contains(backend, "general.foo", "bar2");
+}
+
+void test_config_memory__foreach_sees_multivar(void)
+{
+ struct expected_entry entries[] = {
+ { "general.foo", "bar1", 0 },
+ { "general.foo", "bar2", 0 },
+ { NULL, NULL, 0 },
+ };
+
+ setup_backend(
+ "[general]\n"
+ "foo=bar1\n"
+ "foo=bar2\n");
+ assert_config_contains_all(backend, entries);
+}
cl_git_pass(git_config_get_string_buf(&buf, config, "core.editor"));
cl_assert_equal_s("ed", git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_config_free(config);
p_unlink(TEST_CONFIG);
void test_config_read__cleanup(void)
{
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_config_read__simple_read(void)
void test_config_read__iterator(void)
{
+ const char *keys[] = {
+ "core.dummy2",
+ "core.verylong",
+ "core.dummy",
+ "remote.ab.url",
+ "remote.abba.url",
+ "core.dummy2",
+ "core.global"
+ };
git_config *cfg;
git_config_iterator *iter;
git_config_entry *entry;
cl_git_pass(git_config_iterator_new(&iter, cfg));
while ((ret = git_config_next(&entry, iter)) == 0) {
+ cl_assert_equal_s(entry->name, keys[count]);
count++;
}
git_config_free(cfg);
}
+void test_config_read__parent_dir_is_file(void)
+{
+ git_config *cfg;
+ int count;
+
+ cl_git_pass(git_config_new(&cfg));
+ /*
+ * Verify we can add non-existing files when the parent directory is not
+ * a directory.
+ */
+ cl_git_pass(git_config_add_file_ondisk(cfg, "/dev/null/.gitconfig",
+ GIT_CONFIG_LEVEL_SYSTEM, NULL, 0));
+
+ count = 0;
+ cl_git_pass(git_config_foreach(cfg, count_cfg_entries_and_compare_levels, &count));
+ cl_assert_equal_i(0, count);
+
+ git_config_free(cfg);
+}
+
/*
* At the beginning of the test, config18 has:
* int32global = 28
cl_git_pass(git_config_open_ondisk(&cfg, "./testconfig"));
cl_git_pass(git_config_get_path(&path, cfg, "some.path"));
cl_assert_equal_s(expected_path.ptr, path.ptr);
- git_buf_free(&path);
+ git_buf_dispose(&path);
cl_git_mkfile("./testconfig", "[some]\n path = ~/");
cl_git_pass(git_path_join_unrooted(&expected_path, "", home_path.ptr, NULL));
cl_git_pass(git_config_get_path(&path, cfg, "some.path"));
cl_assert_equal_s(expected_path.ptr, path.ptr);
- git_buf_free(&path);
+ git_buf_dispose(&path);
cl_git_mkfile("./testconfig", "[some]\n path = ~");
cl_git_pass(git_buf_sets(&expected_path, home_path.ptr));
cl_git_pass(git_config_get_path(&path, cfg, "some.path"));
cl_assert_equal_s(expected_path.ptr, path.ptr);
- git_buf_free(&path);
+ git_buf_dispose(&path);
cl_git_mkfile("./testconfig", "[some]\n path = ~user/foo");
cl_git_fail(git_config_get_path(&path, cfg, "some.path"));
cl_git_pass(git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, old_path.ptr));
- git_buf_free(&old_path);
- git_buf_free(&home_path);
- git_buf_free(&expected_path);
+ git_buf_dispose(&old_path);
+ git_buf_dispose(&home_path);
+ git_buf_dispose(&expected_path);
git_config_free(cfg);
}
cl_assert_equal_s(buf.ptr, "value");
git_config_free(cfg);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_config_read__trailing_crlf(void)
cl_assert_equal_s(buf.ptr, "value");
git_config_free(cfg);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_config_read__bom(void)
cl_assert_equal_s(buf.ptr, "value");
git_config_free(cfg);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
+}
+
+void test_config_read__single_line(void)
+{
+ git_buf buf = GIT_BUF_INIT;
+ git_config *cfg;
+
+ cl_set_cleanup(&clean_test_config, NULL);
+ cl_git_mkfile("./testconfig", "[some] var = value\n[some \"OtheR\"] var = value");
+ cl_git_pass(git_config_open_ondisk(&cfg, "./testconfig"));
+ cl_git_pass(git_config_get_string_buf(&buf, cfg, "some.var"));
+ cl_assert_equal_s(buf.ptr, "value");
+
+ git_buf_clear(&buf);
+ cl_git_pass(git_config_get_string_buf(&buf, cfg, "some.OtheR.var"));
+ cl_assert_equal_s(buf.ptr, "value");
+
+ git_config_free(cfg);
+ cl_git_mkfile("./testconfig", "[some] var = value\n[some \"OtheR\"]var = value");
+ cl_git_pass(git_config_open_ondisk(&cfg, "./testconfig"));
+ git_buf_clear(&buf);
+ cl_git_pass(git_config_get_string_buf(&buf, cfg, "some.var"));
+ cl_assert_equal_s(buf.ptr, "value");
+
+ git_buf_clear(&buf);
+ cl_git_pass(git_config_get_string_buf(&buf, cfg, "some.OtheR.var"));
+ cl_assert_equal_s(buf.ptr, "value");
+
+ git_config_free(cfg);
+ git_buf_dispose(&buf);
}
static int read_nosection_cb(const git_config_entry *entry, void *payload) {
cl_git_pass(git_config_foreach(cfg, read_nosection_cb, &seen));
cl_assert_equal_i(seen, 1);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_config_free(cfg);
}
#include "clar_libgit2.h"
-#include "config_file.h"
+#include "config_backend.h"
#include "config.h"
#include "path.h"
{
git_config_backend *backend;
- cl_git_pass(git_config_file__ondisk(&backend, "global"));
+ cl_git_pass(git_config_backend_from_file(&backend, "global"));
backend->readonly = 1;
cl_git_pass(git_config_add_backend(cfg, backend, GIT_CONFIG_LEVEL_GLOBAL, NULL, 0));
{
git_config_backend *backend;
- cl_git_pass(git_config_file__ondisk(&backend, "global"));
+ cl_git_pass(git_config_backend_from_file(&backend, "global"));
backend->readonly = 1;
cl_git_pass(git_config_add_backend(cfg, backend, GIT_CONFIG_LEVEL_GLOBAL, NULL, 0));
- cl_git_pass(git_config_file__ondisk(&backend, "local"));
+ cl_git_pass(git_config_backend_from_file(&backend, "local"));
cl_git_pass(git_config_add_backend(cfg, backend, GIT_CONFIG_LEVEL_LOCAL, NULL, 0));
cl_git_pass(git_config_set_string(cfg, "foo.bar", "baz"));
{
git_config_backend *backend;
- cl_git_pass(git_config_file__ondisk(&backend, "local"));
+ cl_git_pass(git_config_backend_from_file(&backend, "local"));
backend->readonly = 1;
cl_git_pass(git_config_add_backend(cfg, backend, GIT_CONFIG_LEVEL_LOCAL, NULL, 0));
- cl_git_pass(git_config_file__ondisk(&backend, "global"));
+ cl_git_pass(git_config_backend_from_file(&backend, "global"));
cl_git_pass(git_config_add_backend(cfg, backend, GIT_CONFIG_LEVEL_GLOBAL, NULL, 0));
cl_git_pass(git_config_set_string(cfg, "foo.bar", "baz"));
/* so, we don't currently prevent overwrite... */
/* {
const git_error *err;
- cl_assert((err = giterr_last()) != NULL);
+ cl_assert((err = git_error_last()) != NULL);
cl_assert(err->message != NULL);
} */
}
void test_config_stress__cleanup(void)
{
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
p_unlink(TEST_CONFIG);
}
#include "buffer.h"
#include "fileops.h"
#include "git2/sys/config.h"
-#include "config_file.h"
#include "config.h"
void test_config_write__initialize(void)
cl_git_pass(git_config_get_string_buf(&buf, cfg, "my.own.var"));
cl_assert_equal_s("works", git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_config_free(cfg);
}
cl_git_pass(git_config_open_ondisk(&cfg, "config9"));
cl_git_pass(git_config_get_string_buf(&buf, cfg, "core.somevar"));
cl_assert_equal_s("this also \"has\" quotes", git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_config_free(cfg);
}
cl_git_pass(git_config_open_ondisk(&cfg, "config9"));
cl_git_pass(git_config_get_string_buf(&buf, cfg, "core.somevar"));
cl_assert_equal_s("this \"has\" quotes and \t", git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_config_free(cfg);
}
int64_t l, expected = +9223372036854775803;
git_buf buf = GIT_BUF_INIT;
- // open config15 as global level config file
+ /* open config15 as global level config file */
cl_git_pass(git_config_new(&cfg));
cl_git_pass(git_config_add_file_ondisk(cfg, "config9",
GIT_CONFIG_LEVEL_LOCAL, NULL, 0));
git_config_free(cfg_specific);
git_config_free(cfg);
- // open config15 as local level config file
+ /* open config15 as local level config file */
cl_git_pass(git_config_open_ondisk(&cfg, "config15"));
cl_git_pass(git_config_get_int32(&i, cfg, "core.int32global"));
cl_git_pass(git_config_get_string_buf(&buf, cfg, "core.stringglobal"));
cl_assert_equal_s("I'm a global config value!", git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_config_free(cfg);
}
cl_git_pass(git_config_get_string_buf(&buf, config, "core.somevar"));
cl_assert_equal_s("", buf.ptr);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_config_free(config);
cl_git_sandbox_cleanup();
}
cl_assert_equal_s("[newsection]\n\tnewname = new_value\n", n);
- git_buf_free(&newfile);
+ git_buf_dispose(&newfile);
git_config_free(cfg);
}
cl_git_pass(git_futils_readbuffer(&newfile, file_name));
cl_assert_equal_s("[section \"foo\"]\n\tname\n\tother = otherval\n[newsection]\n\tnewname = new_value\n", newfile.ptr);
- git_buf_free(&newfile);
+ git_buf_dispose(&newfile);
git_config_free(cfg);
}
cl_git_pass(git_futils_readbuffer(&result, "config-file"));
cl_assert_equal_s("[section]\n\tname = value\n", result.ptr);
- git_buf_free(&result);
+ git_buf_dispose(&result);
}
void test_config_write__to_file_with_only_comment(void)
cl_git_pass(git_futils_readbuffer(&result, "config-file"));
cl_assert_equal_s("\n\n[section]\n\tname = value\n", result.ptr);
- git_buf_free(&result);
+ git_buf_dispose(&result);
}
void test_config_write__locking(void)
cl_git_pass(git_futils_readbuffer(&result, filename));
cl_assert_equal_s(expected, result.ptr);
- git_buf_free(&result);
+ git_buf_dispose(&result);
git_config_free(cfg);
}
cl_git_pass(git_futils_readbuffer(&result, filename));
cl_assert_equal_s(expected, result.ptr);
- git_buf_free(&result);
+ git_buf_dispose(&result);
git_config_free(cfg);
}
cl_assert(git_buf_oom(&buf) == 0);
cl_assert_equal_s(test_string_x2, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
/* test git_buf_printf */
cl_assert(git_buf_oom(&buf) == 0);
cl_assert_equal_s("shoop da 23 woop 42", git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
/* more thorough test of concatenation options */
cl_assert(buf.size == 0);
/* this must be safe to do */
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
cl_assert(buf.size == 0);
cl_assert(buf.asize == 0);
/* cl_assert(buf.asize == 0); -- should not assume what git_buf does */
/* free should set us back to the beginning */
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
cl_assert(buf.size == 0);
cl_assert(buf.asize == 0);
}
cl_assert_equal_s("++++++++++++++++++", git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
/* add data */
git_buf_put(&buf, "xo", 2);
cl_assert_equal_s("xoxoxoxoxoxoxoxoxoxoxoxoxoxoxoxoxoxo",
git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
/* set to string */
git_buf_sets(&buf, test_string);
git_buf_clear(&buf);
cl_assert_equal_s("", git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
/* test extracting data into buffer */
git_buf_puts(&buf, REP4("0123456789"));
cl_assert_equal_s(REP4(REP16("x")) REP16("x") REP16("x")
REP16("x") "xxxxxxxxxxxxxxx", data);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_buf_copy_cstr(data, sizeof(data), &buf);
cl_assert_equal_s("", data);
cl_assert(git_buf_oom(&buf) == 0);
cl_assert_equal_s(test_4096, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
/* let's try some producer/consumer tests */
git_buf_consume(&buf, buf.ptr + buf.size);
cl_assert_equal_s("", git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
if (expected_asize > 0)
cl_assert(tgt.asize == expected_asize);
- git_buf_free(&tgt);
+ git_buf_dispose(&tgt);
}
static void
cl_assert(git_buf_oom(&buf) == 0);
cl_assert_equal_s(expected_abcabc, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
/* more variations on append tests */
cl_assert_equal_s("bar", git_buf_cstr(&a));
cl_assert_equal_s("foo", git_buf_cstr(&b));
- git_buf_free(&a);
- git_buf_free(&b);
+ git_buf_dispose(&a);
+ git_buf_dispose(&b);
}
cl_assert_equal_s(NULL, b);
cl_assert_equal_s("", a.ptr);
- git_buf_free(&a);
+ git_buf_dispose(&a);
b = git__strdup(fun);
git_buf_attach(&a, b, 0);
cl_assert(a.size == strlen(fun));
cl_assert(a.asize == strlen(fun) + 1);
- git_buf_free(&a);
+ git_buf_dispose(&a);
b = git__strdup(fun);
git_buf_attach(&a, b, strlen(fun) + 1);
cl_assert(a.size == strlen(fun));
cl_assert(a.asize == strlen(fun) + 1);
- git_buf_free(&a);
+ git_buf_dispose(&a);
}
git_buf_join(&buf, sep, a, b);
cl_assert(git_buf_oom(&buf) == 0);
cl_assert_equal_s(expected, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
static void
git_buf_join(&buf, sep, buf.ptr + ofs_a, b);
cl_assert(git_buf_oom(&buf) == 0);
cl_assert_equal_s(expected, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
static void
cl_assert(git_buf_oom(&buf) == 0);
cl_assert_equal_s(expected, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
static void
git_buf_join_n(&buf, sep, 4, a, b, c, d);
cl_assert(git_buf_oom(&buf) == 0);
cl_assert_equal_s(expected, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
/* test join */
cl_assert(git_buf_oom(&a) == 0);
cl_assert_equal_s("foo/bar/baz", git_buf_cstr(&a));
- git_buf_free(&a);
+ git_buf_dispose(&a);
check_joinbuf_2(NULL, "", "");
check_joinbuf_2(NULL, "a", "a");
}
}
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_core_buffer__10(void)
cl_git_pass(git_buf_join_n(&a, '/', 2, a.ptr, "more"));
cl_assert_equal_s(a.ptr, "test/string/join/test/string/join/more");
- git_buf_free(&a);
+ git_buf_dispose(&a);
}
void test_core_buffer__join3(void)
cl_git_pass(git_buf_join3(&a, '/', "string/", "", "/join"));
cl_assert_equal_s("string/join", a.ptr);
- git_buf_free(&a);
+ git_buf_dispose(&a);
}
void test_core_buffer__11(void)
cl_git_pass(git_buf_text_common_prefix(&a, &t));
cl_assert_equal_s(a.ptr, "");
- git_buf_free(&a);
+ git_buf_dispose(&a);
}
void test_core_buffer__rfind_variants(void)
cl_assert(git_buf_rfind(&a, 'q') == -1);
cl_assert(git_buf_rfind_next(&a, 'q') == -1);
- git_buf_free(&a);
+ git_buf_dispose(&a);
}
void test_core_buffer__puts_escaped(void)
cl_git_pass(git_buf_text_puts_escape_regex(&a, "^match\\s*[A-Z]+.*"));
cl_assert_equal_s("\\^match\\\\s\\*\\[A-Z\\]\\+\\.\\*", a.ptr);
- git_buf_free(&a);
+ git_buf_dispose(&a);
}
static void assert_unescape(char *expected, char *to_unescape) {
cl_assert_equal_s(expected, buf.ptr);
cl_assert_equal_sz(strlen(expected), buf.size);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_core_buffer__unescape(void)
cl_git_pass(git_buf_encode_base64(&buf, "this!\n", 6));
cl_assert_equal_s("dGhpcyEK", buf.ptr);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_core_buffer__decode_base64(void)
cl_git_fail(git_buf_decode_base64(&buf, "This is not a valid base64 string!!!", 36));
cl_assert_equal_s("this!\n", buf.ptr);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_core_buffer__encode_base85(void)
cl_assert_equal_s("bZBXFAZc?TVqtS-AUHK3Wo~0{WMyOk", buf.ptr);
git_buf_clear(&buf);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_core_buffer__decode_base85(void)
cl_assert_equal_s("this is base 85 encoded", buf.ptr);
git_buf_clear(&buf);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_core_buffer__decode_base85_fails_gracefully(void)
cl_assert_equal_sz(6, buf.size);
cl_assert_equal_s("foobar", buf.ptr);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_core_buffer__classify_with_utf8(void)
git_hashsig_free(a);
git_hashsig_free(b);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_futils_rmdir_r("scratch", NULL, GIT_RMDIR_REMOVE_FILES);
}
}
}
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
#include "../filter/crlf.h"
cl_git_pass(git_buf_text_crlf_to_lf(&tgt, &src));
check_buf("\rcr\r", tgt);
- git_buf_free(&src);
- git_buf_free(&tgt);
+ git_buf_dispose(&src);
+ git_buf_dispose(&tgt);
/* blob correspondence tests */
git_buf_sets(&src, ALL_CRLF_TEXT_RAW);
cl_git_pass(git_buf_text_crlf_to_lf(&tgt, &src));
check_buf(ALL_CRLF_TEXT_AS_LF, tgt);
- git_buf_free(&src);
- git_buf_free(&tgt);
+ git_buf_dispose(&src);
+ git_buf_dispose(&tgt);
git_buf_sets(&src, ALL_LF_TEXT_RAW);
cl_git_pass(git_buf_text_lf_to_crlf(&tgt, &src));
git_buf_sets(&src, ALL_LF_TEXT_RAW);
cl_git_pass(git_buf_text_crlf_to_lf(&tgt, &src));
check_buf(ALL_LF_TEXT_AS_LF, tgt);
- git_buf_free(&src);
- git_buf_free(&tgt);
+ git_buf_dispose(&src);
+ git_buf_dispose(&tgt);
git_buf_sets(&src, MORE_CRLF_TEXT_RAW);
cl_git_pass(git_buf_text_lf_to_crlf(&tgt, &src));
git_buf_sets(&src, MORE_CRLF_TEXT_RAW);
cl_git_pass(git_buf_text_crlf_to_lf(&tgt, &src));
check_buf(MORE_CRLF_TEXT_AS_LF, tgt);
- git_buf_free(&src);
- git_buf_free(&tgt);
+ git_buf_dispose(&src);
+ git_buf_dispose(&tgt);
git_buf_sets(&src, MORE_LF_TEXT_RAW);
cl_git_pass(git_buf_text_lf_to_crlf(&tgt, &src));
git_buf_sets(&src, MORE_LF_TEXT_RAW);
cl_git_pass(git_buf_text_crlf_to_lf(&tgt, &src));
check_buf(MORE_LF_TEXT_AS_LF, tgt);
- git_buf_free(&src);
- git_buf_free(&tgt);
+ git_buf_dispose(&src);
+ git_buf_dispose(&tgt);
}
void test_core_buffer__dont_grow_borrowed(void)
cl_must_pass(p_rmdir(top_dir));
- git_buf_free(&d->path);
+ git_buf_dispose(&d->path);
}
static void check_counts(walk_data *d)
(void)p_rmdir(*val);
}
- git_buf_free(&path);
- git_buf_free(&found);
+ git_buf_dispose(&path);
+ git_buf_dispose(&found);
}
GIT_ENOTFOUND, git_sysdir_find_system_file(&path, "nonexistentfile"));
#endif
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
static void check_global_searchpath(
cl_assert_equal_i(
GIT_ENOTFOUND, git_sysdir_find_global_file(temp, file));
- git_buf_free(&out);
+ git_buf_dispose(&out);
}
void test_core_env__2(void)
(void)p_rmdir(*val);
}
- git_buf_free(&path);
- git_buf_free(&found);
+ git_buf_dispose(&path);
+ git_buf_dispose(&found);
}
void test_core_env__substitution(void)
cl_git_pass(git_buf_join(&expected, GIT_PATH_LIST_SEPARATOR, "/tmp/a", "/tmp/b"));
cl_assert_equal_s(expected.ptr, buf.ptr);
- git_buf_free(&expected);
- git_buf_free(&buf);
+ git_buf_dispose(&expected);
+ git_buf_dispose(&buf);
}
{
char *str_in_error;
- giterr_clear();
- cl_assert(giterr_last() == NULL);
+ git_error_clear();
+ cl_assert(git_error_last() == NULL);
- giterr_set_oom();
+ git_error_set_oom();
- cl_assert(giterr_last() != NULL);
- cl_assert(giterr_last()->klass == GITERR_NOMEMORY);
- str_in_error = strstr(giterr_last()->message, "memory");
+ cl_assert(git_error_last() != NULL);
+ cl_assert(git_error_last()->klass == GIT_ERROR_NOMEMORY);
+ str_in_error = strstr(git_error_last()->message, "memory");
cl_assert(str_in_error != NULL);
- giterr_clear();
+ git_error_clear();
- giterr_set_str(GITERR_REPOSITORY, "This is a test");
+ git_error_set_str(GIT_ERROR_REPOSITORY, "This is a test");
- cl_assert(giterr_last() != NULL);
- str_in_error = strstr(giterr_last()->message, "This is a test");
+ cl_assert(git_error_last() != NULL);
+ str_in_error = strstr(git_error_last()->message, "This is a test");
cl_assert(str_in_error != NULL);
- giterr_clear();
- cl_assert(giterr_last() == NULL);
+ git_error_clear();
+ cl_assert(git_error_last() == NULL);
}
#include "common.h"
{
char *str_in_error;
- giterr_clear();
- cl_assert(giterr_last() == NULL);
+ git_error_clear();
+ cl_assert(git_error_last() == NULL);
- giterr_set_oom(); /* internal fn */
+ git_error_set_oom(); /* internal fn */
- cl_assert(giterr_last() != NULL);
- cl_assert(giterr_last()->klass == GITERR_NOMEMORY);
- str_in_error = strstr(giterr_last()->message, "memory");
+ cl_assert(git_error_last() != NULL);
+ cl_assert(git_error_last()->klass == GIT_ERROR_NOMEMORY);
+ str_in_error = strstr(git_error_last()->message, "memory");
cl_assert(str_in_error != NULL);
- giterr_clear();
+ git_error_clear();
- giterr_set(GITERR_REPOSITORY, "This is a test"); /* internal fn */
+ git_error_set(GIT_ERROR_REPOSITORY, "This is a test"); /* internal fn */
- cl_assert(giterr_last() != NULL);
- str_in_error = strstr(giterr_last()->message, "This is a test");
+ cl_assert(git_error_last() != NULL);
+ str_in_error = strstr(git_error_last()->message, "This is a test");
cl_assert(str_in_error != NULL);
- giterr_clear();
- cl_assert(giterr_last() == NULL);
+ git_error_clear();
+ cl_assert(git_error_last() == NULL);
do {
struct stat st;
cl_assert(p_lstat("this_file_does_not_exist", &st) < 0);
GIT_UNUSED(st);
} while (false);
- giterr_set(GITERR_OS, "stat failed"); /* internal fn */
+ git_error_set(GIT_ERROR_OS, "stat failed"); /* internal fn */
- cl_assert(giterr_last() != NULL);
- str_in_error = strstr(giterr_last()->message, "stat failed");
+ cl_assert(git_error_last() != NULL);
+ str_in_error = strstr(git_error_last()->message, "stat failed");
cl_assert(str_in_error != NULL);
cl_assert(git__prefixcmp(str_in_error, "stat failed: ") == 0);
cl_assert(strlen(str_in_error) > strlen("stat failed: "));
#ifdef GIT_WIN32
- giterr_clear();
+ git_error_clear();
/* The MSDN docs use this to generate a sample error */
cl_assert(GetProcessId(NULL) == 0);
- giterr_set(GITERR_OS, "GetProcessId failed"); /* internal fn */
+ git_error_set(GIT_ERROR_OS, "GetProcessId failed"); /* internal fn */
- cl_assert(giterr_last() != NULL);
- str_in_error = strstr(giterr_last()->message, "GetProcessId failed");
+ cl_assert(git_error_last() != NULL);
+ str_in_error = strstr(git_error_last()->message, "GetProcessId failed");
cl_assert(str_in_error != NULL);
cl_assert(git__prefixcmp(str_in_error, "GetProcessId failed: ") == 0);
cl_assert(strlen(str_in_error) > strlen("GetProcessId failed: "));
#endif
- giterr_clear();
+ git_error_clear();
}
void test_core_errors__restore(void)
{
git_error_state err_state = {0};
- giterr_clear();
- cl_assert(giterr_last() == NULL);
+ git_error_clear();
+ cl_assert(git_error_last() == NULL);
- cl_assert_equal_i(0, giterr_state_capture(&err_state, 0));
+ cl_assert_equal_i(0, git_error_state_capture(&err_state, 0));
memset(&err_state, 0x0, sizeof(git_error_state));
- giterr_set(42, "Foo: %s", "bar");
- cl_assert_equal_i(-1, giterr_state_capture(&err_state, -1));
+ git_error_set(42, "Foo: %s", "bar");
+ cl_assert_equal_i(-1, git_error_state_capture(&err_state, -1));
- cl_assert(giterr_last() == NULL);
+ cl_assert(git_error_last() == NULL);
- giterr_set(99, "Bar: %s", "foo");
+ git_error_set(99, "Bar: %s", "foo");
- giterr_state_restore(&err_state);
+ git_error_state_restore(&err_state);
- cl_assert_equal_i(42, giterr_last()->klass);
- cl_assert_equal_s("Foo: bar", giterr_last()->message);
+ cl_assert_equal_i(42, git_error_last()->klass);
+ cl_assert_equal_s("Foo: bar", git_error_last()->message);
}
void test_core_errors__free_state(void)
{
git_error_state err_state = {0};
- giterr_clear();
+ git_error_clear();
- giterr_set(42, "Foo: %s", "bar");
- cl_assert_equal_i(-1, giterr_state_capture(&err_state, -1));
+ git_error_set(42, "Foo: %s", "bar");
+ cl_assert_equal_i(-1, git_error_state_capture(&err_state, -1));
- giterr_set(99, "Bar: %s", "foo");
+ git_error_set(99, "Bar: %s", "foo");
- giterr_state_free(&err_state);
+ git_error_state_free(&err_state);
- cl_assert_equal_i(99, giterr_last()->klass);
- cl_assert_equal_s("Bar: foo", giterr_last()->message);
+ cl_assert_equal_i(99, git_error_last()->klass);
+ cl_assert_equal_s("Bar: foo", git_error_last()->message);
- giterr_state_restore(&err_state);
+ git_error_state_restore(&err_state);
- cl_assert(giterr_last() == NULL);
+ cl_assert(git_error_last() == NULL);
}
void test_core_errors__restore_oom(void)
git_error_state err_state = {0};
const git_error *oom_error = NULL;
- giterr_clear();
+ git_error_clear();
- giterr_set_oom(); /* internal fn */
- oom_error = giterr_last();
+ git_error_set_oom(); /* internal fn */
+ oom_error = git_error_last();
cl_assert(oom_error);
- cl_assert_equal_i(-1, giterr_state_capture(&err_state, -1));
+ cl_assert_equal_i(-1, git_error_state_capture(&err_state, -1));
- cl_assert(giterr_last() == NULL);
- cl_assert_equal_i(GITERR_NOMEMORY, err_state.error_msg.klass);
+ cl_assert(git_error_last() == NULL);
+ cl_assert_equal_i(GIT_ERROR_NOMEMORY, err_state.error_msg.klass);
cl_assert_equal_s("Out of memory", err_state.error_msg.message);
- giterr_state_restore(&err_state);
+ git_error_state_restore(&err_state);
- cl_assert(giterr_last()->klass == GITERR_NOMEMORY);
- cl_assert_(giterr_last() == oom_error, "static oom error not restored");
+ cl_assert(git_error_last()->klass == GIT_ERROR_NOMEMORY);
+ cl_assert_(git_error_last() == oom_error, "static oom error not restored");
- giterr_clear();
+ git_error_clear();
}
static int test_arraysize_multiply(size_t nelem, size_t size)
{
size_t out;
- GITERR_CHECK_ALLOC_MULTIPLY(&out, nelem, size);
+ GIT_ERROR_CHECK_ALLOC_MULTIPLY(&out, nelem, size);
return 0;
}
cl_git_fail(test_arraysize_multiply(SIZE_MAX-1, sizeof(void *)));
cl_git_fail(test_arraysize_multiply((SIZE_MAX/sizeof(void *))+1, sizeof(void *)));
- cl_assert_equal_i(GITERR_NOMEMORY, giterr_last()->klass);
- cl_assert_equal_s("Out of memory", giterr_last()->message);
+ cl_assert_equal_i(GIT_ERROR_NOMEMORY, git_error_last()->klass);
+ cl_assert_equal_s("Out of memory", git_error_last()->message);
}
static int test_arraysize_add(size_t one, size_t two)
{
size_t out;
- GITERR_CHECK_ALLOC_ADD(&out, one, two);
+ GIT_ERROR_CHECK_ALLOC_ADD(&out, one, two);
return 0;
}
cl_git_fail(test_arraysize_multiply(SIZE_MAX-1, 2));
cl_git_fail(test_arraysize_multiply(SIZE_MAX, SIZE_MAX));
- cl_assert_equal_i(GITERR_NOMEMORY, giterr_last()->klass);
- cl_assert_equal_s("Out of memory", giterr_last()->message);
+ cl_assert_equal_i(GIT_ERROR_NOMEMORY, git_error_last()->klass);
+ cl_assert_equal_s("Out of memory", git_error_last()->message);
}
void test_core_errors__integer_overflow_sets_oom(void)
{
size_t out;
- giterr_clear();
+ git_error_clear();
cl_assert(!GIT_ADD_SIZET_OVERFLOW(&out, SIZE_MAX-1, 1));
- cl_assert_equal_p(NULL, giterr_last());
+ cl_assert_equal_p(NULL, git_error_last());
- giterr_clear();
+ git_error_clear();
cl_assert(!GIT_ADD_SIZET_OVERFLOW(&out, 42, 69));
- cl_assert_equal_p(NULL, giterr_last());
+ cl_assert_equal_p(NULL, git_error_last());
- giterr_clear();
+ git_error_clear();
cl_assert(GIT_ADD_SIZET_OVERFLOW(&out, SIZE_MAX, SIZE_MAX));
- cl_assert_equal_i(GITERR_NOMEMORY, giterr_last()->klass);
- cl_assert_equal_s("Out of memory", giterr_last()->message);
+ cl_assert_equal_i(GIT_ERROR_NOMEMORY, git_error_last()->klass);
+ cl_assert_equal_s("Out of memory", git_error_last()->message);
- giterr_clear();
+ git_error_clear();
cl_assert(GIT_ADD_SIZET_OVERFLOW(&out, SIZE_MAX, SIZE_MAX));
- cl_assert_equal_i(GITERR_NOMEMORY, giterr_last()->klass);
- cl_assert_equal_s("Out of memory", giterr_last()->message);
+ cl_assert_equal_i(GIT_ERROR_NOMEMORY, git_error_last()->klass);
+ cl_assert_equal_s("Out of memory", git_error_last()->message);
}
int fd;
char test[] = "test", testlock[] = "test.lock";
- fd = p_creat(testlock, 0744); //-V536
+ fd = p_creat(testlock, 0744); /* -V536 */
cl_must_pass(fd);
cl_must_pass(p_close(fd));
cl_assert_equal_i(true, git_path_exists("linkdir/target"));
git_filebuf_cleanup(&file);
- git_buf_free(&source);
- git_buf_free(&target);
+ git_buf_dispose(&source);
+ git_buf_dispose(&target);
cl_git_pass(git_futils_rmdir_r("linkdir", NULL, GIT_RMDIR_REMOVE_FILES));
}
#include "clar_libgit2.h"
#include "fileops.h"
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_core_futils__initialize(void)
{
cl_must_pass(p_mkdir("futils", 0777));
cl_assert_equal_file(out.ptr, out.size, "futils/test-file");
- git_buf_free(&out);
- git_buf_free(&append);
+ git_buf_dispose(&out);
+ git_buf_dispose(&append);
}
void test_core_futils__write_hidden_file(void)
cl_git_pass(git_win32__hidden(&hidden, "futils/test-file"));
cl_assert(hidden);
- git_buf_free(&out);
- git_buf_free(&append);
+ git_buf_dispose(&out);
+ git_buf_dispose(&append);
#endif
}
CloseHandle(handle);
LocalFree(reparse_buf);
- git_buf_free(&unparsed_buf);
+ git_buf_dispose(&unparsed_buf);
}
static void do_custom_reparse(const char *path)
cl_assert(S_ISLNK(st.st_mode));
cl_assert_equal_i(git_buf_len(&target_path), st.st_size);
- git_buf_free(&target_path);
+ git_buf_dispose(&target_path);
}
void test_core_link__lstat_symlink_directory(void)
cl_assert(S_ISLNK(st.st_mode));
cl_assert_equal_i(git_buf_len(&target_path), st.st_size);
- git_buf_free(&target_path);
+ git_buf_dispose(&target_path);
}
void test_core_link__lstat_dangling_symlink(void)
cl_must_pass(p_stat("stat_junction", &st));
cl_assert(S_ISDIR(st.st_mode));
- git_buf_free(&target_path);
+ git_buf_dispose(&target_path);
#endif
}
cl_must_fail(p_stat("stat_nonexistent_junctarget", &st));
cl_must_fail(p_stat("stat_dangling_junction", &st));
- git_buf_free(&target_path);
+ git_buf_dispose(&target_path);
#endif
}
cl_must_pass(p_lstat("lstat_junction", &st));
cl_assert(S_ISLNK(st.st_mode));
- git_buf_free(&target_path);
+ git_buf_dispose(&target_path);
#endif
}
cl_assert(S_ISLNK(st.st_mode));
cl_assert_equal_i(git_buf_len(&target_path), st.st_size);
- git_buf_free(&target_path);
+ git_buf_dispose(&target_path);
#endif
}
cl_assert_equal_s(git_buf_cstr(&target_path), buf);
- git_buf_free(&target_path);
+ git_buf_dispose(&target_path);
}
void test_core_link__readlink_dangling(void)
cl_assert_equal_s(git_buf_cstr(&target_path), buf);
- git_buf_free(&target_path);
+ git_buf_dispose(&target_path);
}
void test_core_link__readlink_multiple(void)
cl_assert_equal_s(git_buf_cstr(&path2), buf);
- git_buf_free(&path1);
- git_buf_free(&path2);
- git_buf_free(&path3);
- git_buf_free(&target_path);
+ git_buf_dispose(&path1);
+ git_buf_dispose(&path2);
+ git_buf_dispose(&path3);
+ git_buf_dispose(&target_path);
}
cl_git_fail(git_futils_mkdir(path.ptr, 0755, 0));
cl_assert(!git_path_isdir(path.ptr));
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
void test_core_mkdir__basic(void)
cl_assert(git_path_isdir("d2/other/dir"));
cl_assert(git_path_isdir("d0/other/dir"));
- git_buf_free(&path);
+ git_buf_dispose(&path);
#endif
}
cl_assert(map != NULL);
for (i = 0; i < NITEMS; ++i) {
- khiter_t pos;
+ size_t pos;
int ret;
pos = git_oidmap_lookup_index(map, &items[i].oid);
for (i = 0; i < NITEMS; ++i) {
- khiter_t pos;
+ size_t pos;
pos = git_oidmap_lookup_index(map, &items[i].oid);
cl_assert(git_oidmap_valid_index(map, pos));
cl_assert(map != NULL);
for (i = 0; i < NITEMS; ++i) {
- khiter_t pos;
+ size_t pos;
int ret;
pos = git_oidmap_lookup_index(map, &items[i].oid);
for (i = 0; i < NITEMS; ++i) {
- khiter_t pos;
+ size_t pos;
pos = git_oidmap_lookup_index(map, &items[i].oid);
cl_assert(git_oidmap_valid_index(map, pos));
cl_assert(git_path_dirname_r(&dir, A) >= 0);
cl_assert_equal_s(B, dir.ptr);
- git_buf_free(&dir);
+ git_buf_dispose(&dir);
cl_assert((dir2 = git_path_dirname(A)) != NULL);
cl_assert_equal_s(B, dir2);
cl_assert(git_path_basename_r(&base, A) >= 0);
cl_assert_equal_s(B, base.ptr);
- git_buf_free(&base);
+ git_buf_dispose(&base);
cl_assert((base2 = git_path_basename(A)) != NULL);
cl_assert_equal_s(B, base2);
cl_git_pass(git_buf_joinpath(&joined_path, path_a, path_b));
cl_assert_equal_s(expected_path, joined_path.ptr);
- git_buf_free(&joined_path);
+ git_buf_dispose(&joined_path);
}
static void
path_a, path_b, path_c, path_d));
cl_assert_equal_s(expected_path, joined_path.ptr);
- git_buf_free(&joined_path);
+ git_buf_dispose(&joined_path);
}
cl_git_pass(git_path_to_dir(&tgt));
cl_assert_equal_s(expected, tgt.ptr);
- git_buf_free(&tgt);
+ git_buf_dispose(&tgt);
}
static void
cl_assert_equal_s(path.ptr, "/foo/this is a new string/grow the buffer, grow the buffer, grow the buffer");
cl_assert(asize < path.asize);
- git_buf_free(&path);
+ git_buf_dispose(&path);
cl_git_pass(git_buf_sets(&path, "/foo/bar"));
cl_git_pass(git_buf_joinpath(&path, path.ptr + 4, "baz"));
cl_assert_equal_s(path.ptr, "/baz/somethinglongenoughtorealloc");
cl_assert(asize < path.asize);
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
static void check_percent_decoding(const char *expected_result, const char *input)
cl_git_pass(git__percent_decode(&buf, input));
cl_assert_equal_s(expected_result, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_core_path__09_percent_decode(void)
} else
cl_git_fail(git_path_fromurl(&buf, input));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
#ifdef GIT_WIN32
i = info.expect_idx;
}
- git_buf_free(&p);
+ git_buf_dispose(&p);
}
void test_core_path__11a_walkup_cancel(void)
while (expect[i] != NULL) i++;
}
- git_buf_free(&p);
+ git_buf_dispose(&p);
}
void test_core_path__12_offset_to_path_root(void)
cl_assert_equal_i(GIT_ENOTFOUND, git_path_prettify(&p, NON_EXISTING_FILEPATH, NULL));
cl_assert_equal_i(GIT_ENOTFOUND, git_path_prettify(&p, NON_EXISTING_FILEPATH "/so-do-i", NULL));
- git_buf_free(&p);
+ git_buf_dispose(&p);
}
void test_core_path__14_apply_relative(void)
cl_git_pass(git_path_apply_relative(&p, "../there"));
cl_assert_equal_s("../../there", p.ptr);
- git_buf_free(&p);
+ git_buf_dispose(&p);
}
static void assert_resolve_relative(
assert_resolve_relative(&buf, "/", "//a/b/../..");
#endif
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
#define assert_common_dirlen(i, p, q) \
assert_common_dirlen(6, "a/b/c/foo.txt", "a/b/c/d/e/bar.txt");
assert_common_dirlen(7, "/a/b/c/foo.txt", "/a/b/c/d/e/bar.txt");
}
+
+void test_core_path__git_path_is_file(void)
+{
+ cl_git_fail(git_path_is_gitfile("blob", 4, -1, GIT_PATH_FS_HFS));
+ cl_git_pass(git_path_is_gitfile("blob", 4, GIT_PATH_GITFILE_GITIGNORE, GIT_PATH_FS_HFS));
+ cl_git_pass(git_path_is_gitfile("blob", 4, GIT_PATH_GITFILE_GITMODULES, GIT_PATH_FS_HFS));
+ cl_git_pass(git_path_is_gitfile("blob", 4, GIT_PATH_GITFILE_GITATTRIBUTES, GIT_PATH_FS_HFS));
+ cl_git_fail(git_path_is_gitfile("blob", 4, 3, GIT_PATH_FS_HFS));
+}
cl_git_pass(git_buf_joinpath(&path, empty_tmp_dir, "/two"));
cl_must_pass(p_mkdir(path.ptr, 0777));
- git_buf_free(&path);
+ git_buf_dispose(&path);
+}
+
+void test_core_rmdir__cleanup(void)
+{
+ if (git_path_exists(empty_tmp_dir))
+ cl_git_pass(git_futils_rmdir_r(empty_tmp_dir, NULL, GIT_RMDIR_REMOVE_FILES));
}
/* make sure empty dir can be deleted recusively */
void test_core_rmdir__delete_recursive(void)
{
+ git_buf path = GIT_BUF_INIT;
+ cl_git_pass(git_buf_joinpath(&path, empty_tmp_dir, "/one"));
+ cl_assert(git_path_exists(git_buf_cstr(&path)));
+
cl_git_pass(git_futils_rmdir_r(empty_tmp_dir, NULL, GIT_RMDIR_EMPTY_HIERARCHY));
+
+ cl_assert(!git_path_exists(git_buf_cstr(&path)));
+
+ git_buf_dispose(&path);
}
/* make sure non-empty dir cannot be deleted recusively */
cl_must_pass(p_unlink(file.ptr));
cl_git_pass(git_futils_rmdir_r(empty_tmp_dir, NULL, GIT_RMDIR_EMPTY_HIERARCHY));
- git_buf_free(&file);
+ cl_assert(!git_path_exists(empty_tmp_dir));
+
+ git_buf_dispose(&file);
+}
+
+void test_core_rmdir__keep_base(void)
+{
+ cl_git_pass(git_futils_rmdir_r(empty_tmp_dir, NULL, GIT_RMDIR_SKIP_ROOT));
+ cl_assert(git_path_exists(empty_tmp_dir));
}
void test_core_rmdir__can_skip_non_empty_dir(void)
cl_git_pass(git_futils_rmdir_r(empty_tmp_dir, NULL, GIT_RMDIR_REMOVE_FILES));
cl_assert(git_path_exists(empty_tmp_dir) == false);
- git_buf_free(&file);
+ git_buf_dispose(&file);
}
void test_core_rmdir__can_remove_empty_parents(void)
cl_assert(git_path_exists(empty_tmp_dir) == true);
- git_buf_free(&file);
+ git_buf_dispose(&file);
cl_git_pass(git_futils_rmdir_r(empty_tmp_dir, NULL, GIT_RMDIR_EMPTY_HIERARCHY));
}
#ifdef GIT_SHA1_COLLISIONDETECT
GIT_UNUSED(expected);
cl_git_fail(sha1_file(&oid, FIXTURE_DIR "/shattered-1.pdf"));
- cl_assert_equal_s("SHA1 collision attack detected", giterr_last()->message);
+ cl_assert_equal_s("SHA1 collision attack detected", git_error_last()->message);
#else
cl_git_pass(sha1_file(&oid, FIXTURE_DIR "/shattered-1.pdf"));
git_oid_fromstr(&expected, "38762cf7f55934b34d179ae6a4c80cadccbb7f0a");
git_sortedcache_wunlock(sc);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_core_sortedcache__on_disk(void)
cl_must_pass(p_stat(root.ptr, &st));
cl_assert(S_ISDIR(st.st_mode));
- git_buf_free(&root);
+ git_buf_dispose(&root);
}
+++ /dev/null
-#include "clar_libgit2.h"
-#include "git2/sys/stream.h"
-#include "streams/tls.h"
-#include "stream.h"
-
-static git_stream test_stream;
-static int ctor_called;
-
-static int test_ctor(git_stream **out, const char *host, const char *port)
-{
- GIT_UNUSED(host);
- GIT_UNUSED(port);
-
- ctor_called = 1;
- *out = &test_stream;
-
- return 0;
-}
-
-void test_core_stream__register_tls(void)
-{
- git_stream *stream;
- int error;
-
- ctor_called = 0;
- cl_git_pass(git_stream_register_tls(test_ctor));
- cl_git_pass(git_tls_stream_new(&stream, "localhost", "443"));
- cl_assert_equal_i(1, ctor_called);
- cl_assert_equal_p(&test_stream, stream);
-
- ctor_called = 0;
- stream = NULL;
- cl_git_pass(git_stream_register_tls(NULL));
- error = git_tls_stream_new(&stream, "localhost", "443");
-
- /* We don't have arbitrary TLS stream support on Windows
- * or when openssl support is disabled (except on OSX
- * with Security framework).
- */
-#if defined(GIT_WIN32) || !defined(GIT_HTTPS)
- cl_git_fail_with(-1, error);
-#else
- cl_git_pass(error);
-#endif
-
- cl_assert_equal_i(0, ctor_called);
- cl_assert(&test_stream != stream);
-
- git_stream_free(stream);
-}
void test_core_strmap__2(void)
{
- khiter_t pos;
+ size_t pos;
int i;
char *str;
assert_l64_fails("-0x8000000000000001", 16);
}
+void test_core_strtol__base_autodetection(void)
+{
+ assert_l64_parses("0", 0, 0);
+ assert_l64_parses("00", 0, 0);
+ assert_l64_parses("0x", 0, 0);
+ assert_l64_parses("0foobar", 0, 0);
+ assert_l64_parses("07", 7, 0);
+ assert_l64_parses("017", 15, 0);
+ assert_l64_parses("0x8", 8, 0);
+ assert_l64_parses("0x18", 24, 0);
+}
+
+void test_core_strtol__buffer_length_with_autodetection_truncates(void)
+{
+ int64_t i64;
+
+ cl_git_pass(git__strntol64(&i64, "011", 2, NULL, 0));
+ cl_assert_equal_i(i64, 1);
+ cl_git_pass(git__strntol64(&i64, "0x11", 3, NULL, 0));
+ cl_assert_equal_i(i64, 1);
+}
+
void test_core_strtol__buffer_length_truncates(void)
{
int32_t i32;
cl_assert_equal_i(i64, 1);
}
+void test_core_strtol__buffer_length_with_leading_ws_truncates(void)
+{
+ int64_t i64;
+
+ cl_git_fail(git__strntol64(&i64, " 1", 1, NULL, 10));
+
+ cl_git_pass(git__strntol64(&i64, " 11", 2, NULL, 10));
+ cl_assert_equal_i(i64, 1);
+}
+
+void test_core_strtol__buffer_length_with_leading_sign_truncates(void)
+{
+ int64_t i64;
+
+ cl_git_fail(git__strntol64(&i64, "-1", 1, NULL, 10));
+
+ cl_git_pass(git__strntol64(&i64, "-11", 2, NULL, 10));
+ cl_assert_equal_i(i64, -1);
+}
+
void test_core_strtol__error_message_cuts_off(void)
{
assert_l32_fails("2147483657foobar", 10);
- cl_assert(strstr(giterr_last()->message, "2147483657") != NULL);
- cl_assert(strstr(giterr_last()->message, "foobar") == NULL);
+ cl_assert(strstr(git_error_last()->message, "2147483657") != NULL);
+ cl_assert(strstr(git_error_last()->message, "foobar") == NULL);
}
cl_git_pass(git_libgit2_opts(GIT_OPT_GET_USER_AGENT, &buf));
cl_assert_equal_s(custom_name, buf.ptr);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
+#include <stdint.h>
+
#include "clar_libgit2.h"
#include "vector.h"
void test_core_vector__1(void)
{
git_vector x;
- // make initial capacity exact for our insertions.
+ /* make initial capacity exact for our insertions. */
git_vector_init(&x, 3, NULL);
git_vector_insert(&x, (void*) 0xabc);
git_vector_insert(&x, (void*) 0xdef);
git_vector_insert(&x, (void*) 0x123);
- git_vector_remove(&x, 0); // used to read past array bounds.
+ git_vector_remove(&x, 0); /* used to read past array bounds. */
git_vector_free(&x);
}
static int compare_them(const void *a, const void *b)
{
- return (int)((long)a - (long)b);
+ return (int)((intptr_t)a - (intptr_t)b);
}
/* insert_sorted */
void test_core_vector__3(void)
{
git_vector x;
- long i;
+ intptr_t i;
git_vector_init(&x, 1, &compare_them);
for (i = 0; i < 10; i += 2) {
void test_core_vector__4(void)
{
git_vector x;
- long i;
+ intptr_t i;
git_vector_init(&x, 1, &compare_them);
for (i = 0; i < 10; i += 2) {
void test_core_zstream__fails_on_trailing_garbage(void)
{
git_buf deflated = GIT_BUF_INIT, inflated = GIT_BUF_INIT;
- size_t i = 0;
+ char i = 0;
/* compress a simple string */
git_zstream_deflatebuf(&deflated, "foobar!!", 8);
cl_git_fail(git_zstream_inflatebuf(&inflated, deflated.ptr, deflated.size));
- git_buf_free(&deflated);
- git_buf_free(&inflated);
+ git_buf_dispose(&deflated);
+ git_buf_dispose(&inflated);
}
void test_core_zstream__buffer(void)
git_buf out = GIT_BUF_INIT;
cl_git_pass(git_zstream_deflatebuf(&out, data, strlen(data) + 1));
assert_zlib_equal(data, strlen(data) + 1, out.ptr, out.size);
- git_buf_free(&out);
+ git_buf_dispose(&out);
}
#define BIG_STRING_PART "Big Data IS Big - Long Data IS Long - We need a buffer larger than 1024 x 1024 to make sure we trigger chunked compression - Big Big Data IS Bigger than Big - Long Long Data IS Longer than Long"
cl_assert_equal_sz(out1.size, out2.size);
cl_assert(!memcmp(out1.ptr, out2.ptr, out1.size));
- git_buf_free(&out2);
+ git_buf_dispose(&out2);
}
cl_git_pass(git_zstream_inflatebuf(&inflated, out1.ptr, out1.size));
cl_assert_equal_i(input->size, inflated.size);
cl_assert(memcmp(input->ptr, inflated.ptr, inflated.size) == 0);
- git_buf_free(&out1);
- git_buf_free(&inflated);
+ git_buf_dispose(&out1);
+ git_buf_dispose(&inflated);
git__free(fixed);
}
compress_and_decompress_input_various_ways(&in);
}
- git_buf_free(&in);
+ git_buf_dispose(&in);
}
void test_date_rfc2822__format_rfc2822_buffer_too_small(void)
{
- // "Wed, 10 Apr 2014 08:21:03 +0000"
+ /* "Wed, 10 Apr 2014 08:21:03 +0000" */
git_time t = {1397031663 + 86400, 0};
char buf[GIT_DATE_RFC2822_SZ-1];
git_describe_result_free(result);
git_object_free(object);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
cl_git_sandbox_cleanup();
}
git_describe_result_free(result);
git_object_free(object);
- git_buf_free(&label);
+ git_buf_dispose(&label);
}
void assert_describe_workdir(
cl_must_pass(p_fnmatch(expected_output, git_buf_cstr(&label), 0));
git_describe_result_free(result);
- git_buf_free(&label);
+ git_buf_dispose(&label);
}
#include "describe_helpers.h"
#include "repository.h"
-// Ported from https://github.com/git/git/blob/adfc1857bdb090786fd9d22c1acec39371c76048/t/t6120-describe.sh
+/* Ported from https://github.com/git/git/blob/adfc1857bdb090786fd9d22c1acec39371c76048/t/t6120-describe.sh */
static git_repository *repo;
cl_git_append2file("describe/file", "\n");
- git_index_add_bypath(index, "describe/file");
- git_index_write(index);
+ cl_git_pass(git_index_add_bypath(index, "file"));
+ cl_git_pass(git_index_write(index));
*time += 10;
cl_repo_commit_from_index(&commit_id, repo, NULL, *time, commit_msg);
cl_assert_equal_s(expected, actual.ptr);
- git_buf_free(&actual);
+ git_buf_dispose(&actual);
git_patch_free(patch);
git_diff_free(diff);
git_tree_free(tree_one);
expected);
git_index_free(index);
- git_buf_free(&contents);
+ git_buf_dispose(&contents);
}
void test_diff_binary__delta_append(void)
cl_assert_equal_s("", actual.ptr);
- git_buf_free(&actual);
+ git_buf_dispose(&actual);
git_diff_free(diff);
git_commit_free(commit);
git_tree_free(tree);
&opts,
expected);
- git_buf_free(&actual);
+ git_buf_dispose(&actual);
git_patch_free(patch);
git_diff_free(diff);
git_index_free(index);
cl_assert_equal_s(expected, actual.ptr);
- git_buf_free(&actual);
+ git_buf_dispose(&actual);
git_diff_free(diff);
git_index_free(index);
}
git__free(diff_data.old_path);
git__free(diff_data.new_path);
- git_buf_free(&diff_data.old_binary_base85);
- git_buf_free(&diff_data.new_binary_base85);
+ git_buf_dispose(&diff_data.old_binary_base85);
+ git_buf_dispose(&diff_data.new_binary_base85);
}
cl_assert_equal_s(buf.ptr, BLOB_DIFF);
git_patch_free(p);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_diff_blob__can_compare_text_blobs(void)
cl_git_fail(git_diff_blobs(
d, NULL, alien, NULL, &opts,
diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expected));
- err = giterr_last();
- cl_assert_equal_i(GITERR_INVALID, err->klass);
+ err = git_error_last();
+ cl_assert_equal_i(GIT_ERROR_INVALID, err->klass);
}
void test_diff_blob__checks_options_version_too_high(void)
cl_git_fail(git_diff_blobs(
d, NULL, alien, NULL, &opts,
diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &expected));
- err = giterr_last();
- cl_assert_equal_i(GITERR_INVALID, err->klass);
+ err = git_error_last();
+ cl_assert_equal_i(GIT_ERROR_INVALID, err->klass);
}
void test_diff_blob__can_correctly_detect_a_binary_blob_as_binary(void)
git_buf_clear(&buf);
git_patch_free(p);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_blob_free(nonbin);
git_blob_free(bin);
}
git_tree *tree = NULL;
if (git_oid_fromstrn(&oid, partial_oid, len) == 0)
- cl_git_pass(git_object_lookup_prefix(&obj, repo, &oid, len, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup_prefix(&obj, repo, &oid, len, GIT_OBJECT_ANY));
- cl_git_pass(git_object_peel((git_object **) &tree, obj, GIT_OBJ_TREE));
+ cl_git_pass(git_object_peel((git_object **) &tree, obj, GIT_OBJECT_TREE));
git_object_free(obj);
return tree;
}
return 0;
abort:
- giterr_clear();
+ git_error_clear();
return GIT_EUSER;
}
cl_assert_equal_s(expected_patch_text[d], buf.ptr);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_patch_free(patch);
}
opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED;
cl_git_fail(git_diff_index_to_workdir(&diff, repo, NULL, &opts));
- err = giterr_last();
- cl_assert_equal_i(GITERR_INVALID, err->klass);
+ err = git_error_last();
+ cl_assert_equal_i(GIT_ERROR_INVALID, err->klass);
- giterr_clear();
+ git_error_clear();
opts.version = 1024;
cl_git_fail(git_diff_index_to_workdir(&diff, repo, NULL, &opts));
- err = giterr_last();
- cl_assert_equal_i(GITERR_INVALID, err->klass);
+ err = git_error_last();
+ cl_assert_equal_i(GIT_ERROR_INVALID, err->klass);
}
cl_git_pass(git_patch_to_buf(&actual, patch));
cl_assert_equal_s(expected0, actual.ptr);
- git_buf_free(&actual);
+ git_buf_dispose(&actual);
git_patch_free(patch);
git_diff_free(diff);
cl_git_pass(git_patch_to_buf(&actual, patch));
cl_assert_equal_s(expected1, actual.ptr);
- git_buf_free(&actual);
+ git_buf_dispose(&actual);
git_patch_free(patch);
git_diff_free(diff);
cl_git_pass(git_patch_to_buf(&actual, patch));
cl_assert_equal_s(expected0, actual.ptr);
- git_buf_free(&actual);
+ git_buf_dispose(&actual);
git_patch_free(patch);
git_diff_free(diff);
cl_git_pass(git_patch_to_buf(&actual, patch));
cl_assert_equal_s(expected1, actual.ptr);
- git_buf_free(&actual);
+ git_buf_dispose(&actual);
git_patch_free(patch);
git_diff_free(diff);
cl_git_pass(git_patch_to_buf(&actual, patch));
cl_assert_equal_s(expected2, actual.ptr);
- git_buf_free(&actual);
+ git_buf_dispose(&actual);
git_patch_free(patch);
git_diff_free(diff);
cl_assert_equal_s(expected, actual.ptr);
- git_buf_free(&actual);
+ git_buf_dispose(&actual);
git_patch_free(patch);
git_diff_free(diff);
}
git__free(path);
}
- git_buf_free(&file);
- git_buf_free(&actual);
- git_buf_free(&expected);
+ git_buf_dispose(&file);
+ git_buf_dispose(&actual);
+ git_buf_dispose(&expected);
git_vector_free(&files);
}
git_diff_free(diff);
git_commit_free(commit);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_diff_format_email__simple(void)
git_diff_free(diff);
git_commit_free(commit);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_diff_format_email__exclude_marker(void)
git_diff_free(diff);
git_commit_free(commit);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_diff_format_email__mode_change(void)
opts.version = 0;
cl_git_fail(git_diff_tree_to_index(&diff, g_repo, a, NULL, &opts));
- err = giterr_last();
- cl_assert_equal_i(GITERR_INVALID, err->klass);
+ err = git_error_last();
+ cl_assert_equal_i(GIT_ERROR_INVALID, err->klass);
cl_assert_equal_p(diff, NULL);
- giterr_clear();
+ git_error_clear();
opts.version = 1024;
cl_git_fail(git_diff_tree_to_index(&diff, g_repo, a, NULL, &opts));
- err = giterr_last();
- cl_assert_equal_i(GITERR_INVALID, err->klass);
+ err = git_error_last();
+ cl_assert_equal_i(GIT_ERROR_INVALID, err->klass);
cl_assert_equal_p(diff, NULL);
git_tree_free(a);
cl_git_fail_with(GIT_ERROR,
git_diff_from_buffer(&diff, buf.ptr, buf.size));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_diff_parse__exact_rename(void)
git_diff_free(computed);
git_diff_free(parsed);
- git_buf_free(&computed_buf);
+ git_buf_dispose(&computed_buf);
cl_git_sandbox_cleanup();
}
git_diff_free(computed);
git_diff_free(parsed);
- git_buf_free(&computed_buf);
+ git_buf_dispose(&computed_buf);
cl_git_sandbox_cleanup();
}
cl_assert_equal_s(patch, buf.ptr);
git_diff_free(diff);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_diff_parse__patch_roundtrip_succeeds(void)
git_patch_free(patch);
git_diff_free(diff);
- git_buf_free(&patchbuf);
- git_buf_free(&diffbuf);
+ git_buf_dispose(&patchbuf);
+ git_buf_dispose(&diffbuf);
}
#define cl_assert_equal_i_src(i1,i2,file,line) clar__assert_equal(file,line,#i1 " != " #i2, 1, "%d", (int)(i1), (int)(i2))
#define EXPECTED_HUNK "@@ -1,2 +0,0 @@\n"
+#define UTF8_HUNK_HEADER "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\n"
+
+#define UTF8_TRUNCATED_A_HUNK_HEADER "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\xE6\x97\xA5\xE6\x9C\xAC\n"
+
+#define UTF8_TRUNCATED_L_HUNK_HEADER "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E\xE6\x97\xA5\n"
+
static int check_removal_cb(
const git_diff_delta *delta,
const git_diff_hunk *hunk,
cl_assert_equal_sz(31 + 16, git_patch_size(patch, 1, 1, 0));
cl_assert_equal_sz(strlen(expected), git_patch_size(patch, 1, 1, 1));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_patch_free(patch);
git_diff_free(diff);
git_tree_free(another);
git_patch_free(patch);
git_diff_free(diff);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_tree_free(one);
git_config_free(cfg);
}
git_patch_free(patch);
git_diff_free(diff);
- git_buf_free(&actual);
- git_buf_free(&old_content);
+ git_buf_dispose(&actual);
+ git_buf_dispose(&old_content);
git_tree_free(head);
}
git_buf buf = GIT_BUF_INIT;
cl_git_pass(git_patch_to_buf(&buf, patch));
cl_assert_equal_s(expected, buf.ptr);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
cl_assert_equal_sz(
strlen(expected), git_patch_size(patch, 1, 1, 1));
check_single_patch_stats(
g_repo, 1, 1, 1, 6, expected_sizes, expected);
- git_buf_free(&content);
+ git_buf_dispose(&content);
+}
+
+void test_diff_patch__can_strip_bad_utf8(void)
+{
+ const char *a = "A " UTF8_HUNK_HEADER
+ " B\n"
+ " C\n"
+ " D\n"
+ " E\n"
+ " F\n"
+ " G\n"
+ " H\n"
+ " I\n"
+ " J\n"
+ " K\n"
+ "L " UTF8_HUNK_HEADER
+ " M\n"
+ " N\n"
+ " O\n"
+ " P\n"
+ " Q\n"
+ " R\n"
+ " S\n"
+ " T\n"
+ " U\n"
+ " V\n";
+
+ const char *b = "A " UTF8_HUNK_HEADER
+ " B\n"
+ " C\n"
+ " D\n"
+ " E modified\n"
+ " F\n"
+ " G\n"
+ " H\n"
+ " I\n"
+ " J\n"
+ " K\n"
+ "L " UTF8_HUNK_HEADER
+ " M\n"
+ " N\n"
+ " O\n"
+ " P modified\n"
+ " Q\n"
+ " R\n"
+ " S\n"
+ " T\n"
+ " U\n"
+ " V\n";
+
+ const char *expected = "diff --git a/file b/file\n"
+ "index d0647c4..7827ce5 100644\n"
+ "--- a/file\n"
+ "+++ b/file\n"
+ "@@ -2,7 +2,7 @@ A " UTF8_TRUNCATED_A_HUNK_HEADER
+ " B\n"
+ " C\n"
+ " D\n"
+ "- E\n"
+ "+ E modified\n"
+ " F\n"
+ " G\n"
+ " H\n"
+ "@@ -13,7 +13,7 @@ L " UTF8_TRUNCATED_L_HUNK_HEADER
+ " M\n"
+ " N\n"
+ " O\n"
+ "- P\n"
+ "+ P modified\n"
+ " Q\n"
+ " R\n"
+ " S\n";
+
+ git_diff_options opts;
+ git_patch *patch;
+ git_buf buf = GIT_BUF_INIT;
+
+ cl_git_pass(git_diff_init_options(&opts, GIT_DIFF_OPTIONS_VERSION));
+
+ cl_git_pass(git_patch_from_buffers(&patch, a, strlen(a), NULL, b, strlen(b), NULL, &opts));
+ cl_git_pass(git_patch_to_buf(&buf, patch));
+
+ cl_assert_equal_s(expected, buf.ptr);
+
+ git_patch_free(patch);
+ git_buf_dispose(&buf);
}
opts.version = 0;
cl_git_fail(git_diff_find_similar(diff, &opts));
- err = giterr_last();
- cl_assert_equal_i(GITERR_INVALID, err->klass);
+ err = git_error_last();
+ cl_assert_equal_i(GIT_ERROR_INVALID, err->klass);
- giterr_clear();
+ git_error_clear();
opts.version = 1024;
cl_git_fail(git_diff_find_similar(diff, &opts));
- err = giterr_last();
- cl_assert_equal_i(GITERR_INVALID, err->klass);
+ err = git_error_last();
+ cl_assert_equal_i(GIT_ERROR_INVALID, err->klass);
git_diff_free(diff);
git_tree_free(old_tree);
cl_git_pass(git_index_add_bypath(index, "small.txt"));
cl_git_pass(git_repository_head(&head_reference, g_repo));
- cl_git_pass(git_reference_peel((git_object**)&head_commit, head_reference, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel((git_object**)&head_commit, head_reference, GIT_OBJECT_COMMIT));
cl_git_pass(git_commit_tree(&head_tree, head_commit));
cl_git_pass(git_index_write_tree(&oid, index));
cl_git_pass(git_tree_lookup(&commit_tree, g_repo, &oid));
git_diff_free(diff);
git_tree_free(tree);
- git_buf_free(&content);
- git_buf_free(&old_content);
+ git_buf_dispose(&content);
+ git_buf_dispose(&old_content);
}
void test_diff_rename__patch(void)
cl_git_pass(git_patch_to_buf(&buf, patch));
cl_assert_equal_s(expected, buf.ptr);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_patch_free(patch);
git_tree_free(tree);
git_index_free(index);
- git_buf_free(&c1);
- git_buf_free(&c2);
+ git_buf_dispose(&c1);
+ git_buf_dispose(&c2);
}
void test_diff_rename__file_exchange_three(void)
git_tree_free(tree);
git_index_free(index);
- git_buf_free(&c1);
- git_buf_free(&c2);
- git_buf_free(&c3);
+ git_buf_dispose(&c1);
+ git_buf_dispose(&c2);
+ git_buf_dispose(&c3);
}
void test_diff_rename__file_partial_exchange(void)
git_tree_free(tree);
git_index_free(index);
- git_buf_free(&c1);
- git_buf_free(&c2);
+ git_buf_dispose(&c1);
+ git_buf_dispose(&c2);
}
void test_diff_rename__rename_and_copy_from_same_source(void)
git_tree_free(tree);
git_index_free(index);
- git_buf_free(&c1);
- git_buf_free(&c2);
+ git_buf_dispose(&c1);
+ git_buf_dispose(&c2);
}
void test_diff_rename__from_deleted_to_split(void)
git_tree_free(tree);
git_index_free(index);
- git_buf_free(&c1);
+ git_buf_dispose(&c1);
}
struct rename_expected
git_index_free(index);
git_reference_free(head);
git_reference_free(selfsimilar);
- git_buf_free(&one);
- git_buf_free(&two);
+ git_buf_dispose(&one);
+ git_buf_dispose(&two);
}
static void write_similarity_file_two(const char *filename, size_t b_lines)
cl_git_pass(
git_futils_writebuffer(&contents, filename, O_RDWR|O_CREAT, 0777));
- git_buf_free(&contents);
+ git_buf_dispose(&contents);
}
void test_diff_rename__rejected_match_can_match_others_two(void)
git_tree_free(tree);
git_index_free(index);
- git_buf_free(&c1);
+ git_buf_dispose(&c1);
}
void test_diff_rename__can_delete_unmodified_deltas(void)
git_tree_free(tree);
git_index_free(index);
- git_buf_free(&c1);
+ git_buf_dispose(&c1);
}
void test_diff_rename__matches_config_behavior(void)
cl_assert_equal_s(expected, diff_buf.ptr);
- git_buf_free(&diff_buf);
+ git_buf_dispose(&diff_buf);
git_diff_free(diff);
git_tree_free(old_tree);
git_tree_free(new_tree);
cl_assert_equal_s(expected, diff_buf.ptr);
- git_buf_free(&diff_buf);
+ git_buf_dispose(&diff_buf);
git_diff_free(diff);
git_tree_free(old_tree);
git_tree_free(new_tree);
cl_assert_equal_s(expected, diff_buf.ptr);
- git_buf_free(&diff_buf);
+ git_buf_dispose(&diff_buf);
git_diff_free(diff);
git_tree_free(old_tree);
git_tree_free(new_tree);
cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0));
cl_assert(strcmp(git_buf_cstr(&buf), stat) == 0);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 80));
cl_assert(strcmp(git_buf_cstr(&buf), stat) == 0);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_diff_stats__multiple_hunks(void)
cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0));
cl_assert_equal_s(stat, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_diff_stats__numstat(void)
cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_NUMBER, 0));
cl_assert_equal_s(stat, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_diff_stats__shortstat(void)
cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_SHORT, 0));
cl_assert_equal_s(stat, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_diff_stats__shortstat_noinsertions(void)
cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_SHORT, 0));
cl_assert_equal_s(stat, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_diff_stats__shortstat_nodeletions(void)
cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_SHORT, 0));
cl_assert_equal_s(stat, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_diff_stats__rename(void)
cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0));
cl_assert_equal_s(stat, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_diff_stats__rename_nochanges(void)
cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0));
cl_assert_equal_s(stat, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_diff_stats__rename_and_modifiy(void)
cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0));
cl_assert_equal_s(stat, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
+}
+
+void test_diff_stats__rename_in_subdirectory(void)
+{
+ git_buf buf = GIT_BUF_INIT;
+ const char *stat =
+ " dir/{orig.txt => renamed.txt} | 0\n"
+ " 1 file changed, 0 insertions(+), 0 deletions(-)\n";
+
+ diff_stats_from_commit_oid(
+ &_stats, "0db2a262bc8c5c3cba55254730045a8258da7a37", true);
+
+ cl_assert_equal_sz(1, git_diff_stats_files_changed(_stats));
+ cl_assert_equal_sz(0, git_diff_stats_insertions(_stats));
+ cl_assert_equal_sz(0, git_diff_stats_deletions(_stats));
+
+ cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0));
+ cl_assert_equal_s(stat, git_buf_cstr(&buf));
+ git_buf_dispose(&buf);
}
void test_diff_stats__rename_no_find(void)
cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0));
cl_assert_equal_s(stat, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_diff_stats__rename_nochanges_no_find(void)
cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0));
cl_assert_equal_s(stat, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_diff_stats__rename_and_modify_no_find(void)
cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0));
cl_assert_equal_s(stat, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_diff_stats__binary(void)
cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0));
cl_assert_equal_s(stat, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_diff_stats__binary_numstat(void)
cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_NUMBER, 0));
cl_assert_equal_s(stat, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_diff_stats__mode_change(void)
cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL | GIT_DIFF_STATS_INCLUDE_SUMMARY, 0));
cl_assert_equal_s(stat, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
clar__assert_equal(
file, line, "expected diff did not match actual diff", 1,
"%s", expected[d], get_buf_ptr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
cl_assert_at_line(expected[d] && !strcmp(expected[d], "<END>"), file, line);
opts.version = 0;
cl_git_fail(git_diff_tree_to_tree(&diff, g_repo, a, b, &opts));
- err = giterr_last();
- cl_assert_equal_i(GITERR_INVALID, err->klass);
+ err = git_error_last();
+ cl_assert_equal_i(GIT_ERROR_INVALID, err->klass);
- giterr_clear();
+ git_error_clear();
opts.version = 1024;
cl_git_fail(git_diff_tree_to_tree(&diff, g_repo, a, b, &opts));
- err = giterr_last();
+ err = git_error_last();
}
void process_tree_to_tree_diffing(
cl_assert((iep = git_index_get_bypath(idx, "modified_file", 0)) != NULL);
memcpy(&ie, iep, sizeof(ie));
- ie.flags |= GIT_IDXENTRY_VALID;
+ ie.flags |= GIT_INDEX_ENTRY_VALID;
cl_git_pass(git_index_add(idx, &ie));
cl_assert((iep = git_index_get_bypath(idx, "file_deleted", 0)) != NULL);
memcpy(&ie, iep, sizeof(ie));
- ie.flags |= GIT_IDXENTRY_VALID;
+ ie.flags |= GIT_INDEX_ENTRY_VALID;
cl_git_pass(git_index_add(idx, &ie));
cl_git_pass(git_index_write(idx));
cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, NULL));
memset(&exp, 0, sizeof(exp));
- cl_git_pass(git_diff_foreach(diff,
+ cl_git_pass(git_diff_foreach(diff,
diff_file_cb, diff_binary_cb, diff_hunk_cb, diff_line_cb, &exp));
cl_assert_equal_i(0, exp.files);
opts.version = 0;
cl_git_fail(git_diff_tree_to_workdir(&diff, g_repo, NULL, &opts));
- err = giterr_last();
- cl_assert_equal_i(GITERR_INVALID, err->klass);
+ err = git_error_last();
+ cl_assert_equal_i(GIT_ERROR_INVALID, err->klass);
- giterr_clear();
+ git_error_clear();
opts.version = 1024;
cl_git_fail(git_diff_tree_to_workdir(&diff, g_repo, NULL, &opts));
- err = giterr_last();
- cl_assert_equal_i(GITERR_INVALID, err->klass);
+ err = git_error_last();
+ cl_assert_equal_i(GIT_ERROR_INVALID, err->klass);
}
void test_diff_workdir__can_diff_empty_file(void)
cl_assert_equal_s(expected_patience, buf.ptr);
git_buf_clear(&buf);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_patch_free(patch);
git_diff_free(diff);
}
git_buf path = GIT_BUF_INIT;
cl_git_pass(git_buf_sets(&path, "status"));
cl_git_pass(git_path_direach(&path, 0, touch_file, NULL));
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED;
cl_git_write2file(
b.ptr, data[i].ptr, data[i].size, O_WRONLY|O_TRUNC, 0664);
}
- git_index_write(idx);
+ cl_git_pass(git_index_write(idx));
cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, NULL));
cl_git_write2file(b.ptr, "baseline\n", 9, O_WRONLY|O_TRUNC, 0664);
}
- git_index_write(idx);
+ cl_git_pass(git_index_write(idx));
cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, NULL));
git_diff_free(diff);
git_index_free(idx);
- git_buf_free(&b);
+ git_buf_dispose(&b);
}
void test_diff_workdir__to_index_conflicted(void) {
cl_git_pass(git_repository_index(&index, g_repo));
cl_git_pass(git_repository_head(&head, g_repo));
- cl_git_pass(git_reference_peel(&head_object, head, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel(&head_object, head, GIT_OBJECT_COMMIT));
cl_git_pass(git_reset(g_repo, head_object, GIT_RESET_HARD, NULL));
git_oid_cpy(&second, git_index_checksum(index));
cl_assert(!git_oid_equal(&first, &second));
- git_buf_free(&path);
+ git_buf_dispose(&path);
git_object_free(head_object);
git_reference_free(head);
git_index_free(index);
equals = (strcmp(fetchhead_buf.ptr, FETCH_HEAD_WILDCARD_DATA_LOCAL) == 0);
- git_buf_free(&fetchhead_buf);
+ git_buf_dispose(&fetchhead_buf);
git_vector_foreach(&fetchhead_vector, i, fetchhead_ref) {
git_fetchhead_ref_free(fetchhead_ref);
cl_git_rewritefile("./test1/.git/FETCH_HEAD", "49322bb17d3acc9146f98c97d078513228bbf3c0\tinvalid-merge\t\n");
cl_git_fail(git_repository_fetchhead_foreach(g_repo, read_noop, NULL));
- cl_assert(git__prefixcmp(giterr_last()->message, "invalid for-merge") == 0);
+ cl_assert(git__prefixcmp(git_error_last()->message, "invalid for-merge") == 0);
}
void test_fetchhead_nonetwork__invalid_description(void)
cl_git_rewritefile("./test1/.git/FETCH_HEAD", "49322bb17d3acc9146f98c97d078513228bbf3c0\tnot-for-merge\n");
cl_git_fail(git_repository_fetchhead_foreach(g_repo, read_noop, NULL));
- cl_assert(git__prefixcmp(giterr_last()->message, "invalid description") == 0);
+ cl_assert(git__prefixcmp(git_error_last()->message, "invalid description") == 0);
}
static int assert_master_for_merge(const char *ref, const char *url, const git_oid *id, unsigned int is_merge, void *data)
cl_assert(found_haacked);
git_remote_free(remote);
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
static bool count_refs_called;
}
git_remote_free(remote);
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
/* we never convert CRLF -> LF on platforms that have LF */
cl_assert_equal_s(ALL_CRLF_TEXT_AS_CRLF, buf.ptr);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_blob_free(blob);
}
cl_git_pass(git_blob_filtered_content(&buf, blob, "file.bin", 1));
cl_assert_equal_sz(0, buf.size);
cl_assert_equal_s("", buf.ptr);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
memset(&buf, 0, sizeof(git_buf));
cl_git_pass(git_blob_filtered_content(&buf, blob, "file.crlf", 1));
cl_assert_equal_sz(0, buf.size);
cl_assert_equal_s("", buf.ptr);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
memset(&buf, 0, sizeof(git_buf));
cl_git_pass(git_blob_filtered_content(&buf, blob, "file.lf", 1));
cl_assert_equal_sz(0, buf.size);
cl_assert_equal_s("", buf.ptr);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_blob_free(blob);
}
cl_assert_equal_s(
"Some text\n$Id: 3164f585d548ac68027d22b104f2d8100b2b6845 $\nGoes there\n", buf.ptr);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_blob_free(blob);
}
cl_assert_equal_s("Some text\r\nRight here\r\n", out.ptr);
git_filter_list_free(fl);
- git_buf_free(&out);
+ git_buf_dispose(&out);
}
void test_filter_crlf__to_odb(void)
cl_assert_equal_s("Some text\nRight here\n", out.ptr);
git_filter_list_free(fl);
- git_buf_free(&out);
+ git_buf_dispose(&out);
}
void test_filter_crlf__with_safecrlf(void)
in.size = strlen(in.ptr);
cl_git_fail(git_filter_list_apply_to_data(&out, fl, &in));
- cl_assert_equal_i(giterr_last()->klass, GITERR_FILTER);
+ cl_assert_equal_i(git_error_last()->klass, GIT_ERROR_FILTER);
- /* Normalized \n is reversible, so does not fail with safecrlf */
+ /* Normalized \n fails for autocrlf=true when safecrlf=true */
in.ptr = "Normal\nLF\nonly\nline-endings.\n";
in.size = strlen(in.ptr);
+ cl_git_fail(git_filter_list_apply_to_data(&out, fl, &in));
+ cl_assert_equal_i(git_error_last()->klass, GIT_ERROR_FILTER);
+
+ /* String with \r but without \r\n does not fail with safecrlf */
+ in.ptr = "Normal\nCR only\rand some more\nline-endings.\n";
+ in.size = strlen(in.ptr);
+
cl_git_pass(git_filter_list_apply_to_data(&out, fl, &in));
- cl_assert_equal_s(in.ptr, out.ptr);
+ cl_assert_equal_s("Normal\nCR only\rand some more\nline-endings.\n", out.ptr);
git_filter_list_free(fl);
- git_buf_free(&out);
+ git_buf_dispose(&out);
}
void test_filter_crlf__with_safecrlf_and_unsafe_allowed(void)
cl_assert_equal_s("Normal\nLF\nonly\nline-endings.\n", out.ptr);
git_filter_list_free(fl);
- git_buf_free(&out);
+ git_buf_dispose(&out);
}
void test_filter_crlf__no_safecrlf(void)
cl_assert_equal_s("Normal\nLF\nonly\nline-endings.\n", out.ptr);
git_filter_list_free(fl);
- git_buf_free(&out);
+ git_buf_dispose(&out);
}
void test_filter_crlf__safecrlf_warn(void)
cl_assert_equal_s(in.ptr, out.ptr);
git_filter_list_free(fl);
- git_buf_free(&out);
+ git_buf_dispose(&out);
}
0, memcmp(bitflipped_and_reversed_data, out.ptr, out.size));
git_filter_list_free(fl);
- git_buf_free(&out);
+ git_buf_dispose(&out);
}
void test_filter_custom__to_workdir(void)
0, memcmp(workdir_data, out.ptr, out.size));
git_filter_list_free(fl);
- git_buf_free(&out);
+ git_buf_dispose(&out);
}
void test_filter_custom__can_register_a_custom_filter_in_the_repository(void)
git_blob_id(blob), "8ca0df630d728c0c72072b6101b301391ef10095"));
git_blob_free(blob);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_filter_custom__filter_registry_failure_cases(void)
cl_git_fail(git_filter_list_apply_to_data(&out, filters, &in));
git_filter_list_free(filters);
- git_buf_free(&out);
+ git_buf_dispose(&out);
}
cl_repo_set_bool(g_repo, "core.autocrlf", true);
cl_git_pass(git_repository_head(&head_ref, g_repo));
- cl_git_pass(git_reference_peel((git_object **)&head, head_ref, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel((git_object **)&head, head_ref, GIT_OBJECT_COMMIT));
cl_git_pass(git_reset(g_repo, (git_object *)head, GIT_RESET_HARD, NULL));
git_commit_free(head);
cl_git_pass(git_filter_list_apply_to_file(&buf, fl, g_repo, "all-crlf"));
cl_assert_equal_s("crlf\ncrlf\ncrlf\ncrlf\n", buf.ptr);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_filter_list_free(fl);
}
void buf_writestream_free(git_writestream *s)
{
struct buf_writestream *stream = (struct buf_writestream *)s;
- git_buf_free(&stream->buf);
+ git_buf_dispose(&stream->buf);
}
void test_filter_file__apply_stream(void)
cl_assert_equal_s(expected, out.ptr);
git_blob_free(blob);
- git_buf_free(&out);
+ git_buf_dispose(&out);
}
void test_filter_ident__to_worktree(void)
}
p_close(fd);
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
static void test_stream(size_t numchunks)
if (strcmp(attr_values[0], "wcflip") == 0 ||
strcmp(attr_values[0], "wcreverse") == 0) {
*payload = git__strdup(attr_values[0]);
- GITERR_CHECK_ALLOC(*payload);
+ GIT_ERROR_CHECK_ALLOC(*payload);
return 0;
}
0, memcmp(reversed, out.ptr, out.size));
git_filter_list_free(fl);
- git_buf_free(&out);
- git_buf_free(&in);
+ git_buf_dispose(&out);
+ git_buf_dispose(&in);
}
void test_filter_wildcard__flip(void)
0, memcmp(flipped, out.ptr, out.size));
git_filter_list_free(fl);
- git_buf_free(&out);
- git_buf_free(&in);
+ git_buf_dispose(&out);
+ git_buf_dispose(&in);
}
void test_filter_wildcard__none(void)
0, memcmp(input, out.ptr, out.size));
git_filter_list_free(fl);
- git_buf_free(&out);
- git_buf_free(&in);
+ git_buf_dispose(&out);
+ git_buf_dispose(&in);
}
+++ /dev/null
-#!/usr/bin/env bash
-
-set -e
-
-if [ "$1" == "" -o "$2" == "" ]; then
- echo "usage: $0 crlfrepo directory [tempdir]"
- exit 1
-fi
-
-input=$1
-output=$2
-tempdir=$3
-
-set -u
-
-create_repo() {
- local input=$1
- local output=$2
- local tempdir=$3
- local systype=$4
- local autocrlf=$5
- local attr=$6
-
- local worktree="${output}/${systype}/autocrlf_${autocrlf}"
-
- if [ "$attr" != "" ]; then
- local attrdir=`echo $attr | sed -e "s/ /,/g" | sed -e "s/=/_/g"`
- worktree="${worktree},${attrdir}"
- fi
-
- if [ "$tempdir" = "" ]; then
- local gitdir="${worktree}/.git"
- else
- local gitdir="${tempdir}/generate_crlf_${RANDOM}"
- fi
-
- echo "Creating ${worktree}"
- mkdir -p "${worktree}"
-
- git clone --no-checkout --quiet --bare "${input}/.gitted" "${gitdir}"
- git --work-tree="${worktree}" --git-dir="${gitdir}" config core.autocrlf ${autocrlf}
-
- if [ "$attr" != "" ]; then
- echo "* ${attr}" >> "${worktree}/.gitattributes"
- fi
-
- git --work-tree="${worktree}" --git-dir="${gitdir}" checkout HEAD
-
- if [ "$attr" != "" ]; then
- rm "${worktree}/.gitattributes"
- fi
-
- if [ "$tempdir" != "" ]; then
- rm -rf "${gitdir}"
- fi
-}
-
-if [[ `uname -s` == MINGW* ]]; then
- systype="windows"
-else
- systype="posix"
-fi
-
-for autocrlf in true false input; do
- for attr in "" text text=auto -text crlf -crlf eol=lf eol=crlf \
- "text eol=lf" "text eol=crlf" \
- "text=auto eol=lf" "text=auto eol=crlf"; do
-
- create_repo "${input}" "${output}" "${tempdir}" \
- "${systype}" "${autocrlf}" "${attr}"
- done
-done
-
cl_assert(st.st_ctime == entry->ctime.seconds);
cl_assert(st.st_mtime == entry->mtime.seconds);
cl_assert(st.st_size == entry->file_size);
- cl_assert(st.st_uid == entry->uid);
- cl_assert(st.st_gid == entry->gid);
+ cl_assert((uint32_t)st.st_uid == entry->uid);
+ cl_assert((uint32_t)st.st_gid == entry->gid);
cl_assert_equal_i_fmt(
GIT_MODE_TYPE(st.st_mode), GIT_MODE_TYPE(entry->mode), "%07o");
if (cl_is_chmod_supported())
paths.count = 1;
cl_git_pass(git_index_add_all(index, &paths, 0, NULL, NULL));
+ cl_git_pass(git_index_write(index));
check_stat_data(index, TEST_DIR "/file.bar", true);
check_status(g_repo, 1, 0, 0, 1, 0, 0, 1, 0);
check_status(g_repo, 1, 0, 0, 4, 0, 0, 1, 0);
cl_git_pass(git_index_add_all(index, &paths, 0, NULL, NULL));
+ cl_git_pass(git_index_write(index));
check_stat_data(index, TEST_DIR "/file.zzz", true);
check_status(g_repo, 2, 0, 0, 3, 0, 0, 1, 0);
/* attempt to add an ignored file - does nothing */
strs[0] = "file.foo";
cl_git_pass(git_index_add_all(index, &paths, 0, NULL, NULL));
+ cl_git_pass(git_index_write(index));
check_status(g_repo, 0, 0, 0, 3, 0, 0, 1, 0);
/* add with check - should generate error */
error = git_index_add_all(
index, &paths, GIT_INDEX_ADD_CHECK_PATHSPEC, NULL, NULL);
cl_assert_equal_i(GIT_EINVALIDSPEC, error);
+ cl_git_pass(git_index_write(index));
check_status(g_repo, 0, 0, 0, 3, 0, 0, 1, 0);
/* add with force - should allow */
cl_git_pass(git_index_add_all(
index, &paths, GIT_INDEX_ADD_FORCE, NULL, NULL));
+ cl_git_pass(git_index_write(index));
check_stat_data(index, TEST_DIR "/file.foo", true);
check_status(g_repo, 1, 0, 0, 3, 0, 0, 0, 0);
check_status(g_repo, 1, 0, 0, 3, 0, 1, 0, 0);
cl_git_pass(git_index_add_all(index, &paths, 0, NULL, NULL));
+ cl_git_pass(git_index_write(index));
check_stat_data(index, TEST_DIR "/file.foo", true);
check_status(g_repo, 1, 0, 0, 3, 0, 0, 0, 0);
strs[0] = "*";
cl_git_pass(git_index_add_all(index, &paths, 0, NULL, NULL));
+ cl_git_pass(git_index_write(index));
check_status(g_repo, 3, 1, 0, 0, 0, 0, 0, 0);
/* must be able to remove at any position while still updating other files */
cl_git_pass(git_repository_index(&index, g_repo));
cl_git_pass(git_index_add_all(index, NULL, 0, NULL, NULL));
+ cl_git_pass(git_index_write(index));
check_stat_data(index, TEST_DIR "/file.bar", true);
check_status(g_repo, 2, 0, 0, 0, 0, 0, 1, 0);
check_status(g_repo, 2, 0, 0, 1, 0, 0, 1, 0);
cl_git_pass(git_index_add_all(index, NULL, 0, NULL, NULL));
+ cl_git_pass(git_index_write(index));
check_status(g_repo, 3, 0, 0, 0, 0, 0, 1, 0);
git_index_free(index);
cl_git_pass(git_repository_index(&index, g_repo));
cl_git_pass(git_index_add_all(index, NULL, 0, NULL, NULL));
+ cl_git_pass(git_index_write(index));
check_stat_data(index, TEST_DIR "/file.bar", true);
check_status(g_repo, 2, 0, 0, 0, 0, 0, 1, 0);
check_status(g_repo, 2, 0, 0, 3, 0, 0, 1, 0);
cl_git_pass(git_index_add_all(index, NULL, 0, NULL, NULL));
+ cl_git_pass(git_index_write(index));
check_stat_data(index, TEST_DIR "/file.bar", true);
check_status(g_repo, 5, 0, 0, 0, 0, 0, 1, 0);
cl_git_pass(
git_index_add_all(index, NULL, 0, addall_match_prefix, "file."));
+ cl_git_pass(git_index_write(index));
check_stat_data(index, TEST_DIR "/file.bar", true);
check_status(g_repo, 1, 0, 0, 1, 0, 0, 1, 0);
cl_git_pass(
git_index_add_all(index, NULL, 0, addall_match_prefix, "other"));
+ cl_git_pass(git_index_write(index));
check_stat_data(index, TEST_DIR "/other.zzz", true);
check_status(g_repo, 2, 0, 0, 3, 0, 0, 1, 0);
cl_git_pass(
git_index_add_all(index, NULL, 0, addall_match_suffix, ".zzz"));
+ cl_git_pass(git_index_write(index));
check_status(g_repo, 4, 0, 0, 1, 0, 0, 1, 0);
cl_git_pass(
cl_git_pass(
git_index_add_all(index, NULL, 0, addall_match_suffix, ".zzz"));
+ cl_git_pass(git_index_write(index));
check_status(g_repo, 5, 0, 0, 0, 0, 0, 1, 0);
cl_must_pass(p_unlink(TEST_DIR "/file.zzz"));
check_status(g_repo, 0, 1, 2, 0, 0, 0, 0, 1);
cl_git_pass(git_index_add_all(index, NULL, 0, NULL, NULL));
+ cl_git_pass(git_index_write(index));
check_status(g_repo, 0, 1, 3, 0, 0, 0, 0, 0);
git_annotated_commit_free(annotated);
cl_git_rmfile("merge-resolve/conflicting.txt");
cl_git_pass(git_index_add_all(index, NULL, 0, NULL, NULL));
+ cl_git_pass(git_index_write(index));
check_status(g_repo, 0, 2, 2, 0, 0, 0, 0, 0);
git_annotated_commit_free(annotated);
cl_git_pass(git_index_remove_bypath(g_idx, "README.txt"));
for (stage = 1; stage <= 3; stage++) {
- new_entry.flags = stage << GIT_IDXENTRY_STAGESHIFT;
+ new_entry.flags = stage << GIT_INDEX_ENTRY_STAGESHIFT;
cl_git_pass(git_index_add(g_idx, &new_entry));
}
cl_git_pass(git_index_remove_bypath(g_idx, "README.txt"));
for (stage = 1; stage <= 3; stage++) {
- new_entry.flags = stage << GIT_IDXENTRY_STAGESHIFT;
+ new_entry.flags = stage << GIT_INDEX_ENTRY_STAGESHIFT;
cl_git_pass(git_index_add(g_idx, &new_entry));
}
cl_git_pass(git_repository_odb(&g_odb, g_repo));
cl_git_pass(git_repository_index(&g_index, g_repo));
- cl_git_pass(git_odb_write(&g_empty_id, g_odb, "", 0, GIT_OBJ_BLOB));
+ cl_git_pass(git_odb_write(&g_empty_id, g_odb, "", 0, GIT_OBJECT_BLOB));
}
void test_index_collision__cleanup(void)
cl_git_sandbox_cleanup();
}
-void test_index_collision__add(void)
+void test_index_collision__add_blob_with_conflicting_file(void)
{
git_index_entry entry;
+ git_tree_entry *tentry;
git_oid tree_id;
git_tree *tree;
entry.path = "a/b";
cl_git_pass(git_index_add(g_index, &entry));
+ /* Check a/b exists here */
+ cl_git_pass(git_index_write_tree(&tree_id, g_index));
+ cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_id));
+ cl_git_pass(git_tree_entry_bypath(&tentry, tree, "a/b"));
+ git_tree_entry_free(tentry);
+ git_tree_free(tree);
+
/* create a tree/blob collision */
entry.path = "a/b/c";
- cl_git_fail(git_index_add(g_index, &entry));
+ cl_git_pass(git_index_add(g_index, &entry));
+ /* a/b should now be a tree and a/b/c a blob */
cl_git_pass(git_index_write_tree(&tree_id, g_index));
cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_id));
+ cl_git_pass(git_tree_entry_bypath(&tentry, tree, "a/b/c"));
+ git_tree_entry_free(tentry);
+ git_tree_free(tree);
+}
+
+void test_index_collision__add_blob_with_conflicting_dir(void)
+{
+ git_index_entry entry;
+ git_tree_entry *tentry;
+ git_oid tree_id;
+ git_tree *tree;
+ memset(&entry, 0, sizeof(entry));
+ entry.ctime.seconds = 12346789;
+ entry.mtime.seconds = 12346789;
+ entry.mode = 0100644;
+ entry.file_size = 0;
+ git_oid_cpy(&entry.id, &g_empty_id);
+
+ entry.path = "a/b/c";
+ cl_git_pass(git_index_add(g_index, &entry));
+
+ /* Check a/b/c exists here */
+ cl_git_pass(git_index_write_tree(&tree_id, g_index));
+ cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_id));
+ cl_git_pass(git_tree_entry_bypath(&tentry, tree, "a/b/c"));
+ git_tree_entry_free(tentry);
+ git_tree_free(tree);
+
+ /* create a blob/tree collision */
+ entry.path = "a/b";
+ cl_git_pass(git_index_add(g_index, &entry));
+
+ /* a/b should now be a tree and a/b/c a blob */
+ cl_git_pass(git_index_write_tree(&tree_id, g_index));
+ cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_id));
+ cl_git_pass(git_tree_entry_bypath(&tentry, tree, "a/b"));
+ cl_git_fail(git_tree_entry_bypath(&tentry, tree, "a/b/c"));
+ git_tree_entry_free(tentry);
git_tree_free(tree);
}
git_oid_cpy(&entry.id, &g_empty_id);
entry.path = "a/b";
- GIT_IDXENTRY_STAGE_SET(&entry, 2);
+ GIT_INDEX_ENTRY_STAGE_SET(&entry, 2);
cl_git_pass(git_index_add(g_index, &entry));
/* create a blob beneath the previous tree entry */
/* create another tree entry above the blob */
entry.path = "a/b";
- GIT_IDXENTRY_STAGE_SET(&entry, 1);
+ GIT_INDEX_ENTRY_STAGE_SET(&entry, 1);
cl_git_pass(git_index_add(g_index, &entry));
}
git_oid_cpy(&entry.id, &g_empty_id);
entry.path = "a/b/c";
- GIT_IDXENTRY_STAGE_SET(&entry, 1);
+ GIT_INDEX_ENTRY_STAGE_SET(&entry, 1);
cl_git_pass(git_index_add(g_index, &entry));
/* create a blob beneath the previous tree entry */
entry.path = "a/b/c";
- GIT_IDXENTRY_STAGE_SET(&entry, 2);
+ GIT_INDEX_ENTRY_STAGE_SET(&entry, 2);
cl_git_pass(git_index_add(g_index, &entry));
/* create another tree entry above the blob */
entry.path = "a/b";
- GIT_IDXENTRY_STAGE_SET(&entry, 3);
+ GIT_INDEX_ENTRY_STAGE_SET(&entry, 3);
cl_git_pass(git_index_add(g_index, &entry));
}
#define TEST_REPO_PATH "mergedrepo"
#define TEST_INDEX_PATH TEST_REPO_PATH "/.git/index"
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_index_conflicts__initialize(void)
{
repo = cl_git_sandbox_init("mergedrepo");
ancestor_entry.path = "test-one.txt";
ancestor_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&ancestor_entry, 1);
+ GIT_INDEX_ENTRY_STAGE_SET(&ancestor_entry, 1);
git_oid_fromstr(&ancestor_entry.id, CONFLICTS_ONE_ANCESTOR_OID);
our_entry.path = "test-one.txt";
our_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&our_entry, 2);
+ GIT_INDEX_ENTRY_STAGE_SET(&our_entry, 2);
git_oid_fromstr(&our_entry.id, CONFLICTS_ONE_OUR_OID);
their_entry.path = "test-one.txt";
their_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&ancestor_entry, 2);
+ GIT_INDEX_ENTRY_STAGE_SET(&ancestor_entry, 2);
git_oid_fromstr(&their_entry.id, CONFLICTS_ONE_THEIR_OID);
cl_git_pass(git_index_conflict_add(repo_index, &ancestor_entry, &our_entry, &their_entry));
ancestor_entry.path = "test-one.txt";
ancestor_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&ancestor_entry, 3);
+ GIT_INDEX_ENTRY_STAGE_SET(&ancestor_entry, 3);
git_oid_fromstr(&ancestor_entry.id, CONFLICTS_ONE_ANCESTOR_OID);
our_entry.path = "test-one.txt";
our_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&our_entry, 1);
+ GIT_INDEX_ENTRY_STAGE_SET(&our_entry, 1);
git_oid_fromstr(&our_entry.id, CONFLICTS_ONE_OUR_OID);
their_entry.path = "test-one.txt";
their_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&their_entry, 2);
+ GIT_INDEX_ENTRY_STAGE_SET(&their_entry, 2);
git_oid_fromstr(&their_entry.id, CONFLICTS_ONE_THEIR_OID);
cl_git_pass(git_index_conflict_add(repo_index, &ancestor_entry, &our_entry, &their_entry));
cl_assert(git_index_entry_stage(conflict_entry[2]) == 3);
}
+void test_index_conflicts__add_detects_invalid_filemode(void)
+{
+ git_index_entry ancestor_entry, our_entry, their_entry;
+ git_index_entry *conflict_entry[3];
+ int i;
+
+ cl_assert(git_index_entrycount(repo_index) == 8);
+
+ memset(&ancestor_entry, 0x0, sizeof(git_index_entry));
+ memset(&our_entry, 0x0, sizeof(git_index_entry));
+ memset(&their_entry, 0x0, sizeof(git_index_entry));
+
+ conflict_entry[0] = &ancestor_entry;
+ conflict_entry[1] = &our_entry;
+ conflict_entry[2] = &their_entry;
+
+ for (i = 0; i < 3; i++) {
+ ancestor_entry.path = "test-one.txt";
+ ancestor_entry.mode = 0100644;
+ GIT_INDEX_ENTRY_STAGE_SET(&ancestor_entry, 3);
+ git_oid_fromstr(&ancestor_entry.id, CONFLICTS_ONE_ANCESTOR_OID);
+
+ our_entry.path = "test-one.txt";
+ our_entry.mode = 0100644;
+ GIT_INDEX_ENTRY_STAGE_SET(&our_entry, 1);
+ git_oid_fromstr(&our_entry.id, CONFLICTS_ONE_OUR_OID);
+
+ their_entry.path = "test-one.txt";
+ their_entry.mode = 0100644;
+ GIT_INDEX_ENTRY_STAGE_SET(&their_entry, 2);
+ git_oid_fromstr(&their_entry.id, CONFLICTS_ONE_THEIR_OID);
+
+ /* Corrupt the conflict entry's mode */
+ conflict_entry[i]->mode = 027431745;
+
+ cl_git_fail(git_index_conflict_add(repo_index, &ancestor_entry, &our_entry, &their_entry));
+ }
+
+ cl_assert(git_index_entrycount(repo_index) == 8);
+}
+
+
void test_index_conflicts__add_removes_stage_zero(void)
{
git_index_entry ancestor_entry, our_entry, their_entry;
ancestor_entry.path = "test-one.txt";
ancestor_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&ancestor_entry, 3);
+ GIT_INDEX_ENTRY_STAGE_SET(&ancestor_entry, 3);
git_oid_fromstr(&ancestor_entry.id, CONFLICTS_ONE_ANCESTOR_OID);
our_entry.path = "test-one.txt";
our_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&our_entry, 1);
+ GIT_INDEX_ENTRY_STAGE_SET(&our_entry, 1);
git_oid_fromstr(&our_entry.id, CONFLICTS_ONE_OUR_OID);
their_entry.path = "test-one.txt";
their_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&their_entry, 2);
+ GIT_INDEX_ENTRY_STAGE_SET(&their_entry, 2);
git_oid_fromstr(&their_entry.id, CONFLICTS_ONE_THEIR_OID);
cl_git_pass(git_index_conflict_add(repo_index, &ancestor_entry, &our_entry, &their_entry));
ancestor_entry.path = "test-one.txt";
ancestor_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&ancestor_entry, 1);
+ GIT_INDEX_ENTRY_STAGE_SET(&ancestor_entry, 1);
git_oid_fromstr(&ancestor_entry.id, CONFLICTS_ONE_ANCESTOR_OID);
cl_git_pass(git_index_conflict_add(repo_index, &ancestor_entry, NULL, NULL));
memset(&their_entry, 0x0, sizeof(git_index_entry));
ancestor_entry.path = upper_case;
- GIT_IDXENTRY_STAGE_SET(&ancestor_entry, GIT_INDEX_STAGE_ANCESTOR);
+ GIT_INDEX_ENTRY_STAGE_SET(&ancestor_entry, GIT_INDEX_STAGE_ANCESTOR);
git_oid_fromstr(&ancestor_entry.id, CONFLICTS_ONE_ANCESTOR_OID);
ancestor_entry.mode = GIT_FILEMODE_BLOB;
our_entry.path = upper_case;
- GIT_IDXENTRY_STAGE_SET(&our_entry, GIT_INDEX_STAGE_OURS);
+ GIT_INDEX_ENTRY_STAGE_SET(&our_entry, GIT_INDEX_STAGE_OURS);
git_oid_fromstr(&our_entry.id, CONFLICTS_ONE_OUR_OID);
our_entry.mode = GIT_FILEMODE_BLOB;
their_entry.path = upper_case;
- GIT_IDXENTRY_STAGE_SET(&their_entry, GIT_INDEX_STAGE_THEIRS);
+ GIT_INDEX_ENTRY_STAGE_SET(&their_entry, GIT_INDEX_STAGE_THEIRS);
git_oid_fromstr(&their_entry.id, CONFLICTS_ONE_THEIR_OID);
their_entry.mode = GIT_FILEMODE_BLOB;
&ancestor_entry, &our_entry, &their_entry));
ancestor_entry.path = mixed_case;
- GIT_IDXENTRY_STAGE_SET(&ancestor_entry, GIT_INDEX_STAGE_ANCESTOR);
+ GIT_INDEX_ENTRY_STAGE_SET(&ancestor_entry, GIT_INDEX_STAGE_ANCESTOR);
git_oid_fromstr(&ancestor_entry.id, CONFLICTS_TWO_ANCESTOR_OID);
ancestor_entry.mode = GIT_FILEMODE_BLOB;
our_entry.path = mixed_case;
- GIT_IDXENTRY_STAGE_SET(&ancestor_entry, GIT_INDEX_STAGE_ANCESTOR);
+ GIT_INDEX_ENTRY_STAGE_SET(&ancestor_entry, GIT_INDEX_STAGE_ANCESTOR);
git_oid_fromstr(&our_entry.id, CONFLICTS_TWO_OUR_OID);
ancestor_entry.mode = GIT_FILEMODE_BLOB;
their_entry.path = mixed_case;
- GIT_IDXENTRY_STAGE_SET(&their_entry, GIT_INDEX_STAGE_THEIRS);
+ GIT_INDEX_ENTRY_STAGE_SET(&their_entry, GIT_INDEX_STAGE_THEIRS);
git_oid_fromstr(&their_entry.id, CONFLICTS_TWO_THEIR_OID);
their_entry.mode = GIT_FILEMODE_BLOB;
static git_repository *g_repo;
static git_index *g_index;
+static git_buf expected_fixture = GIT_BUF_INIT;
+
void test_index_crlf__initialize(void)
{
- g_repo = cl_git_sandbox_init("crlf");
+ g_repo = cl_git_sandbox_init_new("crlf");
cl_git_pass(git_repository_index(&g_index, g_repo));
}
{
git_index_free(g_index);
cl_git_sandbox_cleanup();
+
+ if (expected_fixture.size) {
+ cl_fixture_cleanup(expected_fixture.ptr);
+ git_buf_dispose(&expected_fixture);
+ }
+}
+
+struct compare_data
+{
+ const char *systype;
+ const char *dirname;
+ const char *safecrlf;
+ const char *autocrlf;
+ const char *attrs;
+};
+
+static int add_and_check_file(void *payload, git_buf *actual_path)
+{
+ git_buf expected_path = GIT_BUF_INIT;
+ git_buf expected_path_fail = GIT_BUF_INIT;
+ git_buf expected_contents = GIT_BUF_INIT;
+ struct compare_data *cd = payload;
+ char *basename;
+ const git_index_entry *entry;
+ git_blob *blob;
+ bool failed = true;
+
+ basename = git_path_basename(actual_path->ptr);
+
+ if (!strcmp(basename, ".git") || !strcmp(basename, ".gitattributes")) {
+ failed = false;
+ goto done;
+ }
+
+ cl_git_pass(git_buf_joinpath(&expected_path, cd->dirname, basename));
+
+ cl_git_pass(git_buf_puts(&expected_path_fail, expected_path.ptr));
+ cl_git_pass(git_buf_puts(&expected_path_fail, ".fail"));
+
+ if (git_path_isfile(expected_path.ptr)) {
+ cl_git_pass(git_index_add_bypath(g_index, basename));
+
+ cl_assert(entry = git_index_get_bypath(g_index, basename, 0));
+ cl_git_pass(git_blob_lookup(&blob, g_repo, &entry->id));
+
+ cl_git_pass(git_futils_readbuffer(&expected_contents, expected_path.ptr));
+
+ if (strcmp(expected_contents.ptr, git_blob_rawcontent(blob)) != 0)
+ goto done;
+
+ git_blob_free(blob);
+ } else if (git_path_isfile(expected_path_fail.ptr)) {
+ cl_git_pass(git_futils_readbuffer(&expected_contents, expected_path_fail.ptr));
+ git_buf_rtrim(&expected_contents);
+
+ if (git_index_add_bypath(g_index, basename) == 0 ||
+ git_error_last()->klass != GIT_ERROR_FILTER ||
+ strcmp(expected_contents.ptr, git_error_last()->message) != 0)
+ goto done;
+ } else {
+ cl_fail("unexpected index failure");
+ }
+
+ failed = false;
+
+done:
+ if (failed) {
+ git_buf details = GIT_BUF_INIT;
+ git_buf_printf(&details, "filename=%s, system=%s, autocrlf=%s, safecrlf=%s, attrs={%s}",
+ basename, cd->systype, cd->autocrlf, cd->safecrlf, cd->attrs);
+ clar__fail(__FILE__, __LINE__,
+ "index contents did not match expected", details.ptr, 0);
+ git_buf_dispose(&details);
+ }
+
+ git__free(basename);
+ git_buf_dispose(&expected_contents);
+ git_buf_dispose(&expected_path);
+ git_buf_dispose(&expected_path_fail);
+ return 0;
+}
+
+static const char *system_type(void)
+{
+ if (GIT_EOL_NATIVE == GIT_EOL_CRLF)
+ return "windows";
+ else
+ return "posix";
+}
+
+static void test_add_index(const char *safecrlf, const char *autocrlf, const char *attrs)
+{
+ git_buf attrbuf = GIT_BUF_INIT;
+ git_buf expected_dirname = GIT_BUF_INIT;
+ git_buf sandboxname = GIT_BUF_INIT;
+ git_buf reponame = GIT_BUF_INIT;
+ struct compare_data compare_data = { system_type(), NULL, safecrlf, autocrlf, attrs };
+ const char *c;
+
+ git_buf_puts(&reponame, "crlf");
+
+ git_buf_puts(&sandboxname, "autocrlf_");
+ git_buf_puts(&sandboxname, autocrlf);
+
+ git_buf_puts(&sandboxname, ",safecrlf_");
+ git_buf_puts(&sandboxname, safecrlf);
+
+ if (*attrs) {
+ git_buf_puts(&sandboxname, ",");
+
+ for (c = attrs; *c; c++) {
+ if (*c == ' ')
+ git_buf_putc(&sandboxname, ',');
+ else if (*c == '=')
+ git_buf_putc(&sandboxname, '_');
+ else
+ git_buf_putc(&sandboxname, *c);
+ }
+
+ git_buf_printf(&attrbuf, "* %s\n", attrs);
+ cl_git_mkfile("crlf/.gitattributes", attrbuf.ptr);
+ }
+
+ cl_repo_set_string(g_repo, "core.safecrlf", safecrlf);
+ cl_repo_set_string(g_repo, "core.autocrlf", autocrlf);
+
+ cl_git_pass(git_index_clear(g_index));
+
+ git_buf_joinpath(&expected_dirname, "crlf_data", system_type());
+ git_buf_puts(&expected_dirname, "_to_odb");
+
+ git_buf_joinpath(&expected_fixture, expected_dirname.ptr, sandboxname.ptr);
+ cl_fixture_sandbox(expected_fixture.ptr);
+
+ compare_data.dirname = sandboxname.ptr;
+ cl_git_pass(git_path_direach(&reponame, 0, add_and_check_file, &compare_data));
+
+ cl_fixture_cleanup(expected_fixture.ptr);
+ git_buf_dispose(&expected_fixture);
+
+ git_buf_dispose(&attrbuf);
+ git_buf_dispose(&expected_fixture);
+ git_buf_dispose(&expected_dirname);
+ git_buf_dispose(&sandboxname);
+ git_buf_dispose(&reponame);
+}
+
+static void set_up_workingdir(const char *name)
+{
+ git_vector contents = GIT_VECTOR_INIT;
+ size_t i;
+ const char *fn;
+
+ git_path_dirload(&contents, name, 0, 0);
+ git_vector_foreach(&contents, i, fn) {
+ char *basename = git_path_basename(fn);
+ bool skip = strncasecmp(basename, ".git", 4) == 0 && strlen(basename) == 4;
+
+ git__free(basename);
+
+ if (skip)
+ continue;
+ p_unlink(fn);
+ }
+ git_vector_free_deep(&contents);
+
+ /* copy input files */
+ git_path_dirload(&contents, cl_fixture("crlf"), 0, 0);
+ git_vector_foreach(&contents, i, fn) {
+ char *basename = git_path_basename(fn);
+ git_buf dest_filename = GIT_BUF_INIT;
+
+ if (strcmp(basename, ".gitted") &&
+ strcmp(basename, ".gitattributes")) {
+ git_buf_joinpath(&dest_filename, name, basename);
+ cl_git_pass(git_futils_cp(fn, dest_filename.ptr, 0644));
+ }
+
+ git__free(basename);
+ git_buf_dispose(&dest_filename);
+ }
+ git_vector_free_deep(&contents);
+}
+
+void test_index_crlf__matches_core_git(void)
+{
+ const char *safecrlf[] = { "true", "false", "warn", NULL };
+ const char *autocrlf[] = { "true", "false", "input", NULL };
+ const char *attrs[] = { "", "-crlf", "-text", "eol=crlf", "eol=lf",
+ "text", "text eol=crlf", "text eol=lf",
+ "text=auto", "text=auto eol=crlf", "text=auto eol=lf",
+ NULL };
+ const char **a, **b, **c;
+
+ for (a = safecrlf; *a; a++) {
+ for (b = autocrlf; *b; b++) {
+ for (c = attrs; *c; c++) {
+ set_up_workingdir("crlf");
+ test_add_index(*a, *b, *c);
+ }
+ }
+ }
}
void test_index_crlf__autocrlf_false_no_attrs(void)
cl_assert_equal_oid(&oid, &entry->id);
}
+void test_index_crlf__safecrlf_true_autocrlf_input_text_auto_attr(void)
+{
+ const git_index_entry *entry;
+ git_oid oid;
+
+ cl_git_mkfile("./crlf/.gitattributes", "* text=auto\n");
+
+ cl_repo_set_string(g_repo, "core.autocrlf", "input");
+ cl_repo_set_bool(g_repo, "core.safecrlf", true);
+
+ cl_git_mkfile("./crlf/newfile.txt", FILE_CONTENTS_LF);
+
+ cl_git_pass(git_index_add_bypath(g_index, "newfile.txt"));
+ entry = git_index_get_bypath(g_index, "newfile.txt", 0);
+ cl_assert(entry);
+
+ cl_git_pass(git_oid_fromstr(&oid, FILE_OID_LF));
+ cl_assert_equal_oid(&oid, &entry->id);
+
+ cl_git_mkfile("./crlf/newfile2.txt", FILE_CONTENTS_CRLF);
+ cl_git_fail(git_index_add_bypath(g_index, "newfile2.txt"));
+}
+
+void test_index_crlf__safecrlf_true_autocrlf_input_text__no_attr(void)
+{
+ const git_index_entry *entry;
+ git_oid oid;
+
+ cl_repo_set_string(g_repo, "core.autocrlf", "input");
+ cl_repo_set_bool(g_repo, "core.safecrlf", true);
+
+ cl_git_mkfile("./crlf/newfile.txt", FILE_CONTENTS_LF);
+
+ cl_git_pass(git_index_add_bypath(g_index, "newfile.txt"));
+ entry = git_index_get_bypath(g_index, "newfile.txt", 0);
+ cl_assert(entry);
+
+ cl_git_pass(git_oid_fromstr(&oid, FILE_OID_LF));
+ cl_assert_equal_oid(&oid, &entry->id);
+
+ cl_git_mkfile("./crlf/newfile2.txt", FILE_CONTENTS_CRLF);
+ cl_git_fail(git_index_add_bypath(g_index, "newfile2.txt"));
+}
+
void test_index_crlf__safecrlf_true_no_attrs(void)
{
cl_repo_set_bool(g_repo, "core.autocrlf", true);
cl_repo_set_bool(g_repo, "core.safecrlf", true);
cl_git_mkfile("crlf/newfile.txt", ALL_LF_TEXT_RAW);
- cl_git_pass(git_index_add_bypath(g_index, "newfile.txt"));
+ cl_git_fail(git_index_add_bypath(g_index, "newfile.txt"));
cl_git_mkfile("crlf/newfile.txt", ALL_CRLF_TEXT_RAW);
cl_git_pass(git_index_add_bypath(g_index, "newfile.txt"));
path.ptr, content.ptr, content.size,
O_WRONLY|O_CREAT|O_TRUNC, create_mode);
- git_buf_free(&path);
- git_buf_free(&content);
+ git_buf_dispose(&path);
+ git_buf_dispose(&content);
}
#define add_and_check_mode(I,F,X) add_and_check_mode_(I,F,X,__FILE__,__LINE__)
cl_repo_set_bool(g_repo, "core.filemode", false);
cl_git_pass(git_repository_index(&index, g_repo));
- cl_assert((git_index_caps(index) & GIT_INDEXCAP_NO_FILEMODE) != 0);
+ cl_assert((git_index_caps(index) & GIT_INDEX_CAPABILITY_NO_FILEMODE) != 0);
/* 1 - add 0644 over existing 0644 -> expect 0644 */
replace_file_with_mode("exec_off", "filemodes/exec_off.0", 0644);
cl_repo_set_bool(g_repo, "core.filemode", true);
cl_git_pass(git_repository_index(&index, g_repo));
- cl_assert((git_index_caps(index) & GIT_INDEXCAP_NO_FILEMODE) == 0);
+ cl_assert((git_index_caps(index) & GIT_INDEX_CAPABILITY_NO_FILEMODE) == 0);
/* 1 - add 0644 over existing 0644 -> expect 0644 */
replace_file_with_mode("exec_off", "filemodes/exec_off.0", 0644);
cl_git_pass(git_index_add_bypath(index, "dummy-file.txt"));
cl_assert((dummy = git_index_get_bypath(index, "dummy-file.txt", 0)));
- GIT_IDXENTRY_STAGE_SET(&entry, 0);
+ GIT_INDEX_ENTRY_STAGE_SET(&entry, 0);
entry.path = "foo";
- entry.mode = GIT_OBJ_BLOB;
+ entry.mode = GIT_OBJECT_BLOB;
git_oid_cpy(&entry.id, &dummy->id);
cl_git_fail(git_index_add(index, &entry));
#define TEST_REPO_PATH "mergedrepo"
#define TEST_INDEX_PATH TEST_REPO_PATH "/.git/index"
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_index_names__initialize(void)
{
repo = cl_git_sandbox_init("mergedrepo");
cl_git_sandbox_cleanup();
}
+static void index_add_conflicts(void)
+{
+ git_index_entry entry = {{0}};
+ const char *paths[][3] = {
+ { "ancestor", "ours", "theirs" },
+ { "ancestor2", "ours2", "theirs2" },
+ { "ancestor3", "ours3", "theirs3" } };
+ const char **conflict;
+ size_t i;
+
+ for (i = 0; i < ARRAY_SIZE(paths); i++) {
+ conflict = paths[i];
+
+ /* ancestor */
+ entry.path = conflict[0];
+ entry.mode = GIT_FILEMODE_BLOB;
+ GIT_INDEX_ENTRY_STAGE_SET(&entry, GIT_INDEX_STAGE_ANCESTOR);
+ git_oid_fromstr(&entry.id, "1f85ca51b8e0aac893a621b61a9c2661d6aa6d81");
+ cl_git_pass(git_index_add(repo_index, &entry));
+
+ /* ours */
+ entry.path = conflict[1];
+ entry.mode = GIT_FILEMODE_BLOB;
+ GIT_INDEX_ENTRY_STAGE_SET(&entry, GIT_INDEX_STAGE_OURS);
+ git_oid_fromstr(&entry.id, "1f85ca51b8e0aac893a621b61a9c2661d6aa6d81");
+ cl_git_pass(git_index_add(repo_index, &entry));
+
+ /* theirs */
+ entry.path = conflict[2];
+ entry.mode = GIT_FILEMODE_BLOB;
+ GIT_INDEX_ENTRY_STAGE_SET(&entry, GIT_INDEX_STAGE_THEIRS);
+ git_oid_fromstr(&entry.id, "1f85ca51b8e0aac893a621b61a9c2661d6aa6d81");
+ cl_git_pass(git_index_add(repo_index, &entry));
+ }
+}
+
void test_index_names__add(void)
{
const git_index_name_entry *conflict_name;
+ index_add_conflicts();
cl_git_pass(git_index_name_add(repo_index, "ancestor", "ours", "theirs"));
cl_git_pass(git_index_name_add(repo_index, "ancestor2", "ours2", NULL));
cl_git_pass(git_index_name_add(repo_index, "ancestor3", NULL, "theirs3"));
cl_assert(strcmp(conflict_name->ancestor, "ancestor3") == 0);
cl_assert(conflict_name->ours == NULL);
cl_assert(strcmp(conflict_name->theirs, "theirs3") == 0);
+
+ cl_git_pass(git_index_write(repo_index));
}
void test_index_names__roundtrip(void)
git_object *obj;
git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
- opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_UPDATE_ONLY;
+ opts.checkout_strategy = GIT_CHECKOUT_FORCE | GIT_CHECKOUT_UPDATE_ONLY;
test_index_names__add();
- git_reference_name_to_id(&oid, repo, "refs/heads/master");
- git_object_lookup(&obj, repo, &oid, GIT_OBJ_ANY);
- git_checkout_tree(repo, obj, &opts);
+ cl_git_pass(git_reference_name_to_id(&oid, repo, "refs/heads/master"));
+ cl_git_pass(git_object_lookup(&obj, repo, &oid, GIT_OBJECT_ANY));
+ cl_git_pass(git_checkout_tree(repo, obj, &opts));
cl_assert_equal_sz(0, git_index_name_entrycount(repo_index));
git_object_free(obj);
{
git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
- opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_UPDATE_ONLY;
+ opts.checkout_strategy = GIT_CHECKOUT_FORCE | GIT_CHECKOUT_UPDATE_ONLY;
test_index_names__add();
- git_checkout_head(repo, &opts);
+ cl_git_pass(git_checkout_head(repo, &opts));
cl_assert_equal_sz(0, git_index_name_entrycount(repo_index));
}
{
git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
- opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_UPDATE_ONLY;
+ opts.checkout_strategy = GIT_CHECKOUT_FORCE | GIT_CHECKOUT_UPDATE_ONLY;
test_index_names__add();
- git_checkout_index(repo, repo_index, &opts);
+ cl_git_pass(git_checkout_index(repo, repo_index, &opts));
cl_assert(git_index_name_entrycount(repo_index) > 0);
}
#define TEST_REPO_PATH "nsecs"
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_index_nsec__initialize(void)
{
repo = cl_git_sandbox_init("nsecs");
p_unlink(nsec_path.ptr);
- git_buf_free(&nsec_path);
+ git_buf_dispose(&nsec_path);
return expect;
}
git_index_free(index);
git_diff_free(diff);
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
void test_index_racy__write_index_just_after_file(void)
cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, index, NULL));
cl_assert_equal_i(1, git_diff_num_deltas(diff));
- git_buf_free(&path);
+ git_buf_dispose(&path);
git_diff_free(diff);
git_index_free(index);
}
cl_assert(entry = (git_index_entry *)git_index_get_bypath(index, "A", 0));
/* force a race */
- entry->mtime.seconds = st.st_mtime;
- entry->mtime.nanoseconds = st.st_mtime_nsec;
+ entry->mtime.seconds = (int32_t)st.st_mtime;
+ entry->mtime.nanoseconds = (int32_t)st.st_mtime_nsec;
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
void test_index_racy__smudges_index_entry_on_save(void)
cl_git_pass(git_index_add_frombuffer(index, &new_entry, "hello!\n", 7));
git_index_free(index);
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
void test_index_racy__adding_to_index_is_uptodate(void)
/* ensure that they're all uptodate */
cl_assert((entry = git_index_get_bypath(index, "A", 0)));
- cl_assert_equal_i(GIT_IDXENTRY_UPTODATE, (entry->flags_extended & GIT_IDXENTRY_UPTODATE));
+ cl_assert_equal_i(GIT_INDEX_ENTRY_UPTODATE, (entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE));
cl_assert((entry = git_index_get_bypath(index, "B", 0)));
- cl_assert_equal_i(GIT_IDXENTRY_UPTODATE, (entry->flags_extended & GIT_IDXENTRY_UPTODATE));
+ cl_assert_equal_i(GIT_INDEX_ENTRY_UPTODATE, (entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE));
cl_assert((entry = git_index_get_bypath(index, "C", 0)));
- cl_assert_equal_i(GIT_IDXENTRY_UPTODATE, (entry->flags_extended & GIT_IDXENTRY_UPTODATE));
+ cl_assert_equal_i(GIT_INDEX_ENTRY_UPTODATE, (entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE));
cl_git_pass(git_index_write(index));
/* ensure that no files are uptodate */
cl_assert((entry = git_index_get_bypath(index, "A", 0)));
- cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE));
+ cl_assert_equal_i(0, (entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE));
cl_assert((entry = git_index_get_bypath(index, "B", 0)));
- cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE));
+ cl_assert_equal_i(0, (entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE));
cl_assert((entry = git_index_get_bypath(index, "C", 0)));
- cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE));
+ cl_assert_equal_i(0, (entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE));
git_index_free(index);
}
/* ensure that no files are uptodate */
cl_assert((entry = git_index_get_bypath(index, "A", 0)));
- cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE));
+ cl_assert_equal_i(0, (entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE));
cl_assert((entry = git_index_get_bypath(index, "B", 0)));
- cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE));
+ cl_assert_equal_i(0, (entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE));
cl_assert((entry = git_index_get_bypath(index, "C", 0)));
- cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE));
+ cl_assert_equal_i(0, (entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE));
git_tree_free(tree);
git_index_free(index);
/* ensure that files brought in from the other index are not uptodate */
cl_assert((entry = git_index_get_bypath(newindex, "A", 0)));
- cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE));
+ cl_assert_equal_i(0, (entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE));
cl_assert((entry = git_index_get_bypath(newindex, "B", 0)));
- cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE));
+ cl_assert_equal_i(0, (entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE));
cl_assert((entry = git_index_get_bypath(newindex, "C", 0)));
- cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE));
+ cl_assert_equal_i(0, (entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE));
git_index_free(index);
git_index_free(newindex);
ancestor_entry.path = filename;
ancestor_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&ancestor_entry, 1);
+ GIT_INDEX_ENTRY_STAGE_SET(&ancestor_entry, 1);
git_oid_fromstr(&ancestor_entry.id, ancestor_ids[conflict_idx]);
our_entry.path = filename;
our_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&our_entry, 2);
+ GIT_INDEX_ENTRY_STAGE_SET(&our_entry, 2);
git_oid_fromstr(&our_entry.id, our_ids[conflict_idx]);
their_entry.path = filename;
their_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&ancestor_entry, 2);
+ GIT_INDEX_ENTRY_STAGE_SET(&ancestor_entry, 2);
git_oid_fromstr(&their_entry.id, their_ids[conflict_idx]);
cl_git_pass(git_index_conflict_add(index, &ancestor_entry,
#define TWO_OUR_OID "8f3c06cff9a83757cec40c80bc9bf31a2582bde9"
#define TWO_THEIR_OID "887b153b165d32409c70163e0f734c090f12f673"
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_index_reuc__initialize(void)
{
repo = cl_git_sandbox_init("mergedrepo");
cl_assert_equal_oid(&reuc->oid[0], &ancestor_oid);
cl_assert_equal_oid(&reuc->oid[1], &our_oid);
cl_assert_equal_oid(&reuc->oid[2], &their_oid);
+
+ cl_git_pass(git_index_write(repo_index));
}
void test_index_reuc__add_no_ancestor(void)
cl_assert_equal_oid(&reuc->oid[0], &ancestor_oid);
cl_assert_equal_oid(&reuc->oid[1], &our_oid);
cl_assert_equal_oid(&reuc->oid[2], &their_oid);
+
+ cl_git_pass(git_index_write(repo_index));
}
void test_index_reuc__read_bypath(void)
index_caps = git_index_caps(repo_index);
- index_caps &= ~GIT_INDEXCAP_IGNORE_CASE;
+ index_caps &= ~GIT_INDEX_CAPABILITY_IGNORE_CASE;
cl_git_pass(git_index_set_caps(repo_index, index_caps));
cl_assert(!git_index_reuc_get_bypath(repo_index, "TWO.txt"));
- index_caps |= GIT_INDEXCAP_IGNORE_CASE;
+ index_caps |= GIT_INDEX_CAPABILITY_IGNORE_CASE;
cl_git_pass(git_index_set_caps(repo_index, index_caps));
cl_assert_equal_i(2, git_index_reuc_entrycount(repo_index));
index_caps = git_index_caps(repo_index);
- index_caps |= GIT_INDEXCAP_IGNORE_CASE;
+ index_caps |= GIT_INDEX_CAPABILITY_IGNORE_CASE;
cl_git_pass(git_index_set_caps(repo_index, index_caps));
git_oid_fromstr(&ancestor_oid, TWO_ANCESTOR_OID);
git_object *obj;
git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
- opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_UPDATE_ONLY;
+ opts.checkout_strategy = GIT_CHECKOUT_FORCE;
test_index_reuc__add();
- git_reference_name_to_id(&oid, repo, "refs/heads/master");
- git_object_lookup(&obj, repo, &oid, GIT_OBJ_ANY);
- git_checkout_tree(repo, obj, &opts);
+ cl_git_pass(git_reference_name_to_id(&oid, repo, "refs/heads/master"));
+ cl_git_pass(git_object_lookup(&obj, repo, &oid, GIT_OBJECT_ANY));
+ cl_git_pass(git_checkout_tree(repo, obj, &opts));
cl_assert(reuc_entry_exists() == false);
git_object_free(obj);
{
git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
- opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_UPDATE_ONLY;
+ opts.checkout_strategy = GIT_CHECKOUT_FORCE;
test_index_reuc__add();
- git_checkout_head(repo, &opts);
+ cl_git_pass(git_checkout_head(repo, &opts));
cl_assert(reuc_entry_exists() == false);
}
{
git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
- opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_UPDATE_ONLY;
+ opts.checkout_strategy = GIT_CHECKOUT_FORCE;
test_index_reuc__add();
- git_checkout_index(repo, repo_index, &opts);
+ cl_git_pass(git_checkout_index(repo, repo_index, &opts));
cl_assert(reuc_entry_exists() == true);
}
--- /dev/null
+#include "clar_libgit2.h"
+#include "index.h"
+
+static git_repository *g_repo;
+
+void test_index_splitindex__initialize(void)
+{
+ g_repo = cl_git_sandbox_init("splitindex");
+}
+
+void test_index_splitindex__cleanup(void)
+{
+ cl_git_sandbox_cleanup();
+}
+
+void test_index_splitindex__fail_on_open(void)
+{
+ git_index *idx;
+ cl_git_fail_with(-1, git_repository_index(&idx, g_repo));
+ cl_assert_equal_s(git_error_last()->message, "unsupported mandatory extension: 'link'");
+}
#define TEST_REPO_PATH "mergedrepo"
#define TEST_INDEX_PATH TEST_REPO_PATH "/.git/index"
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_index_stage__initialize(void)
{
repo = cl_git_sandbox_init("mergedrepo");
static struct test_entry test_entries[] = {
{4, "Makefile", 5064, 0x4C3F7F33},
- {62, "tests/Makefile", 2631, 0x4C3F7F33},
- {36, "src/index.c", 10014, 0x4C43368D},
{6, "git.git-authors", 2709, 0x4C3F7F33},
- {48, "src/revobject.h", 1448, 0x4C3F7FE2}
+ {36, "src/index.c", 10014, 0x4C43368D},
+ {48, "src/revobject.h", 1448, 0x4C3F7FE2},
+ {62, "tests/Makefile", 2631, 0x4C3F7F33}
};
/* Helpers */
cl_git_pass(p_write(dst_fd, source_buf.ptr, source_buf.size));
cleanup:
- git_buf_free(&source_buf);
+ git_buf_dispose(&source_buf);
p_close(dst_fd);
}
cl_assert(0);
if (git_futils_readbuffer(&buf_b, b) < 0) {
- git_buf_free(&buf_a);
+ git_buf_dispose(&buf_a);
cl_assert(0);
}
pass = (buf_a.size == buf_b.size && !memcmp(buf_a.ptr, buf_b.ptr, buf_a.size));
- git_buf_free(&buf_a);
- git_buf_free(&buf_b);
+ git_buf_dispose(&buf_a);
+ git_buf_dispose(&buf_b);
cl_assert(pass);
}
{
}
+void test_index_tests__cleanup(void)
+{
+ cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_UNSAVED_INDEX_SAFETY, 0));
+}
+
void test_index_tests__empty_index(void)
{
git_index *index;
git_repository_free(repo);
}
+void test_index_tests__dirty_and_clean(void)
+{
+ git_repository *repo;
+ git_index *index;
+ git_index_entry entry = {{0}};
+
+ /* Index is not dirty after opening */
+ cl_git_pass(git_repository_init(&repo, "./myrepo", 0));
+ cl_git_pass(git_repository_index(&index, repo));
+
+ cl_assert(git_index_entrycount(index) == 0);
+ cl_assert(!git_index_is_dirty(index));
+
+ /* Index is dirty after adding an entry */
+ entry.mode = GIT_FILEMODE_BLOB;
+ entry.path = "test.txt";
+ cl_git_pass(git_index_add_frombuffer(index, &entry, "Hi.\n", 4));
+ cl_assert(git_index_entrycount(index) == 1);
+ cl_assert(git_index_is_dirty(index));
+
+ /* Index is not dirty after write */
+ cl_git_pass(git_index_write(index));
+ cl_assert(!git_index_is_dirty(index));
+
+ /* Index is dirty after removing an entry */
+ cl_git_pass(git_index_remove_bypath(index, "test.txt"));
+ cl_assert(git_index_entrycount(index) == 0);
+ cl_assert(git_index_is_dirty(index));
+
+ /* Index is not dirty after write */
+ cl_git_pass(git_index_write(index));
+ cl_assert(!git_index_is_dirty(index));
+
+ /* Index remains not dirty after read */
+ cl_git_pass(git_index_read(index, 0));
+ cl_assert(!git_index_is_dirty(index));
+
+ /* Index is dirty when we do an unforced read with dirty content */
+ cl_git_pass(git_index_add_frombuffer(index, &entry, "Hi.\n", 4));
+ cl_assert(git_index_entrycount(index) == 1);
+ cl_assert(git_index_is_dirty(index));
+
+ cl_git_pass(git_index_read(index, 0));
+ cl_assert(git_index_is_dirty(index));
+
+ /* Index is clean when we force a read with dirty content */
+ cl_git_pass(git_index_read(index, 1));
+ cl_assert(!git_index_is_dirty(index));
+
+ git_index_free(index);
+ git_repository_free(repo);
+}
+
+void test_index_tests__dirty_fails_optionally(void)
+{
+ git_repository *repo;
+ git_index *index;
+ git_index_entry entry = {{0}};
+
+ /* Index is not dirty after opening */
+ repo = cl_git_sandbox_init("testrepo");
+ cl_git_pass(git_repository_index(&index, repo));
+
+ /* Index is dirty after adding an entry */
+ entry.mode = GIT_FILEMODE_BLOB;
+ entry.path = "test.txt";
+ cl_git_pass(git_index_add_frombuffer(index, &entry, "Hi.\n", 4));
+ cl_assert(git_index_is_dirty(index));
+
+ cl_git_pass(git_checkout_head(repo, NULL));
+
+ /* Index is dirty (again) after adding an entry */
+ entry.mode = GIT_FILEMODE_BLOB;
+ entry.path = "test.txt";
+ cl_git_pass(git_index_add_frombuffer(index, &entry, "Hi.\n", 4));
+ cl_assert(git_index_is_dirty(index));
+
+ cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_UNSAVED_INDEX_SAFETY, 1));
+ cl_git_fail_with(GIT_EINDEXDIRTY, git_checkout_head(repo, NULL));
+
+ git_index_free(index);
+ cl_git_sandbox_cleanup();
+}
+
void test_index_tests__add_frombuffer_reset_entry(void)
{
git_index *index;
cl_assert(git_index_entrycount(index) == 0);
- git_buf_free(&path);
+ git_buf_dispose(&path);
git_index_free(index);
}
p_unlink(path.ptr);
cl_git_pass(git_index_remove_all(index, NULL, NULL, NULL));
- git_buf_free(&path);
+ git_buf_dispose(&path);
git_index_free(index);
git__free(fn);
}
+void test_index_tests__write_tree_invalid_unowned_index(void)
+{
+ git_index *idx;
+ git_repository *repo;
+ git_index_entry entry = {{0}};
+ git_oid tree_id;
+
+ cl_git_pass(git_index_new(&idx));
+
+ cl_git_pass(git_oid_fromstr(&entry.id, "8312e0a89a9cbab77c732b6bc39b51a783e3a318"));
+ entry.path = "foo";
+ entry.mode = GIT_FILEMODE_BLOB;
+ cl_git_pass(git_index_add(idx, &entry));
+
+ cl_git_pass(git_repository_init(&repo, "./invalid-id", 0));
+
+ cl_git_fail(git_index_write_tree_to(&tree_id, idx, repo));
+
+ git_index_free(idx);
+ git_repository_free(repo);
+
+ cl_fixture_cleanup("invalid-id");
+}
+
/* Test that writing an invalid filename fails */
void test_index_tests__write_invalid_filename(void)
{
cl_git_rewritefile("myrepo/TEST.txt", "hello again\n");
cl_git_pass(git_index_add_bypath(index, "TEST.txt"));
- if (index_caps & GIT_INDEXCAP_IGNORE_CASE)
+ if (index_caps & GIT_INDEX_CAPABILITY_IGNORE_CASE)
cl_assert_equal_i(1, (int)git_index_entrycount(index));
else
cl_assert_equal_i(2, (int)git_index_entrycount(index));
cl_assert(git__strcmp(entry->path, "test.txt") == 0);
cl_assert((entry = git_index_get_bypath(index, "TEST.txt", 0)) != NULL);
- if (index_caps & GIT_INDEXCAP_IGNORE_CASE)
+ if (index_caps & GIT_INDEX_CAPABILITY_IGNORE_CASE)
/* The path should *not* have changed without an explicit remove */
cl_assert(git__strcmp(entry->path, "test.txt") == 0);
else
error = git_index_write(index);
cl_assert_equal_i(GIT_ELOCKED, error);
- err = giterr_last();
- cl_assert_equal_i(err->klass, GITERR_INDEX);
+ err = git_error_last();
+ cl_assert_equal_i(err->klass, GIT_ERROR_INDEX);
git_filebuf_cleanup(&file);
git_index_free(index);
cl_git_pass(git_vector_verify_sorted(&index->entries));
caps = git_index_caps(index);
- cl_git_pass(git_index_set_caps(index, caps &= ~GIT_INDEXCAP_IGNORE_CASE));
+ cl_git_pass(git_index_set_caps(index, caps &= ~GIT_INDEX_CAPABILITY_IGNORE_CASE));
cl_git_pass(git_index_read(index, true));
cl_git_pass(git_vector_verify_sorted(&index->entries));
cl_assert(git_index_get_bypath(index, ".HEADER", 0));
cl_assert_equal_p(NULL, git_index_get_bypath(index, ".header", 0));
- cl_git_pass(git_index_set_caps(index, caps | GIT_INDEXCAP_IGNORE_CASE));
+ cl_git_pass(git_index_set_caps(index, caps | GIT_INDEX_CAPABILITY_IGNORE_CASE));
cl_git_pass(git_index_read(index, true));
cl_git_pass(git_vector_verify_sorted(&index->entries));
cl_assert(git_index_get_bypath(index, ".HEADER", 0));
cl_git_pass(git_vector_verify_sorted(&index->entries));
caps = git_index_caps(index);
- cl_git_pass(git_index_set_caps(index, caps &= ~GIT_INDEXCAP_IGNORE_CASE));
+ cl_git_pass(git_index_set_caps(index, caps &= ~GIT_INDEX_CAPABILITY_IGNORE_CASE));
cl_assert_equal_i(false, index->ignore_case);
cl_git_pass(git_vector_verify_sorted(&index->entries));
cl_assert(e = git_index_get_bypath(index, "src/common.h", 0));
cl_assert(e = git_index_get_bypath(index, "COPYING", 0));
cl_assert_equal_p(NULL, e = git_index_get_bypath(index, "copying", 0));
- cl_git_pass(git_index_set_caps(index, caps | GIT_INDEXCAP_IGNORE_CASE));
+ cl_git_pass(git_index_set_caps(index, caps | GIT_INDEX_CAPABILITY_IGNORE_CASE));
cl_assert_equal_i(true, index->ignore_case);
cl_git_pass(git_vector_verify_sorted(&index->entries));
cl_assert(e = git_index_get_bypath(index, "COPYING", 0));
git_index_free(index);
cl_git_sandbox_cleanup();
}
+
+void test_index_tests__can_iterate(void)
+{
+ git_index *index;
+ git_index_iterator *iterator;
+ const git_index_entry *entry;
+ size_t i, iterator_idx = 0, found = 0;
+ int ret;
+
+ cl_git_pass(git_index_open(&index, TEST_INDEX_PATH));
+ cl_git_pass(git_index_iterator_new(&iterator, index));
+
+ cl_assert(git_vector_is_sorted(&iterator->snap));
+
+ for (i = 0; i < ARRAY_SIZE(test_entries); i++) {
+ /* Advance iterator to next test entry index */
+ do {
+ ret = git_index_iterator_next(&entry, iterator);
+
+ if (ret == GIT_ITEROVER)
+ cl_fail("iterator did not contain all test entries");
+
+ cl_git_pass(ret);
+ } while (iterator_idx++ < test_entries[i].index);
+
+ cl_assert_equal_s(entry->path, test_entries[i].path);
+ cl_assert_equal_i(entry->mtime.seconds, test_entries[i].mtime);
+ cl_assert_equal_i(entry->file_size, test_entries[i].file_size);
+ found++;
+ }
+
+ while ((ret = git_index_iterator_next(&entry, iterator)) == 0)
+ ;
+
+ if (ret != GIT_ITEROVER)
+ cl_git_fail(ret);
+
+ cl_assert_equal_i(found, ARRAY_SIZE(test_entries));
+
+ git_index_iterator_free(iterator);
+ git_index_free(index);
+}
+
+void test_index_tests__can_modify_while_iterating(void)
+{
+ git_index *index;
+ git_index_iterator *iterator;
+ const git_index_entry *entry;
+ git_index_entry new_entry = {{0}};
+ size_t expected = 0, seen = 0;
+ int ret;
+
+ cl_git_pass(git_index_open(&index, TEST_INDEX_PATH));
+ cl_git_pass(git_index_iterator_new(&iterator, index));
+
+ expected = git_index_entrycount(index);
+ cl_assert(git_vector_is_sorted(&iterator->snap));
+
+ /*
+ * After we've counted the entries, add a new one and change another;
+ * ensure that our iterator is backed by a snapshot and thus returns
+ * the number of entries from when the iterator was created.
+ */
+ cl_git_pass(git_oid_fromstr(&new_entry.id, "8312e0a89a9cbab77c732b6bc39b51a783e3a318"));
+ new_entry.path = "newfile";
+ new_entry.mode = GIT_FILEMODE_BLOB;
+ cl_git_pass(git_index_add(index, &new_entry));
+
+ cl_git_pass(git_oid_fromstr(&new_entry.id, "4141414141414141414141414141414141414141"));
+ new_entry.path = "Makefile";
+ new_entry.mode = GIT_FILEMODE_BLOB;
+ cl_git_pass(git_index_add(index, &new_entry));
+
+ while (true) {
+ ret = git_index_iterator_next(&entry, iterator);
+
+ if (ret == GIT_ITEROVER)
+ break;
+
+ seen++;
+ }
+
+ cl_assert_equal_i(expected, seen);
+
+ git_index_iterator_free(iterator);
+ git_index_free(index);
+}
cl_git_pass(git_repository_index(&index, repo));
caps = git_index_caps(index);
- is_ignoring_case = ((caps & GIT_INDEXCAP_IGNORE_CASE) != 0);
+ is_ignoring_case = ((caps & GIT_INDEX_CAPABILITY_IGNORE_CASE) != 0);
if (ignore_case != is_ignoring_case)
- cl_git_pass(git_index_set_caps(index, caps ^ GIT_INDEXCAP_IGNORE_CASE));
+ cl_git_pass(git_index_set_caps(index, caps ^ GIT_INDEX_CAPABILITY_IGNORE_CASE));
i_opts.flags = 0;
i_opts.start = start;
cl_git_pass(git_buf_joinpath(&path, cl_fixture("icase"), ".gitted/CoNfIg"));
fs_is_ci = git_path_exists(path.ptr);
- git_buf_free(&path);
+ git_buf_dispose(&path);
index_iterator_test(
"icase", NULL, NULL, 0, ARRAY_SIZE(expected_index_cs),
caps = git_index_caps(index);
/* force case sensitivity */
- cl_git_pass(git_index_set_caps(index, caps & ~GIT_INDEXCAP_IGNORE_CASE));
+ cl_git_pass(git_index_set_caps(index, caps & ~GIT_INDEX_CAPABILITY_IGNORE_CASE));
/* autoexpand with no tree entries over range */
i_opts.start = "c";
git_iterator_free(i);
/* force case insensitivity */
- cl_git_pass(git_index_set_caps(index, caps | GIT_INDEXCAP_IGNORE_CASE));
+ cl_git_pass(git_index_set_caps(index, caps | GIT_INDEX_CAPABILITY_IGNORE_CASE));
/* autoexpand with no tree entries over range */
i_opts.flags = 0;
cl_git_pass(git_vector_insert(&filelist, "k/a"));
/* In this test we DO NOT force a case setting on the index. */
- default_icase = ((git_index_caps(index) & GIT_INDEXCAP_IGNORE_CASE) != 0);
+ default_icase = ((git_index_caps(index) & GIT_INDEX_CAPABILITY_IGNORE_CASE) != 0);
i_opts.pathlist.strings = (char **)filelist.contents;
i_opts.pathlist.count = filelist.length;
cl_git_pass(git_vector_insert(&filelist, "kZZZZZZZ"));
/* In this test we DO NOT force a case setting on the index. */
- default_icase = ((git_index_caps(index) & GIT_INDEXCAP_IGNORE_CASE) != 0);
+ default_icase = ((git_index_caps(index) & GIT_INDEX_CAPABILITY_IGNORE_CASE) != 0);
i_opts.pathlist.strings = (char **)filelist.contents;
i_opts.pathlist.count = filelist.length;
cl_git_pass(git_vector_insert(&filelist, "kZZZZZZZ"));
/* In this test we DO NOT force a case setting on the index. */
- default_icase = ((git_index_caps(index) & GIT_INDEXCAP_IGNORE_CASE) != 0);
+ default_icase = ((git_index_caps(index) & GIT_INDEX_CAPABILITY_IGNORE_CASE) != 0);
i_opts.pathlist.strings = (char **)filelist.contents;
i_opts.pathlist.count = filelist.length;
caps = git_index_caps(index);
/* force case sensitivity */
- cl_git_pass(git_index_set_caps(index, caps & ~GIT_INDEXCAP_IGNORE_CASE));
+ cl_git_pass(git_index_set_caps(index, caps & ~GIT_INDEX_CAPABILITY_IGNORE_CASE));
/* All indexfilelist iterator tests are "autoexpand with no tree entries" */
git_iterator_free(i);
/* force case insensitivity */
- cl_git_pass(git_index_set_caps(index, caps | GIT_INDEXCAP_IGNORE_CASE));
+ cl_git_pass(git_index_set_caps(index, caps | GIT_INDEX_CAPABILITY_IGNORE_CASE));
i_opts.start = "c";
i_opts.end = "k/D";
}
}
- git_buf_free(&fullpath);
+ git_buf_dispose(&fullpath);
}
void test_iterator_index__pathlist_for_deeply_nested_item(void)
ancestor.path = ancestor_path;
ancestor.mode = GIT_FILEMODE_BLOB;
git_oid_fromstr(&ancestor.id, "d44e18fb93b7107b5cd1b95d601591d77869a1b6");
- GIT_IDXENTRY_STAGE_SET(&ancestor, 1);
+ GIT_INDEX_ENTRY_STAGE_SET(&ancestor, 1);
ours.path = our_path;
ours.mode = GIT_FILEMODE_BLOB;
git_oid_fromstr(&ours.id, "d44e18fb93b7107b5cd1b95d601591d77869a1b6");
- GIT_IDXENTRY_STAGE_SET(&ours, 2);
+ GIT_INDEX_ENTRY_STAGE_SET(&ours, 2);
theirs.path = their_path;
theirs.mode = GIT_FILEMODE_BLOB;
git_oid_fromstr(&theirs.id, "d44e18fb93b7107b5cd1b95d601591d77869a1b6");
- GIT_IDXENTRY_STAGE_SET(&theirs, 3);
+ GIT_INDEX_ENTRY_STAGE_SET(&theirs, 3);
cl_git_pass(git_index_conflict_add(index, &ancestor, &ours, &theirs));
}
cl_git_pass(git_treebuilder_write(out, builder));
git_treebuilder_free(builder);
- git_buf_free(&name);
+ git_buf_dispose(&name);
}
void test_iterator_tree__case_conflicts_0(void)
#include "repository.h"
#include "fileops.h"
#include "../submodule/submodule_helpers.h"
+#include "../merge/merge_helpers.h"
#include "iterator_helpers.h"
#include <stdarg.h>
static void build_workdir_tree(const char *root, int dirs, int subs)
{
int i, j;
- char buf[64], sub[64];
+ char buf[64], sub[80];
for (i = 0; i < dirs; ++i) {
if (i % 2 == 0) {
cl_git_pass(git_iterator_for_filesystem(&i, "testrepo/.git/refs", NULL));
- /* should only have 13 items, since we're not asking for trees to be
+ /* should only have 16 items, since we're not asking for trees to be
* returned. the goal of this test is simply to not crash.
*/
- expect_iterator_items(i, 15, NULL, 15, NULL);
+ expect_iterator_items(i, 16, NULL, 15, NULL);
git_iterator_free(i);
- git_buf_free(&parent);
+ git_buf_dispose(&parent);
}
void test_iterator_workdir__skips_unreadable_dirs(void)
}
}
- git_buf_free(&fullpath);
+ git_buf_dispose(&fullpath);
}
void test_iterator_workdir__pathlist_for_deeply_nested_item(void)
git_vector_free(&filelist);
}
+void test_iterator_workdir__hash_when_requested(void)
+{
+ git_iterator *iter;
+ const git_index_entry *entry;
+ git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT;
+ git_oid expected_id = {{0}};
+ size_t i;
+
+ struct merge_index_entry expected[] = {
+ { 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "7c7e08f9559d9e1551b91e1cf68f1d0066109add", 0, "oyster.txt" },
+ { 0100644, "898d12687fb35be271c27c795a6b32c8b51da79e", 0, "veal.txt" },
+ };
+
+ g_repo = cl_git_sandbox_init("merge-recursive");
+
+ /* do the iteration normally, ensure there are no hashes */
+ cl_git_pass(git_iterator_for_workdir(&iter, g_repo, NULL, NULL, &iter_opts));
+
+ for (i = 0; i < sizeof(expected) / sizeof(struct merge_index_entry); i++) {
+ cl_git_pass(git_iterator_advance(&entry, iter));
+
+ cl_assert_equal_oid(&expected_id, &entry->id);
+ cl_assert_equal_s(expected[i].path, entry->path);
+ }
+ cl_assert_equal_i(GIT_ITEROVER, git_iterator_advance(&entry, iter));
+ git_iterator_free(iter);
+
+ /* do the iteration requesting hashes */
+ iter_opts.flags |= GIT_ITERATOR_INCLUDE_HASH;
+ cl_git_pass(git_iterator_for_workdir(&iter, g_repo, NULL, NULL, &iter_opts));
+
+ for (i = 0; i < sizeof(expected) / sizeof(struct merge_index_entry); i++) {
+ cl_git_pass(git_iterator_advance(&entry, iter));
+
+ cl_git_pass(git_oid_fromstr(&expected_id, expected[i].oid_str));
+ cl_assert_equal_oid(&expected_id, &entry->id);
+ cl_assert_equal_s(expected[i].path, entry->path);
+ }
+ cl_assert_equal_i(GIT_ITEROVER, git_iterator_advance(&entry, iter));
+ git_iterator_free(iter);
+}
--- /dev/null
+#include "clar.h"
+#include "clar_libgit2.h"
+
+#include "common.h"
+#include "mailmap.h"
+
+static git_mailmap *mailmap = NULL;
+
+const char TEST_MAILMAP[] =
+ "Foo bar <foo@bar.com> <foo@baz.com> \n"
+ "Blatantly invalid line\n"
+ "Foo bar <foo@bar.com> <foo@bal.com>\n"
+ "<email@foo.com> <otheremail@foo.com>\n"
+ "<email@foo.com> Other Name <yetanotheremail@foo.com>\n";
+
+struct {
+ const char *real_name;
+ const char *real_email;
+ const char *replace_name;
+ const char *replace_email;
+} expected[] = {
+ { "Foo bar", "foo@bar.com", NULL, "foo@baz.com" },
+ { "Foo bar", "foo@bar.com", NULL, "foo@bal.com" },
+ { NULL, "email@foo.com", NULL, "otheremail@foo.com" },
+ { NULL, "email@foo.com", "Other Name", "yetanotheremail@foo.com" }
+};
+
+void test_mailmap_basic__initialize(void)
+{
+ cl_git_pass(git_mailmap_from_buffer(
+ &mailmap, TEST_MAILMAP, strlen(TEST_MAILMAP)));
+}
+
+void test_mailmap_basic__cleanup(void)
+{
+ git_mailmap_free(mailmap);
+ mailmap = NULL;
+}
+
+void test_mailmap_basic__entry(void)
+{
+ size_t idx;
+ const git_mailmap_entry *entry;
+
+ /* Check that we have the expected # of entries */
+ cl_assert_equal_sz(ARRAY_SIZE(expected), git_vector_length(&mailmap->entries));
+
+ for (idx = 0; idx < ARRAY_SIZE(expected); ++idx) {
+ /* Try to look up each entry and make sure they match */
+ entry = git_mailmap_entry_lookup(
+ mailmap, expected[idx].replace_name, expected[idx].replace_email);
+
+ cl_assert(entry);
+ cl_assert_equal_s(entry->real_name, expected[idx].real_name);
+ cl_assert_equal_s(entry->real_email, expected[idx].real_email);
+ cl_assert_equal_s(entry->replace_name, expected[idx].replace_name);
+ cl_assert_equal_s(entry->replace_email, expected[idx].replace_email);
+ }
+}
+
+void test_mailmap_basic__lookup_not_found(void)
+{
+ const git_mailmap_entry *entry = git_mailmap_entry_lookup(
+ mailmap, "Whoever", "doesnotexist@fo.com");
+ cl_assert(!entry);
+}
+
+void test_mailmap_basic__lookup(void)
+{
+ const git_mailmap_entry *entry = git_mailmap_entry_lookup(
+ mailmap, "Typoed the name once", "foo@baz.com");
+ cl_assert(entry);
+ cl_assert_equal_s(entry->real_name, "Foo bar");
+}
+
+void test_mailmap_basic__empty_email_query(void)
+{
+ const char *name;
+ const char *email;
+ cl_git_pass(git_mailmap_resolve(
+ &name, &email, mailmap, "Author name", "otheremail@foo.com"));
+ cl_assert_equal_s(name, "Author name");
+ cl_assert_equal_s(email, "email@foo.com");
+}
+
+void test_mailmap_basic__name_matching(void)
+{
+ const char *name;
+ const char *email;
+ cl_git_pass(git_mailmap_resolve(
+ &name, &email, mailmap, "Other Name", "yetanotheremail@foo.com"));
+
+ cl_assert_equal_s(name, "Other Name");
+ cl_assert_equal_s(email, "email@foo.com");
+
+ cl_git_pass(git_mailmap_resolve(
+ &name, &email, mailmap,
+ "Other Name That Doesn't Match", "yetanotheremail@foo.com"));
+ cl_assert_equal_s(name, "Other Name That Doesn't Match");
+ cl_assert_equal_s(email, "yetanotheremail@foo.com");
+}
--- /dev/null
+#include "clar_libgit2.h"
+#include "git2/repository.h"
+#include "git2/blame.h"
+#include "mailmap.h"
+#include "mailmap_testdata.h"
+
+static git_repository *g_repo;
+static git_blame *g_blame;
+
+void test_mailmap_blame__initialize(void)
+{
+ g_repo = NULL;
+ g_blame = NULL;
+}
+
+void test_mailmap_blame__cleanup(void)
+{
+ git_blame_free(g_blame);
+ cl_git_sandbox_cleanup();
+}
+
+void test_mailmap_blame__hunks(void)
+{
+ size_t idx = 0;
+ const git_blame_hunk *hunk = NULL;
+ git_blame_options opts = GIT_BLAME_OPTIONS_INIT;
+
+ g_repo = cl_git_sandbox_init("mailmap");
+
+ opts.flags |= GIT_BLAME_USE_MAILMAP;
+
+ cl_git_pass(git_blame_file(&g_blame, g_repo, "file.txt", &opts));
+ cl_assert(g_blame);
+
+ for (idx = 0; idx < ARRAY_SIZE(resolved); ++idx) {
+ hunk = git_blame_get_hunk_byline(g_blame, idx + 1);
+
+ cl_assert(hunk->final_signature != NULL);
+ cl_assert(hunk->orig_signature != NULL);
+ cl_assert_equal_s(hunk->final_signature->name, resolved[idx].real_name);
+ cl_assert_equal_s(hunk->final_signature->email, resolved[idx].real_email);
+ }
+}
+
+void test_mailmap_blame__hunks_no_mailmap(void)
+{
+ size_t idx = 0;
+ const git_blame_hunk *hunk = NULL;
+ git_blame_options opts = GIT_BLAME_OPTIONS_INIT;
+
+ g_repo = cl_git_sandbox_init("mailmap");
+
+ cl_git_pass(git_blame_file(&g_blame, g_repo, "file.txt", &opts));
+ cl_assert(g_blame);
+
+ for (idx = 0; idx < ARRAY_SIZE(resolved); ++idx) {
+ hunk = git_blame_get_hunk_byline(g_blame, idx + 1);
+
+ cl_assert(hunk->final_signature != NULL);
+ cl_assert(hunk->orig_signature != NULL);
+ cl_assert_equal_s(hunk->final_signature->name, resolved[idx].replace_name);
+ cl_assert_equal_s(hunk->final_signature->email, resolved[idx].replace_email);
+ }
+}
--- /dev/null
+#include "mailmap.h"
+
+typedef struct mailmap_entry {
+ const char *real_name;
+ const char *real_email;
+ const char *replace_name;
+ const char *replace_email;
+} mailmap_entry;
+
+static const mailmap_entry resolved[] = {
+ { "Brad", "cto@company.xx", "Brad", "cto@coompany.xx" },
+ { "Brad L", "cto@company.xx", "Brad L", "cto@coompany.xx" },
+ { "Some Dude", "some@dude.xx", "nick1", "bugs@company.xx" },
+ { "Other Author", "other@author.xx", "nick2", "bugs@company.xx" },
+ { "nick3", "bugs@company.xx", "nick3", "bugs@company.xx" },
+ { "Other Author", "other@author.xx", "Some Garbage", "nick2@company.xx" },
+ { "Phil Hill", "phil@company.xx", "unknown", "phil@company.xx" },
+ { "Joseph", "joseph@company.xx", "Joseph", "bugs@company.xx" },
+ { "Santa Claus", "santa.claus@northpole.xx", "Clause", "me@company.xx" },
+ { "Charles", "charles@charles.xx", "Charles", "charles@charles.xx" }
+};
--- /dev/null
+#include "clar_libgit2.h"
+#include "repository.h"
+#include "git2/sys/repository.h"
+#include "mailmap_testdata.h"
+#include "buf_text.h"
+
+static git_repository *g_repo;
+static git_mailmap *g_mailmap;
+static git_config *g_config;
+
+static const char string_mailmap[] =
+ "# Simple Comment line\n"
+ "<cto@company.xx> <cto@coompany.xx>\n"
+ "Some Dude <some@dude.xx> nick1 <bugs@company.xx>\n"
+ "Other Author <other@author.xx> nick2 <bugs@company.xx>\n"
+ "Other Author <other@author.xx> <nick2@company.xx>\n"
+ "Phil Hill <phil@company.xx> # Comment at end of line\n"
+ "<joseph@company.xx> Joseph <bugs@company.xx>\n"
+ "Santa Claus <santa.claus@northpole.xx> <me@company.xx>\n"
+ "Untracked <untracked@company.xx>";
+
+static const mailmap_entry entries[] = {
+ { NULL, "cto@company.xx", NULL, "cto@coompany.xx" },
+ { "Some Dude", "some@dude.xx", "nick1", "bugs@company.xx" },
+ { "Other Author", "other@author.xx", "nick2", "bugs@company.xx" },
+ { "Other Author", "other@author.xx", NULL, "nick2@company.xx" },
+ { "Phil Hill", NULL, NULL, "phil@company.xx" },
+ { NULL, "joseph@company.xx", "Joseph", "bugs@company.xx" },
+ { "Santa Claus", "santa.claus@northpole.xx", NULL, "me@company.xx" },
+ /* This entry isn't in the bare repository */
+ { "Untracked", NULL, NULL, "untracked@company.xx" }
+};
+
+void test_mailmap_parsing__initialize(void)
+{
+ g_repo = NULL;
+ g_mailmap = NULL;
+ g_config = NULL;
+}
+
+void test_mailmap_parsing__cleanup(void)
+{
+ git_mailmap_free(g_mailmap);
+ git_config_free(g_config);
+ cl_git_sandbox_cleanup();
+}
+
+static void check_mailmap_entries(
+ const git_mailmap *mailmap, const mailmap_entry *entries, size_t entries_size)
+{
+ const git_mailmap_entry *parsed;
+ size_t idx;
+
+ /* Check the correct # of entries were parsed */
+ cl_assert_equal_sz(entries_size, git_vector_length(&mailmap->entries));
+
+ /* Make sure looking up each entry succeeds */
+ for (idx = 0; idx < entries_size; ++idx) {
+ parsed = git_mailmap_entry_lookup(
+ mailmap, entries[idx].replace_name, entries[idx].replace_email);
+
+ cl_assert(parsed);
+ cl_assert_equal_s(parsed->real_name, entries[idx].real_name);
+ cl_assert_equal_s(parsed->real_email, entries[idx].real_email);
+ cl_assert_equal_s(parsed->replace_name, entries[idx].replace_name);
+ cl_assert_equal_s(parsed->replace_email, entries[idx].replace_email);
+ }
+}
+
+static void check_mailmap_resolve(
+ const git_mailmap *mailmap, const mailmap_entry *resolved, size_t resolved_size)
+{
+ const char *resolved_name = NULL;
+ const char *resolved_email = NULL;
+ size_t idx;
+
+ /* Check that the resolver behaves correctly */
+ for (idx = 0; idx < resolved_size; ++idx) {
+ cl_git_pass(git_mailmap_resolve(
+ &resolved_name, &resolved_email, mailmap,
+ resolved[idx].replace_name, resolved[idx].replace_email));
+ cl_assert_equal_s(resolved_name, resolved[idx].real_name);
+ cl_assert_equal_s(resolved_email, resolved[idx].real_email);
+ }
+}
+
+static const mailmap_entry resolved_untracked[] = {
+ { "Untracked", "untracked@company.xx", "xx", "untracked@company.xx" }
+};
+
+void test_mailmap_parsing__string(void)
+{
+ cl_git_pass(git_mailmap_from_buffer(
+ &g_mailmap, string_mailmap, strlen(string_mailmap)));
+
+ /* We should have parsed all of the entries */
+ check_mailmap_entries(g_mailmap, entries, ARRAY_SIZE(entries));
+
+ /* Check that resolving the entries works */
+ check_mailmap_resolve(g_mailmap, resolved, ARRAY_SIZE(resolved));
+ check_mailmap_resolve(
+ g_mailmap, resolved_untracked, ARRAY_SIZE(resolved_untracked));
+}
+
+void test_mailmap_parsing__windows_string(void)
+{
+ git_buf unixbuf = GIT_BUF_INIT;
+ git_buf winbuf = GIT_BUF_INIT;
+
+ /* Parse with windows-style line endings */
+ git_buf_attach_notowned(&unixbuf, string_mailmap, strlen(string_mailmap));
+ cl_git_pass(git_buf_text_lf_to_crlf(&winbuf, &unixbuf));
+
+ cl_git_pass(git_mailmap_from_buffer(&g_mailmap, winbuf.ptr, winbuf.size));
+ git_buf_dispose(&winbuf);
+
+ /* We should have parsed all of the entries */
+ check_mailmap_entries(g_mailmap, entries, ARRAY_SIZE(entries));
+
+ /* Check that resolving the entries works */
+ check_mailmap_resolve(g_mailmap, resolved, ARRAY_SIZE(resolved));
+ check_mailmap_resolve(
+ g_mailmap, resolved_untracked, ARRAY_SIZE(resolved_untracked));
+}
+
+void test_mailmap_parsing__fromrepo(void)
+{
+ g_repo = cl_git_sandbox_init("mailmap");
+ cl_check(!git_repository_is_bare(g_repo));
+
+ cl_git_pass(git_mailmap_from_repository(&g_mailmap, g_repo));
+
+ /* We should have parsed all of the entries */
+ check_mailmap_entries(g_mailmap, entries, ARRAY_SIZE(entries));
+
+ /* Check that resolving the entries works */
+ check_mailmap_resolve(g_mailmap, resolved, ARRAY_SIZE(resolved));
+ check_mailmap_resolve(
+ g_mailmap, resolved_untracked, ARRAY_SIZE(resolved_untracked));
+}
+
+static const mailmap_entry resolved_bare[] = {
+ { "xx", "untracked@company.xx", "xx", "untracked@company.xx" }
+};
+
+void test_mailmap_parsing__frombare(void)
+{
+ g_repo = cl_git_sandbox_init("mailmap/.gitted");
+ cl_git_pass(git_repository_set_bare(g_repo));
+ cl_check(git_repository_is_bare(g_repo));
+
+ cl_git_pass(git_mailmap_from_repository(&g_mailmap, g_repo));
+
+ /* We should have parsed all of the entries, except for the untracked one */
+ check_mailmap_entries(g_mailmap, entries, ARRAY_SIZE(entries) - 1);
+
+ /* Check that resolving the entries works */
+ check_mailmap_resolve(g_mailmap, resolved, ARRAY_SIZE(resolved));
+ check_mailmap_resolve(
+ g_mailmap, resolved_bare, ARRAY_SIZE(resolved_bare));
+}
+
+static const mailmap_entry resolved_with_file_override[] = {
+ { "Brad", "cto@company.xx", "Brad", "cto@coompany.xx" },
+ { "Brad L", "cto@company.xx", "Brad L", "cto@coompany.xx" },
+ { "Some Dude", "some@dude.xx", "nick1", "bugs@company.xx" },
+ { "Other Author", "other@author.xx", "nick2", "bugs@company.xx" },
+ { "nick3", "bugs@company.xx", "nick3", "bugs@company.xx" },
+ { "Other Author", "other@author.xx", "Some Garbage", "nick2@company.xx" },
+ { "Joseph", "joseph@company.xx", "Joseph", "bugs@company.xx" },
+ { "Santa Claus", "santa.claus@northpole.xx", "Clause", "me@company.xx" },
+ { "Charles", "charles@charles.xx", "Charles", "charles@charles.xx" },
+
+ /* This name is overridden by file_override */
+ { "File Override", "phil@company.xx", "unknown", "phil@company.xx" },
+ { "Other Name", "fileoverridename@company.xx", "override", "fileoverridename@company.xx" }
+};
+
+void test_mailmap_parsing__file_config(void)
+{
+ g_repo = cl_git_sandbox_init("mailmap");
+ cl_git_pass(git_repository_config(&g_config, g_repo));
+
+ cl_git_pass(git_config_set_string(
+ g_config, "mailmap.file", cl_fixture("mailmap/file_override")));
+
+ cl_git_pass(git_mailmap_from_repository(&g_mailmap, g_repo));
+
+ /* Check we don't have duplicate entries */
+ cl_assert_equal_sz(git_vector_length(&g_mailmap->entries), 9);
+
+ /* Check that resolving the entries works */
+ check_mailmap_resolve(
+ g_mailmap, resolved_with_file_override,
+ ARRAY_SIZE(resolved_with_file_override));
+}
+
+static const mailmap_entry resolved_with_blob_override[] = {
+ { "Brad", "cto@company.xx", "Brad", "cto@coompany.xx" },
+ { "Brad L", "cto@company.xx", "Brad L", "cto@coompany.xx" },
+ { "Some Dude", "some@dude.xx", "nick1", "bugs@company.xx" },
+ { "Other Author", "other@author.xx", "nick2", "bugs@company.xx" },
+ { "nick3", "bugs@company.xx", "nick3", "bugs@company.xx" },
+ { "Other Author", "other@author.xx", "Some Garbage", "nick2@company.xx" },
+ { "Joseph", "joseph@company.xx", "Joseph", "bugs@company.xx" },
+ { "Santa Claus", "santa.claus@northpole.xx", "Clause", "me@company.xx" },
+ { "Charles", "charles@charles.xx", "Charles", "charles@charles.xx" },
+
+ /* This name is overridden by blob_override */
+ { "Blob Override", "phil@company.xx", "unknown", "phil@company.xx" },
+ { "Other Name", "bloboverridename@company.xx", "override", "bloboverridename@company.xx" }
+};
+
+void test_mailmap_parsing__blob_config(void)
+{
+ g_repo = cl_git_sandbox_init("mailmap");
+ cl_git_pass(git_repository_config(&g_config, g_repo));
+
+ cl_git_pass(git_config_set_string(
+ g_config, "mailmap.blob", "HEAD:blob_override"));
+
+ cl_git_pass(git_mailmap_from_repository(&g_mailmap, g_repo));
+
+ /* Check we don't have duplicate entries */
+ cl_assert_equal_sz(git_vector_length(&g_mailmap->entries), 9);
+
+ /* Check that resolving the entries works */
+ check_mailmap_resolve(
+ g_mailmap, resolved_with_blob_override,
+ ARRAY_SIZE(resolved_with_blob_override));
+}
+
+static const mailmap_entry bare_resolved_with_blob_override[] = {
+ /* As mailmap.blob is set, we won't load HEAD:.mailmap */
+ { "Brad", "cto@coompany.xx", "Brad", "cto@coompany.xx" },
+ { "Brad L", "cto@coompany.xx", "Brad L", "cto@coompany.xx" },
+ { "nick1", "bugs@company.xx", "nick1", "bugs@company.xx" },
+ { "nick2", "bugs@company.xx", "nick2", "bugs@company.xx" },
+ { "nick3", "bugs@company.xx", "nick3", "bugs@company.xx" },
+ { "Some Garbage", "nick2@company.xx", "Some Garbage", "nick2@company.xx" },
+ { "Joseph", "bugs@company.xx", "Joseph", "bugs@company.xx" },
+ { "Clause", "me@company.xx", "Clause", "me@company.xx" },
+ { "Charles", "charles@charles.xx", "Charles", "charles@charles.xx" },
+
+ /* This name is overridden by blob_override */
+ { "Blob Override", "phil@company.xx", "unknown", "phil@company.xx" },
+ { "Other Name", "bloboverridename@company.xx", "override", "bloboverridename@company.xx" }
+};
+
+void test_mailmap_parsing__bare_blob_config(void)
+{
+ g_repo = cl_git_sandbox_init("mailmap/.gitted");
+ cl_git_pass(git_repository_set_bare(g_repo));
+ cl_check(git_repository_is_bare(g_repo));
+
+ cl_git_pass(git_repository_config(&g_config, g_repo));
+
+ cl_git_pass(git_config_set_string(
+ g_config, "mailmap.blob", "HEAD:blob_override"));
+
+ cl_git_pass(git_mailmap_from_repository(&g_mailmap, g_repo));
+
+ /* Check that we only have the 2 entries */
+ cl_assert_equal_sz(git_vector_length(&g_mailmap->entries), 2);
+
+ /* Check that resolving the entries works */
+ check_mailmap_resolve(
+ g_mailmap, bare_resolved_with_blob_override,
+ ARRAY_SIZE(bare_resolved_with_blob_override));
+}
#endif
{
int res;
+ char *at_exit_cmd;
clar_test_init(argc, argv);
cl_global_trace_disable();
git_libgit2_shutdown();
+ at_exit_cmd = getenv("CLAR_AT_EXIT");
+ if (at_exit_cmd != NULL) {
+ int at_exit = system(at_exit_cmd);
+ return res || at_exit;
+ }
+
return res;
}
--- /dev/null
+#include "clar_libgit2.h"
+
+
+static git_repository *g_repo;
+
+void test_merge_annotated_commit__initialize(void)
+{
+ g_repo = cl_git_sandbox_init("testrepo");
+}
+
+void test_merge_annotated_commit__cleanup(void)
+{
+ cl_git_sandbox_cleanup();
+}
+
+void test_merge_annotated_commit__lookup_annotated_tag(void)
+{
+ git_annotated_commit *commit;
+ git_reference *ref;
+
+ cl_git_pass(git_reference_lookup(&ref, g_repo, "refs/tags/test"));
+ cl_git_pass(git_annotated_commit_from_ref(&commit, g_repo, ref));
+
+ git_annotated_commit_free(commit);
+ git_reference_free(ref);
+}
cl_assert(!git_buf_oom(&line));
cl_git_mkfile(TEST_REPO_PATH "/.gitattributes", line.ptr);
- git_buf_free(&line);
+ git_buf_dispose(&line);
}
static void merge_branch(void)
static git_repository *repo;
static git_index *repo_index;
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_merge_files__initialize(void)
{
git_config *cfg;
error = git_merge_trees(index, repo, ancestor_tree, our_tree, their_tree, opts);
- git_buf_free(&branch_buf);
+ git_buf_dispose(&branch_buf);
git_tree_free(our_tree);
git_tree_free(their_tree);
git_tree_free(ancestor_tree);
error = git_merge_commits(index, repo, our_commit, their_commit, opts);
- git_buf_free(&branch_buf);
+ git_buf_dispose(&branch_buf);
git_commit_free(our_commit);
git_commit_free(their_commit);
return 0;
}
- git_buf_free(&wd);
+ git_buf_dispose(&wd);
return 1;
}
"", \
"5c3b68a71fc4fa5d362fd3875e53137c6a5ab7a5" }
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_merge_trees_automerge__initialize(void)
{
repo = cl_git_sandbox_init(TEST_REPO_PATH);
cl_assert((entry = git_index_get_bypath(index, "automergeable.txt", 0)) != NULL);
cl_assert(entry->file_size == strlen(AUTOMERGEABLE_MERGED_FILE));
- cl_git_pass(git_object_lookup((git_object **)&blob, repo, &entry->id, GIT_OBJ_BLOB));
+ cl_git_pass(git_object_lookup((git_object **)&blob, repo, &entry->id, GIT_OBJECT_BLOB));
cl_assert(memcmp(git_blob_rawcontent(blob), AUTOMERGEABLE_MERGED_FILE, (size_t)entry->file_size) == 0);
git_index_free(index);
cl_assert((entry = git_index_get_bypath(index, "automergeable.txt", 0)) != NULL);
cl_assert(entry->file_size == strlen(AUTOMERGEABLE_MERGED_FILE));
- cl_git_pass(git_object_lookup((git_object **)&blob, repo, &entry->id, GIT_OBJ_BLOB));
+ cl_git_pass(git_object_lookup((git_object **)&blob, repo, &entry->id, GIT_OBJECT_BLOB));
cl_assert(memcmp(git_blob_rawcontent(blob), AUTOMERGEABLE_MERGED_FILE, (size_t)entry->file_size) == 0);
git_index_free(index);
opts.flags |= GIT_MERGE_FAIL_ON_CONFLICT;
- cl_git_fail_with(GIT_EMERGECONFLICT,
+ cl_git_fail_with(GIT_EMERGECONFLICT,
merge_trees_from_branches(&index, repo, "df_side1", "df_side2", &opts));
- cl_git_fail_with(GIT_EMERGECONFLICT,
+ cl_git_fail_with(GIT_EMERGECONFLICT,
merge_commits_from_branches(&index, repo, "master", "unrelated", &opts));
- cl_git_fail_with(GIT_EMERGECONFLICT,
+ cl_git_fail_with(GIT_EMERGECONFLICT,
merge_commits_from_branches(&index, repo, "master", "branch", &opts));
}
#define DF_SIDE1_BRANCH "df_side1"
#define DF_SIDE2_BRANCH "df_side2"
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_merge_trees_modeconflict__initialize(void)
{
repo = cl_git_sandbox_init(TEST_REPO_PATH);
#define BRANCH_RENAME_OURS "rename_conflict_ours"
#define BRANCH_RENAME_THEIRS "rename_conflict_theirs"
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_merge_trees_renames__initialize(void)
{
repo = cl_git_sandbox_init(TEST_REPO_PATH);
#define TEST_INDEX_PATH TEST_REPO_PATH "/.git/index"
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_merge_trees_trivial__initialize(void)
{
repo = cl_git_sandbox_init(TEST_REPO_PATH);
cl_git_pass(git_merge_trees(index, repo, ancestor_tree, our_tree, their_tree, &opts));
- git_buf_free(&branch_buf);
+ git_buf_dispose(&branch_buf);
git_tree_free(our_tree);
git_tree_free(their_tree);
git_tree_free(ancestor_tree);
#define BRANCH_A_CHANGE "branch_a_change"
#define BRANCH_B_CHANGE "branch_b_change"
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_merge_trees_whitespace__initialize(void)
{
repo = cl_git_sandbox_init(TEST_REPO_PATH);
#define NOFASTFORWARD_ID "7cb63eed597130ba4abb87b3e544b85021905520"
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_merge_workdir_analysis__initialize(void)
{
repo = cl_git_sandbox_init(TEST_REPO_PATH);
static void analysis_from_branch(
git_merge_analysis_t *merge_analysis,
git_merge_preference_t *merge_pref,
- const char *branchname)
+ const char *our_branchname,
+ const char *their_branchname)
{
- git_buf refname = GIT_BUF_INIT;
+ git_buf our_refname = GIT_BUF_INIT;
+ git_buf their_refname = GIT_BUF_INIT;
+ git_reference *our_ref;
git_reference *their_ref;
git_annotated_commit *their_head;
- git_buf_printf(&refname, "%s%s", GIT_REFS_HEADS_DIR, branchname);
+ if (our_branchname != NULL) {
+ cl_git_pass(git_buf_printf(&our_refname, "%s%s", GIT_REFS_HEADS_DIR, our_branchname));
+ cl_git_pass(git_reference_lookup(&our_ref, repo, git_buf_cstr(&our_refname)));
+ } else {
+ cl_git_pass(git_reference_lookup(&our_ref, repo, GIT_HEAD_FILE));
+ }
- cl_git_pass(git_reference_lookup(&their_ref, repo, git_buf_cstr(&refname)));
+ cl_git_pass(git_buf_printf(&their_refname, "%s%s", GIT_REFS_HEADS_DIR, their_branchname));
+
+ cl_git_pass(git_reference_lookup(&their_ref, repo, git_buf_cstr(&their_refname)));
cl_git_pass(git_annotated_commit_from_ref(&their_head, repo, their_ref));
- cl_git_pass(git_merge_analysis(merge_analysis, merge_pref, repo, (const git_annotated_commit **)&their_head, 1));
+ cl_git_pass(git_merge_analysis_for_ref(merge_analysis, merge_pref, repo, our_ref, (const git_annotated_commit **)&their_head, 1));
- git_buf_free(&refname);
+ git_buf_dispose(&our_refname);
+ git_buf_dispose(&their_refname);
git_annotated_commit_free(their_head);
+ git_reference_free(our_ref);
git_reference_free(their_ref);
}
git_merge_analysis_t merge_analysis;
git_merge_preference_t merge_pref;
- analysis_from_branch(&merge_analysis, &merge_pref, FASTFORWARD_BRANCH);
- cl_assert_equal_i(GIT_MERGE_ANALYSIS_FASTFORWARD, (merge_analysis & GIT_MERGE_ANALYSIS_FASTFORWARD));
- cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, (merge_analysis & GIT_MERGE_ANALYSIS_NORMAL));
+ analysis_from_branch(&merge_analysis, &merge_pref, NULL, FASTFORWARD_BRANCH);
+ cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL|GIT_MERGE_ANALYSIS_FASTFORWARD, merge_analysis);
}
void test_merge_workdir_analysis__no_fastforward(void)
git_merge_analysis_t merge_analysis;
git_merge_preference_t merge_pref;
- analysis_from_branch(&merge_analysis, &merge_pref, NOFASTFORWARD_BRANCH);
+ analysis_from_branch(&merge_analysis, &merge_pref, NULL, NOFASTFORWARD_BRANCH);
cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, merge_analysis);
}
git_merge_analysis_t merge_analysis;
git_merge_preference_t merge_pref;
- analysis_from_branch(&merge_analysis, &merge_pref, UPTODATE_BRANCH);
+ analysis_from_branch(&merge_analysis, &merge_pref, NULL, UPTODATE_BRANCH);
cl_assert_equal_i(GIT_MERGE_ANALYSIS_UP_TO_DATE, merge_analysis);
}
git_merge_analysis_t merge_analysis;
git_merge_preference_t merge_pref;
- analysis_from_branch(&merge_analysis, &merge_pref, PREVIOUS_BRANCH);
+ analysis_from_branch(&merge_analysis, &merge_pref, NULL, PREVIOUS_BRANCH);
cl_assert_equal_i(GIT_MERGE_ANALYSIS_UP_TO_DATE, merge_analysis);
}
git_buf_joinpath(&master, git_repository_path(repo), "refs/heads/master");
p_unlink(git_buf_cstr(&master));
- analysis_from_branch(&merge_analysis, &merge_pref, NOFASTFORWARD_BRANCH);
- cl_assert_equal_i(GIT_MERGE_ANALYSIS_FASTFORWARD, (merge_analysis & GIT_MERGE_ANALYSIS_FASTFORWARD));
- cl_assert_equal_i(GIT_MERGE_ANALYSIS_UNBORN, (merge_analysis & GIT_MERGE_ANALYSIS_UNBORN));
+ analysis_from_branch(&merge_analysis, &merge_pref, NULL, NOFASTFORWARD_BRANCH);
+ cl_assert_equal_i(GIT_MERGE_ANALYSIS_FASTFORWARD|GIT_MERGE_ANALYSIS_UNBORN, merge_analysis);
- git_buf_free(&master);
+ git_buf_dispose(&master);
}
void test_merge_workdir_analysis__fastforward_with_config_noff(void)
git_repository_config(&config, repo);
git_config_set_string(config, "merge.ff", "false");
- analysis_from_branch(&merge_analysis, &merge_pref, FASTFORWARD_BRANCH);
- cl_assert_equal_i(GIT_MERGE_ANALYSIS_FASTFORWARD, (merge_analysis & GIT_MERGE_ANALYSIS_FASTFORWARD));
- cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, (merge_analysis & GIT_MERGE_ANALYSIS_NORMAL));
+ analysis_from_branch(&merge_analysis, &merge_pref, NULL, FASTFORWARD_BRANCH);
+ cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL|GIT_MERGE_ANALYSIS_FASTFORWARD, merge_analysis);
+
cl_assert_equal_i(GIT_MERGE_PREFERENCE_NO_FASTFORWARD, (merge_pref & GIT_MERGE_PREFERENCE_NO_FASTFORWARD));
}
git_repository_config(&config, repo);
git_config_set_string(config, "merge.ff", "only");
- analysis_from_branch(&merge_analysis, &merge_pref, NOFASTFORWARD_BRANCH);
- cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, (merge_analysis & GIT_MERGE_ANALYSIS_NORMAL));
+ analysis_from_branch(&merge_analysis, &merge_pref, NULL, NOFASTFORWARD_BRANCH);
+ cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, merge_analysis);
+
cl_assert_equal_i(GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY, (merge_pref & GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY));
}
+
+void test_merge_workdir_analysis__between_uptodate_refs(void)
+{
+ git_merge_analysis_t merge_analysis;
+ git_merge_preference_t merge_pref;
+
+ analysis_from_branch(&merge_analysis, &merge_pref, NOFASTFORWARD_BRANCH, PREVIOUS_BRANCH);
+ cl_assert_equal_i(GIT_MERGE_ANALYSIS_UP_TO_DATE, merge_analysis);
+}
+
+void test_merge_workdir_analysis__between_noff_refs(void)
+{
+ git_merge_analysis_t merge_analysis;
+ git_merge_preference_t merge_pref;
+
+ analysis_from_branch(&merge_analysis, &merge_pref, "branch", FASTFORWARD_BRANCH);
+ cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, merge_analysis);
+}
cl_git_mkfile(path.ptr, content.ptr);
}
- git_buf_free(&path);
- git_buf_free(&content);
+ git_buf_dispose(&path);
+ git_buf_dispose(&content);
}
static void hack_index(char *files[])
entry->file_size = (uint32_t)statbuf.st_size;
}
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
static void stage_random_files(char *files[])
size_t i;
cl_git_pass(git_repository_head(&head, repo));
- cl_git_pass(git_reference_peel(&head_object, head, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel(&head_object, head, GIT_OBJECT_COMMIT));
cl_git_pass(git_reset(repo, head_object, GIT_RESET_HARD, NULL));
for (i = 0, filename = content[i], text = content[++i];
git_object_free(head_object);
git_reference_free(head);
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
static int merge_dirty_files(char *dirty_files[])
int error;
cl_git_pass(git_repository_head(&head, repo));
- cl_git_pass(git_reference_peel(&head_object, head, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel(&head_object, head, GIT_OBJECT_COMMIT));
cl_git_pass(git_reset(repo, head_object, GIT_RESET_HARD, NULL));
write_files(dirty_files);
int error;
cl_git_pass(git_repository_head(&head, repo));
- cl_git_pass(git_reference_peel(&head_object, head, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel(&head_object, head, GIT_OBJECT_COMMIT));
cl_git_pass(git_reset(repo, head_object, GIT_RESET_HARD, NULL));
/* Emulate checkout with a broken or misconfigured filter: modify some
}
static int merge_staged_files(char *staged_files[])
-{
+{
stage_random_files(staged_files);
return merge_branch();
}
git_object *head_object;
cl_git_pass(git_repository_head(&head, repo));
- cl_git_pass(git_reference_peel(&head_object, head, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel(&head_object, head, GIT_OBJECT_COMMIT));
cl_git_pass(git_reset(repo, head_object, GIT_RESET_HARD, NULL));
cl_git_pass(p_unlink("merge-resolve/unchanged.txt"));
size_t i;
set_core_autocrlf_to(repo, false);
-
+
for (i = 0, content = result_contents[i]; content[0]; content = result_contents[++i]) {
stage_content(content);
- git_index_write(repo_index);
+ cl_git_pass(git_index_write(repo_index));
cl_git_pass(merge_branch());
}
}
cl_assert_equal_s(CONFLICTING_RECURSIVE_F1_TO_F2, conflicting_buf.ptr);
git_index_free(index);
- git_buf_free(&conflicting_buf);
+ git_buf_dispose(&conflicting_buf);
}
void test_merge_workdir_recursive__conflicting_merge_base_with_diff3(void)
cl_assert_equal_s(CONFLICTING_RECURSIVE_H2_TO_H1_WITH_DIFF3, conflicting_buf.ptr);
git_index_free(index);
- git_buf_free(&conflicting_buf);
+ git_buf_dispose(&conflicting_buf);
}
#define BRANCH_RENAME_OURS "rename_conflict_ours"
#define BRANCH_RENAME_THEIRS "rename_conflict_theirs"
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_merge_workdir_renames__initialize(void)
{
git_config *cfg;
#define OCTO5_BRANCH "octo5"
#define OCTO5_OID "e4f618a2c3ed0669308735727df5ebf2447f022f"
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_merge_workdir_setup__initialize(void)
{
repo = cl_git_sandbox_init(TEST_REPO_PATH);
cl_git_pass(git_futils_readbuffer(&file_buf, file_path_buf.ptr));
equals = (strcmp(file_buf.ptr, expected) == 0);
- git_buf_free(&file_path_buf);
- git_buf_free(&file_buf);
+ git_buf_dispose(&file_path_buf);
+ git_buf_dispose(&file_buf);
return equals;
}
filename);
cl_git_rewritefile(file_path_buf.ptr, output);
- git_buf_free(&file_path_buf);
+ git_buf_dispose(&file_path_buf);
}
/* git merge --no-ff octo1 */
cl_git_rewritefile(git_buf_cstr(&filename), git_buf_cstr(&data));
done:
- git_buf_free(&remotes_path);
- git_buf_free(&origin_path);
- git_buf_free(&filename);
- git_buf_free(&data);
+ git_buf_dispose(&remotes_path);
+ git_buf_dispose(&origin_path);
+ git_buf_dispose(&filename);
+ git_buf_dispose(&data);
return error;
}
"5c3b68a71fc4fa5d362fd3875e53137c6a5ab7a5" }
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_merge_workdir_simple__initialize(void)
{
git_config *cfg;
cl_git_pass(git_futils_readbuffer(&automergeable_buf,
TEST_REPO_PATH "/automergeable.txt"));
cl_assert(strcmp(automergeable_buf.ptr, AUTOMERGEABLE_MERGED_FILE) == 0);
- git_buf_free(&automergeable_buf);
+ git_buf_dispose(&automergeable_buf);
cl_assert(merge_test_index(repo_index, merge_index_entries, 8));
cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3));
git_index_free(index);
}
+void test_merge_workdir_simple__index_reload(void)
+{
+ git_repository *tmp_repo;
+ git_annotated_commit *their_heads[1];
+ git_oid their_oid;
+ git_index_entry entry = {{0}};
+ git_index *tmp_index;
+
+ cl_git_pass(git_repository_open(&tmp_repo, git_repository_workdir(repo)));
+ cl_git_pass(git_repository_index(&tmp_index, tmp_repo));
+ cl_git_pass(git_index_read(repo_index, 0));
+
+ entry.mode = GIT_FILEMODE_BLOB;
+ cl_git_pass(git_oid_fromstr(&entry.id, "11deab00b2d3a6f5a3073988ac050c2d7b6655e2"));
+ entry.path = "automergeable.txt";
+ cl_git_pass(git_index_add(repo_index, &entry));
+
+ cl_git_pass(git_index_add_bypath(tmp_index, "automergeable.txt"));
+ cl_git_pass(git_index_write(tmp_index));
+
+ cl_git_pass(git_oid_fromstr(&their_oid, THEIRS_SIMPLE_OID));
+ cl_git_pass(git_annotated_commit_lookup(&their_heads[0], repo, &their_oid));
+ cl_git_pass(git_merge(repo, (const git_annotated_commit **)their_heads, 1, NULL, NULL));
+
+ git_index_free(tmp_index);
+ git_repository_free(tmp_repo);
+ git_annotated_commit_free(their_heads[0]);
+}
+
void test_merge_workdir_simple__automerge_crlf(void)
{
#ifdef GIT_WIN32
cl_git_pass(git_futils_readbuffer(&automergeable_buf,
TEST_REPO_PATH "/automergeable.txt"));
cl_assert(strcmp(automergeable_buf.ptr, AUTOMERGEABLE_MERGED_FILE_CRLF) == 0);
- git_buf_free(&automergeable_buf);
+ git_buf_dispose(&automergeable_buf);
cl_assert(merge_test_index(repo_index, merge_index_entries, 8));
cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3));
"\n" \
"Conflicts:\n" \
"\tconflicting.txt\n") == 0);
- git_buf_free(&conflicting_buf);
- git_buf_free(&mergemsg_buf);
+ git_buf_dispose(&conflicting_buf);
+ git_buf_dispose(&mergemsg_buf);
cl_assert(merge_test_index(repo_index, merge_index_entries, 8));
cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3));
cl_git_pass(git_futils_readbuffer(&conflicting_buf,
TEST_REPO_PATH "/conflicting.txt"));
cl_assert(strcmp(conflicting_buf.ptr, CONFLICTING_DIFF3_FILE) == 0);
- git_buf_free(&conflicting_buf);
+ git_buf_dispose(&conflicting_buf);
cl_assert(merge_test_index(repo_index, merge_index_entries, 8));
cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3));
cl_git_pass(git_futils_readbuffer(&conflicting_buf,
TEST_REPO_PATH "/conflicting.txt"));
cl_assert(strcmp(conflicting_buf.ptr, CONFLICTING_UNION_FILE) == 0);
- git_buf_free(&conflicting_buf);
+ git_buf_dispose(&conflicting_buf);
cl_assert(merge_test_index(repo_index, merge_index_entries, 6));
cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 4));
cl_git_pass(git_futils_readbuffer(&conflicting_buf,
TEST_REPO_PATH "/conflicting.txt"));
cl_assert(strcmp(conflicting_buf.ptr, CONFLICTING_UNION_FILE) == 0);
- git_buf_free(&conflicting_buf);
+ git_buf_dispose(&conflicting_buf);
cl_assert(merge_test_index(repo_index, merge_index_entries, 6));
cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 4));
cl_git_pass(git_futils_readbuffer(&conflicting_buf,
TEST_REPO_PATH "/conflicting.txt"));
cl_assert(strcmp(conflicting_buf.ptr, CONFLICTING_DIFF3_FILE) == 0);
- git_buf_free(&conflicting_buf);
+ git_buf_dispose(&conflicting_buf);
cl_assert(merge_test_index(repo_index, merge_index_entries, 8));
cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3));
cl_git_pass(git_futils_readbuffer(&conflicting_buf,
TEST_REPO_PATH "/conflicting.txt"));
cl_assert(strcmp(conflicting_buf.ptr, CONFLICTING_MERGE_FILE) == 0);
- git_buf_free(&conflicting_buf);
+ git_buf_dispose(&conflicting_buf);
cl_assert(merge_test_index(repo_index, merge_index_entries, 8));
cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3));
#define TEST_INDEX_PATH TEST_REPO_PATH "/.git/index"
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_merge_workdir_submodules__initialize(void)
{
repo = cl_git_sandbox_init(TEST_REPO_PATH);
#define TEST_INDEX_PATH TEST_REPO_PATH "/.git/index"
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_merge_workdir_trivial__initialize(void)
{
repo = cl_git_sandbox_init(TEST_REPO_PATH);
cl_git_pass(git_merge(repo, (const git_annotated_commit **)their_heads, 1, NULL, NULL));
- git_buf_free(&branch_buf);
+ git_buf_dispose(&branch_buf);
git_reference_free(our_ref);
git_reference_free(their_ref);
git_annotated_commit_free(their_heads[0]);
cl_git_pass(git_clone(&repo, cl_git_fixture_url("testrepo.git"), "./foo.git", &opts));
cl_git_pass(git_reference_lookup(&ref, repo, "HEAD"));
- cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(ref));
+ cl_assert_equal_i(GIT_REFERENCE_SYMBOLIC, git_reference_type(ref));
cl_assert_equal_s("refs/heads/master", git_reference_symbolic_target(ref));
git_reference_free(ref);
int error;
error = git_refspec__parse(&refspec, input, direction == GIT_DIRECTION_FETCH);
- git_refspec__free(&refspec);
+ git_refspec__dispose(&refspec);
if (is_expected_to_be_valid)
cl_assert_equal_i(0, error);
void test_network_refspecs__parsing(void)
{
- // Ported from https://github.com/git/git/blob/abd2bde78bd994166900290434a2048e660dabed/t/t5511-refspec.sh
+ /* Ported from https://github.com/git/git/blob/abd2bde78bd994166900290434a2048e660dabed/t/t5511-refspec.sh */
assert_refspec(GIT_DIRECTION_PUSH, "", false);
assert_refspec(GIT_DIRECTION_PUSH, ":", true);
* code. They will be caught downstream anyway, but we may want to
* have tighter check later...
*/
- //assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/master::refs/remotes/frotz/xyzzy", false);
- //assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/maste :refs/remotes/frotz/xyzzy", false);
+ /*assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/master::refs/remotes/frotz/xyzzy", false); */
+ /*assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/maste :refs/remotes/frotz/xyzzy", false); */
assert_refspec(GIT_DIRECTION_FETCH, "refs/heads/*:refs/remotes/frotz/*", true);
assert_refspec(GIT_DIRECTION_FETCH, "refs/heads/*:refs/remotes/frotz", false);
cl_git_pass(git_refspec_transform(&buf, &spec, name));
cl_assert_equal_s(result, buf.ptr);
- git_buf_free(&buf);
- git_refspec__free(&spec);
+ git_buf_dispose(&buf);
+ git_refspec__dispose(&spec);
}
void test_network_refspecs__transform_mid_star(void)
assert_valid_transform("refs/*:refs/*", "refs/heads/master", "refs/heads/master");
}
+void test_network_refspecs__no_dst(void)
+{
+ assert_valid_transform("refs/heads/master:", "refs/heads/master", "");
+}
+
static void assert_invalid_transform(const char *refspec, const char *name)
{
git_refspec spec;
git_refspec__parse(&spec, refspec, true);
cl_git_fail(git_refspec_transform(&buf, &spec, name));
- git_buf_free(&buf);
- git_refspec__free(&spec);
+ git_buf_dispose(&buf);
+ git_refspec__dispose(&spec);
}
void test_network_refspecs__invalid(void)
git_refspec__parse(&spec, refspec, true);
cl_git_fail(git_refspec_rtransform(&buf, &spec, name));
- git_buf_free(&buf);
- git_refspec__free(&spec);
+ git_buf_dispose(&buf);
+ git_refspec__dispose(&spec);
}
void test_network_refspecs__invalid_reverse(void)
cl_assert_equal_s("", spec.src);
cl_assert_equal_s("", spec.dst);
- git_refspec__free(&spec);
+ git_refspec__dispose(&spec);
+}
+
+void test_network_refspecs__parse_free(void)
+{
+ git_refspec *spec = NULL;
+
+ cl_git_fail(git_refspec_parse(&spec, "", 0));
+ cl_git_fail(git_refspec_parse(&spec, ":::", 0));
+ cl_git_pass(git_refspec_parse(&spec, "HEAD:", 1));
+
+ cl_assert(spec != NULL);
+ git_refspec_free(spec);
}
+++ /dev/null
-#include "clar_libgit2.h"
-
-static git_remote *_remote;
-static git_repository *_repo;
-static git_config *_config;
-static char url[] = "http://github.com/libgit2/libgit2.git";
-
-void test_network_remote_createthenload__initialize(void)
-{
- cl_fixture_sandbox("testrepo.git");
-
- cl_git_pass(git_repository_open(&_repo, "testrepo.git"));
-
- cl_git_pass(git_repository_config(&_config, _repo));
- cl_git_pass(git_config_set_string(_config, "remote.origin.fetch", "+refs/heads/*:refs/remotes/origin/*"));
- cl_git_pass(git_config_set_string(_config, "remote.origin.url", url));
- git_config_free(_config);
-
- cl_git_pass(git_remote_lookup(&_remote, _repo, "origin"));
-}
-
-void test_network_remote_createthenload__cleanup(void)
-{
- git_remote_free(_remote);
- _remote = NULL;
-
- git_repository_free(_repo);
- _repo = NULL;
-
- cl_fixture_cleanup("testrepo.git");
-}
-
-void test_network_remote_createthenload__parsing(void)
-{
- cl_assert_equal_s(git_remote_name(_remote), "origin");
- cl_assert_equal_s(git_remote_url(_remote), url);
-}
cl_git_pass(git_remote_connect(g_remote, GIT_DIRECTION_FETCH, NULL, NULL, NULL));
cl_git_pass(git_remote_default_branch(&name, g_remote));
cl_assert_equal_s(should, name.ptr);
- git_buf_free(&name);
+ git_buf_dispose(&name);
}
void test_network_remote_defaultbranch__master(void)
void test_network_remote_local__cleanup(void)
{
- git_buf_free(&file_path_buf);
+ git_buf_dispose(&file_path_buf);
git_remote_free(remote);
remote = NULL;
git_remote *r;
cl_git_fail_with(git_remote_lookup(&r, _repo, "does-not-exist"), GIT_ENOTFOUND);
- cl_assert(giterr_last() != NULL);
- cl_assert(giterr_last()->klass == GITERR_CONFIG);
+ cl_assert(git_error_last() != NULL);
+ cl_assert(git_error_last()->klass == GIT_ERROR_CONFIG);
}
void test_network_remote_remotes__error_when_no_push_available(void)
cl_git_pass(git_refspec_transform(&ref, _refspec, "refs/heads/master"));
cl_assert_equal_s(ref.ptr, "refs/remotes/test/master");
- git_buf_free(&ref);
+ git_buf_dispose(&ref);
}
void test_network_remote_remotes__transform_destination_to_source(void)
cl_git_pass(git_refspec_rtransform(&ref, _refspec, "refs/remotes/test/master"));
cl_assert_equal_s(ref.ptr, "refs/heads/master");
- git_buf_free(&ref);
+ git_buf_dispose(&ref);
}
void test_network_remote_remotes__missing_refspecs(void)
cl_assert_equal_s(git_remote_url(_remote), "http://github.com/libgit2/libgit2");
}
-void test_network_remote_remotes__cannot_add_a_nameless_remote(void)
-{
- git_remote *remote;
-
- cl_assert_equal_i(
- GIT_EINVALIDSPEC,
- git_remote_create(&remote, _repo, NULL, "git://github.com/libgit2/libgit2"));
-}
-
-void test_network_remote_remotes__cannot_add_a_remote_with_an_invalid_name(void)
-{
- git_remote *remote = NULL;
-
- cl_assert_equal_i(
- GIT_EINVALIDSPEC,
- git_remote_create(&remote, _repo, "Inv@{id", "git://github.com/libgit2/libgit2"));
- cl_assert_equal_p(remote, NULL);
-
- cl_assert_equal_i(
- GIT_EINVALIDSPEC,
- git_remote_create(&remote, _repo, "", "git://github.com/libgit2/libgit2"));
- cl_assert_equal_p(remote, NULL);
-}
-
void test_network_remote_remotes__tagopt(void)
{
const char *name = git_remote_name(_remote);
cl_git_fail(git_remote_connect(remote, GIT_DIRECTION_FETCH, NULL, NULL, NULL));
- cl_assert(giterr_last() != NULL);
- cl_assert(giterr_last()->klass == GITERR_INVALID);
+ cl_assert(git_error_last() != NULL);
+ cl_assert(git_error_last()->klass == GIT_ERROR_INVALID);
git_remote_free(remote);
}
git_remote_lookup(&remote, _repo, "no-remote-url"), GIT_ENOTFOUND);
}
-void assert_cannot_create_remote(const char *name, int expected_error)
-{
- git_remote *remote = NULL;
-
- cl_git_fail_with(
- git_remote_create(&remote, _repo, name, "git://github.com/libgit2/libgit2"),
- expected_error);
-
- cl_assert_equal_p(remote, NULL);
-}
-
-void test_network_remote_remotes__cannot_create_a_remote_which_name_conflicts_with_an_existing_remote(void)
-{
- assert_cannot_create_remote("test", GIT_EEXISTS);
-}
-
-void test_network_remote_remotes__cannot_create_a_remote_which_name_is_invalid(void)
-{
- assert_cannot_create_remote("/", GIT_EINVALIDSPEC);
- assert_cannot_create_remote("//", GIT_EINVALIDSPEC);
- assert_cannot_create_remote(".lock", GIT_EINVALIDSPEC);
- assert_cannot_create_remote("a.lock", GIT_EINVALIDSPEC);
-}
-
-void test_network_remote_remote__git_remote_create_with_fetchspec(void)
-{
- git_remote *remote;
- git_strarray array;
-
- cl_git_pass(git_remote_create_with_fetchspec(&remote, _repo, "test-new", "git://github.com/libgit2/libgit2", "+refs/*:refs/*"));
- git_remote_get_fetch_refspecs(&array, remote);
- cl_assert_equal_s("+refs/*:refs/*", array.strings[0]);
- git_remote_free(remote);
-}
-
static const char *fetch_refspecs[] = {
"+refs/heads/*:refs/remotes/origin/*",
"refs/tags/*:refs/tags/*",
assert_note_equal(note, "hello world\n", ¬e_oid);
assert_note_equal(default_namespace_note, "hello world\n", ¬e_oid);
- git_buf_free(&default_ref);
+ git_buf_dispose(&default_ref);
git_note_free(note);
git_note_free(default_namespace_note);
}
cl_git_pass(git_note_default_ref(&default_ref, _repo));
cl_assert_equal_s(GIT_NOTES_DEFAULT_REF, default_ref.ptr);
- git_buf_free(&default_ref);
+ git_buf_dispose(&default_ref);
}
git_blob_free(blob);
}
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_object_blob_filter__to_odb(void)
cl_assert_equal_sz(g_crlf_filtered[i].size, zeroed.size);
cl_assert_equal_i(
0, memcmp(zeroed.ptr, g_crlf_filtered[i].ptr, zeroed.size));
- git_buf_free(&zeroed);
+ git_buf_dispose(&zeroed);
git_blob_free(blob);
}
git_filter_list_free(fl);
- git_buf_free(&out);
+ git_buf_dispose(&out);
git_config_free(cfg);
}
cl_git_pass(git_oid_fromstr(&expected_id, "321cbdf08803c744082332332838df6bd160f8f9"));
cl_git_fail_with(GIT_ENOTFOUND,
- git_object_lookup(&blob, repo, &expected_id, GIT_OBJ_ANY));
+ git_object_lookup(&blob, repo, &expected_id, GIT_OBJECT_ANY));
cl_git_pass(git_blob_create_fromstream(&stream, repo, NULL));
cl_git_pass(git_blob_create_fromstream_commit(&id, stream));
cl_assert_equal_oid(&expected_id, &id);
- cl_git_pass(git_object_lookup(&blob, repo, &expected_id, GIT_OBJ_BLOB));
+ cl_git_pass(git_object_lookup(&blob, repo, &expected_id, GIT_OBJECT_BLOB));
git_object_free(blob);
}
cl_git_pass(git_futils_mkpath2file(git_buf_cstr(&buf), 0777));
cl_git_rewritefile(git_buf_cstr(&buf), GITATTR);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
static void assert_named_chunked_blob(const char *expected_sha, const char *fake_name)
assert_blob_creation(ELSEWHERE "/test.txt", git_buf_cstr(&full_path), &git_blob_create_fromdisk);
- git_buf_free(&full_path);
+ git_buf_dispose(&full_path);
cl_must_pass(git_futils_rmdir_r(ELSEWHERE, NULL, GIT_RMDIR_REMOVE_FILES));
}
assert_blob_creation(ELSEWHERE "/test.txt", git_buf_cstr(&full_path), &git_blob_create_fromdisk);
- git_buf_free(&full_path);
+ git_buf_dispose(&full_path);
cl_must_pass(git_futils_rmdir_r(ELSEWHERE, NULL, GIT_RMDIR_REMOVE_FILES));
}
git_repository_free(g_repo);
g_repo = NULL;
- git_libgit2_opts(GIT_OPT_SET_CACHE_OBJECT_LIMIT, (int)GIT_OBJ_BLOB, (size_t)0);
+ git_libgit2_opts(GIT_OPT_SET_CACHE_OBJECT_LIMIT, (int)GIT_OBJECT_BLOB, (size_t)0);
}
static struct {
- git_otype type;
+ git_object_t type;
const char *sha;
} g_data[] = {
/* HEAD */
- { GIT_OBJ_BLOB, "a8233120f6ad708f843d861ce2b7228ec4e3dec6" }, /* README */
- { GIT_OBJ_BLOB, "3697d64be941a53d4ae8f6a271e4e3fa56b022cc" }, /* branch_file.txt */
- { GIT_OBJ_BLOB, "a71586c1dfe8a71c6cbf6c129f404c5642ff31bd" }, /* new.txt */
+ { GIT_OBJECT_BLOB, "a8233120f6ad708f843d861ce2b7228ec4e3dec6" }, /* README */
+ { GIT_OBJECT_BLOB, "3697d64be941a53d4ae8f6a271e4e3fa56b022cc" }, /* branch_file.txt */
+ { GIT_OBJECT_BLOB, "a71586c1dfe8a71c6cbf6c129f404c5642ff31bd" }, /* new.txt */
/* refs/heads/subtrees */
- { GIT_OBJ_BLOB, "1385f264afb75a56a5bec74243be9b367ba4ca08" }, /* README */
- { GIT_OBJ_TREE, "f1425cef211cc08caa31e7b545ffb232acb098c3" }, /* ab */
- { GIT_OBJ_BLOB, "d6c93164c249c8000205dd4ec5cbca1b516d487f" }, /* ab/4.txt */
- { GIT_OBJ_TREE, "9a03079b8a8ee85a0bee58bf9be3da8b62414ed4" }, /* ab/c */
- { GIT_OBJ_BLOB, "270b8ea76056d5cad83af921837702d3e3c2924d" }, /* ab/c/3.txt */
- { GIT_OBJ_TREE, "b6361fc6a97178d8fc8639fdeed71c775ab52593" }, /* ab/de */
- { GIT_OBJ_BLOB, "e7b4ad382349ff96dd8199000580b9b1e2042eb0" }, /* ab/de/2.txt */
- { GIT_OBJ_TREE, "3259a6bd5b57fb9c1281bb7ed3167b50f224cb54" }, /* ab/de/fgh */
- { GIT_OBJ_BLOB, "1f67fc4386b2d171e0d21be1c447e12660561f9b" }, /* ab/de/fgh/1.txt */
- { GIT_OBJ_BLOB, "45b983be36b73c0788dc9cbcb76cbb80fc7bb057" }, /* branch_file.txt */
- { GIT_OBJ_BLOB, "fa49b077972391ad58037050f2a75f74e3671e92" }, /* new.txt */
+ { GIT_OBJECT_BLOB, "1385f264afb75a56a5bec74243be9b367ba4ca08" }, /* README */
+ { GIT_OBJECT_TREE, "f1425cef211cc08caa31e7b545ffb232acb098c3" }, /* ab */
+ { GIT_OBJECT_BLOB, "d6c93164c249c8000205dd4ec5cbca1b516d487f" }, /* ab/4.txt */
+ { GIT_OBJECT_TREE, "9a03079b8a8ee85a0bee58bf9be3da8b62414ed4" }, /* ab/c */
+ { GIT_OBJECT_BLOB, "270b8ea76056d5cad83af921837702d3e3c2924d" }, /* ab/c/3.txt */
+ { GIT_OBJECT_TREE, "b6361fc6a97178d8fc8639fdeed71c775ab52593" }, /* ab/de */
+ { GIT_OBJECT_BLOB, "e7b4ad382349ff96dd8199000580b9b1e2042eb0" }, /* ab/de/2.txt */
+ { GIT_OBJECT_TREE, "3259a6bd5b57fb9c1281bb7ed3167b50f224cb54" }, /* ab/de/fgh */
+ { GIT_OBJECT_BLOB, "1f67fc4386b2d171e0d21be1c447e12660561f9b" }, /* ab/de/fgh/1.txt */
+ { GIT_OBJECT_BLOB, "45b983be36b73c0788dc9cbcb76cbb80fc7bb057" }, /* branch_file.txt */
+ { GIT_OBJECT_BLOB, "fa49b077972391ad58037050f2a75f74e3671e92" }, /* new.txt */
/* refs/heads/chomped */
- { GIT_OBJ_BLOB, "0266163a49e280c4f5ed1e08facd36a2bd716bcf" }, /* readme.txt */
+ { GIT_OBJECT_BLOB, "0266163a49e280c4f5ed1e08facd36a2bd716bcf" }, /* readme.txt */
{ 0, NULL },
{ 0, NULL }
git_odb *odb;
git_libgit2_opts(
- GIT_OPT_SET_CACHE_OBJECT_LIMIT, (int)GIT_OBJ_BLOB, (size_t)32767);
+ GIT_OPT_SET_CACHE_OBJECT_LIMIT, (int)GIT_OBJECT_BLOB, (size_t)32767);
cl_git_pass(git_repository_open(&g_repo, cl_fixture("testrepo.git")));
cl_git_pass(git_repository_odb(&odb, g_repo));
cl_assert(g_data[i].type == git_odb_object_type(odb_obj));
git_odb_object_free(odb_obj);
} else {
- cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJECT_ANY));
cl_assert(g_data[i].type == git_object_type(obj));
git_object_free(obj);
}
int count = (int)git_cache_size(&g_repo->objects);
cl_git_pass(git_oid_fromstr(&oid, g_data[i].sha));
- cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJECT_ANY));
cl_assert(g_data[i].type == git_object_type(obj));
git_object_free(obj);
git_object *obj;
git_odb *odb;
- git_libgit2_opts(GIT_OPT_SET_CACHE_OBJECT_LIMIT, (int)GIT_OBJ_BLOB, (size_t)0);
+ git_libgit2_opts(GIT_OPT_SET_CACHE_OBJECT_LIMIT, (int)GIT_OBJECT_BLOB, (size_t)0);
cl_git_pass(git_repository_open(&g_repo, cl_fixture("testrepo.git")));
cl_git_pass(git_repository_odb(&odb, g_repo));
cl_assert(g_data[i].type == git_odb_object_type(odb_obj));
git_odb_object_free(odb_obj);
} else {
- cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJECT_ANY));
cl_assert(g_data[i].type == git_object_type(obj));
git_object_free(obj);
}
- if (g_data[i].type == GIT_OBJ_BLOB)
+ if (g_data[i].type == GIT_OBJECT_BLOB)
cl_assert_equal_i(count, (int)git_cache_size(&g_repo->objects));
else {
cl_assert_equal_i(count + 1, (int)git_cache_size(&g_repo->objects));
for (i = ((int *)arg)[1]; g_data[i].sha != NULL; i += 2) {
cl_git_pass(git_oid_fromstr(&oid, g_data[i].sha));
- cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJECT_ANY));
cl_assert(g_data[i].type == git_object_type(obj));
git_object_free(obj);
}
for (i = 0; i < ((int *)arg)[1]; i += 2) {
cl_git_pass(git_oid_fromstr(&oid, g_data[i].sha));
- cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJECT_ANY));
cl_assert(g_data[i].type == git_object_type(obj));
git_object_free(obj);
}
git_object *obj;
cl_git_pass(git_oid_fromstr(&oid, g_data[4].sha));
- cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJECT_ANY));
cl_assert(g_data[4].type == git_object_type(obj));
git_object_free(obj);
cl_assert(git_oid_cmp(&expected_commit_oid, &commit_oid) == 0);
- git_buf_free(&buffer);
+ git_buf_dispose(&buffer);
git_signature_free(signature);
git_tree_free(tree);
git_index_free(index);
--- /dev/null
+#include "clar_libgit2.h"
+#include "commit.h"
+#include "object.h"
+#include "signature.h"
+
+static void assert_commit_parses(const char *data, size_t datalen,
+ const char *expected_treeid,
+ const char *expected_author,
+ const char *expected_committer,
+ const char *expected_encoding,
+ const char *expected_message,
+ size_t expected_parents)
+{
+ git_commit *commit;
+ if (!datalen)
+ datalen = strlen(data);
+ cl_git_pass(git_object__from_raw((git_object **) &commit, data, datalen, GIT_OBJECT_COMMIT));
+
+ if (expected_author) {
+ git_signature *author;
+ cl_git_pass(git_signature_from_buffer(&author, expected_author));
+ cl_assert(git_signature__equal(author, commit->author));
+ cl_assert_equal_s(author->name, commit->author->name);
+ cl_assert_equal_s(author->email, commit->author->email);
+ cl_assert_equal_i(author->when.time, commit->author->when.time);
+ cl_assert_equal_i(author->when.offset, commit->author->when.offset);
+ cl_assert_equal_i(author->when.sign, commit->author->when.sign);
+ git_signature_free(author);
+ }
+
+ if (expected_committer) {
+ git_signature *committer;
+ cl_git_pass(git_signature_from_buffer(&committer, expected_committer));
+ cl_assert_equal_s(committer->name, commit->committer->name);
+ cl_assert_equal_s(committer->email, commit->committer->email);
+ cl_assert_equal_i(committer->when.time, commit->committer->when.time);
+ cl_assert_equal_i(committer->when.offset, commit->committer->when.offset);
+ cl_assert_equal_i(committer->when.sign, commit->committer->when.sign);
+ git_signature_free(committer);
+ }
+
+ if (expected_encoding)
+ cl_assert_equal_s(commit->message_encoding, expected_encoding);
+ else
+ cl_assert_equal_p(commit->message_encoding, NULL);
+
+ if (expected_message)
+ cl_assert_equal_s(commit->raw_message, expected_message);
+ else
+ cl_assert_equal_p(commit->message_encoding, NULL);
+
+ if (expected_treeid) {
+ git_oid tree_oid;
+ cl_git_pass(git_oid_fromstr(&tree_oid, expected_treeid));
+ cl_assert_equal_oid(&tree_oid, &commit->tree_id);
+ }
+
+ cl_assert_equal_i(commit->parent_ids.size, expected_parents);
+
+ git_object__free(&commit->object);
+}
+
+static void assert_commit_fails(const char *data, size_t datalen)
+{
+ git_object *object;
+ if (!datalen)
+ datalen = strlen(data);
+ cl_git_fail(git_object__from_raw(&object, data, datalen, GIT_OBJECT_COMMIT));
+}
+
+void test_object_commit_parse__parsing_commit_succeeds(void)
+{
+ const char *commit =
+ "tree 3e7ac388cadacccdf1c6c5f3445895b71d9cb0f8\n"
+ "author Author <author@example.com>\n"
+ "committer Committer <committer@example.com>\n"
+ "encoding Encoding\n"
+ "\n"
+ "Message";
+ assert_commit_parses(commit, 0,
+ "3e7ac388cadacccdf1c6c5f3445895b71d9cb0f8",
+ "Author <author@example.com>",
+ "Committer <committer@example.com>",
+ "Encoding",
+ "Message", 0);
+}
+
+void test_object_commit_parse__parsing_commit_without_encoding_succeeds(void)
+{
+ const char *commit =
+ "tree 3e7ac388cadacccdf1c6c5f3445895b71d9cb0f8\n"
+ "author Author <author@example.com>\n"
+ "committer Committer <committer@example.com>\n"
+ "\n"
+ "Message";
+ assert_commit_parses(commit, 0,
+ "3e7ac388cadacccdf1c6c5f3445895b71d9cb0f8",
+ "Author <author@example.com>",
+ "Committer <committer@example.com>",
+ NULL,
+ "Message", 0);
+}
+
+void test_object_commit_parse__parsing_commit_with_multiple_authors_succeeds(void)
+{
+ const char *commit =
+ "tree 3e7ac388cadacccdf1c6c5f3445895b71d9cb0f8\n"
+ "author Author1 <author@example.com>\n"
+ "author Author2 <author@example.com>\n"
+ "author Author3 <author@example.com>\n"
+ "author Author4 <author@example.com>\n"
+ "committer Committer <committer@example.com>\n"
+ "\n"
+ "Message";
+ assert_commit_parses(commit, 0,
+ "3e7ac388cadacccdf1c6c5f3445895b71d9cb0f8",
+ "Author1 <author@example.com>",
+ "Committer <committer@example.com>",
+ NULL,
+ "Message", 0);
+}
+
+void test_object_commit_parse__parsing_commit_with_multiple_committers_succeeds(void)
+{
+ const char *commit =
+ "tree 3e7ac388cadacccdf1c6c5f3445895b71d9cb0f8\n"
+ "author Author <author@example.com>\n"
+ "committer Committer1 <committer@example.com>\n"
+ "committer Committer2 <committer@example.com>\n"
+ "committer Committer3 <committer@example.com>\n"
+ "committer Committer4 <committer@example.com>\n"
+ "\n"
+ "Message";
+ assert_commit_parses(commit, 0,
+ "3e7ac388cadacccdf1c6c5f3445895b71d9cb0f8",
+ "Author <author@example.com>",
+ "Committer1 <committer@example.com>",
+ NULL,
+ "Message", 0);
+}
+
+void test_object_commit_parse__parsing_commit_without_message_succeeds(void)
+{
+ const char *commit =
+ "tree 3e7ac388cadacccdf1c6c5f3445895b71d9cb0f8\n"
+ "author Author <author@example.com>\n"
+ "committer Committer <committer@example.com>\n";
+ assert_commit_parses(commit, 0,
+ "3e7ac388cadacccdf1c6c5f3445895b71d9cb0f8",
+ "Author <author@example.com>",
+ "Committer <committer@example.com>",
+ NULL,
+ "", 0);
+}
+
+void test_object_commit_parse__parsing_commit_with_unknown_fields_succeeds(void)
+{
+ const char *commit =
+ "tree 3e7ac388cadacccdf1c6c5f3445895b71d9cb0f8\n"
+ "author Author <author@example.com>\n"
+ "committer Committer <committer@example.com>\n"
+ "foo bar\n"
+ "more garbage\n"
+ "\n"
+ "Message";
+ assert_commit_parses(commit, 0,
+ "3e7ac388cadacccdf1c6c5f3445895b71d9cb0f8",
+ "Author <author@example.com>",
+ "Committer <committer@example.com>",
+ NULL,
+ "Message", 0);
+}
+
+void test_object_commit_parse__parsing_commit_with_invalid_tree_fails(void)
+{
+ const char *commit =
+ "tree 3e7ac388cadacccdf1xxx5f3445895b71d9cb0f8\n"
+ "author Author <author@example.com>\n"
+ "committer Committer <committer@example.com>\n"
+ "\n"
+ "Message";
+ assert_commit_fails(commit, 0);
+}
+
+void test_object_commit_parse__parsing_commit_without_tree_fails(void)
+{
+ const char *commit =
+ "author Author <author@example.com>\n"
+ "committer Committer <committer@example.com>\n"
+ "\n"
+ "Message";
+ assert_commit_fails(commit, 0);
+}
+
+void test_object_commit_parse__parsing_commit_without_author_fails(void)
+{
+ const char *commit =
+ "tree 3e7ac388cadacccdf1c6c5f3445895b71d9cb0f8\n"
+ "committer Committer <committer@example.com>\n"
+ "\n"
+ "Message";
+ assert_commit_fails(commit, 0);
+}
+
+void test_object_commit_parse__parsing_commit_without_committer_fails(void)
+{
+ const char *commit =
+ "tree 3e7ac388cadacccdf1c6c5f3445895b71d9cb0f8\n"
+ "author Author <author@example.com>\n"
+ "\n"
+ "Message";
+ assert_commit_fails(commit, 0);
+}
+
+void test_object_commit_parse__parsing_encoding_will_not_cause_oob_read(void)
+{
+ const char *commit =
+ "tree 3e7ac388cadacccdf1c6c5f3445895b71d9cb0f8\n"
+ "author <>\n"
+ "committer <>\n"
+ "encoding foo\n";
+ /*
+ * As we ignore unknown fields, the cut-off encoding field will be
+ * parsed just fine.
+ */
+ assert_commit_parses(commit, strlen(commit) - strlen("ncoding foo\n"),
+ "3e7ac388cadacccdf1c6c5f3445895b71d9cb0f8",
+ "<>",
+ "<>",
+ NULL,
+ "", 0);
+}
cl_git_pass(git_oid_fromstr(&oid, commit));
cl_assert_equal_i(
- GIT_ENOTFOUND, git_object_lookup(&object, g_repo, &oid, GIT_OBJ_TAG));
+ GIT_ENOTFOUND, git_object_lookup(&object, g_repo, &oid, GIT_OBJECT_TAG));
}
void test_object_lookup__lookup_nonexisting_returns_enotfound(void)
cl_git_pass(git_oid_fromstr(&oid, unknown));
cl_assert_equal_i(
- GIT_ENOTFOUND, git_object_lookup(&object, g_repo, &oid, GIT_OBJ_ANY));
+ GIT_ENOTFOUND, git_object_lookup(&object, g_repo, &oid, GIT_OBJECT_ANY));
}
void test_object_lookup__lookup_wrong_type_by_abbreviated_id_returns_enotfound(void)
cl_git_pass(git_oid_fromstrn(&oid, commit, strlen(commit)));
cl_assert_equal_i(
- GIT_ENOTFOUND, git_object_lookup_prefix(&object, g_repo, &oid, strlen(commit), GIT_OBJ_TAG));
+ GIT_ENOTFOUND, git_object_lookup_prefix(&object, g_repo, &oid, strlen(commit), GIT_OBJECT_TAG));
}
void test_object_lookup__lookup_wrong_type_eventually_returns_enotfound(void)
cl_git_pass(git_oid_fromstr(&oid, commit));
- cl_git_pass(git_object_lookup(&object, g_repo, &oid, GIT_OBJ_COMMIT));
+ cl_git_pass(git_object_lookup(&object, g_repo, &oid, GIT_OBJECT_COMMIT));
git_object_free(object);
cl_assert_equal_i(
- GIT_ENOTFOUND, git_object_lookup(&object, g_repo, &oid, GIT_OBJ_TAG));
+ GIT_ENOTFOUND, git_object_lookup(&object, g_repo, &oid, GIT_OBJECT_TAG));
}
void test_object_lookup__lookup_corrupt_object_returns_error(void)
for (i = 0; i < contents.size; i++) {
contents.ptr[i] ^= 0x1;
cl_git_pass(git_futils_writebuffer(&contents, path.ptr, O_RDWR, 0644));
- cl_git_fail(git_object_lookup(&object, g_repo, &oid, GIT_OBJ_COMMIT));
+ cl_git_fail(git_object_lookup(&object, g_repo, &oid, GIT_OBJECT_COMMIT));
contents.ptr[i] ^= 0x1;
}
/* Restore original content and assert we can read the object */
cl_git_pass(git_futils_writebuffer(&contents, path.ptr, O_RDWR, 0644));
- cl_git_pass(git_object_lookup(&object, g_repo, &oid, GIT_OBJ_COMMIT));
+ cl_git_pass(git_object_lookup(&object, g_repo, &oid, GIT_OBJECT_COMMIT));
git_object_free(object);
- git_buf_free(&path);
- git_buf_free(&contents);
+ git_buf_dispose(&path);
+ git_buf_dispose(&contents);
}
void test_object_lookup__lookup_object_with_wrong_hash_returns_error(void)
cl_git_pass(git_futils_cp(oldpath.ptr, newpath.ptr, 0644));
/* Verify that lookup fails due to a hashsum mismatch */
- cl_git_fail_with(GIT_EMISMATCH, git_object_lookup(&object, g_repo, &oid, GIT_OBJ_COMMIT));
+ cl_git_fail_with(GIT_EMISMATCH, git_object_lookup(&object, g_repo, &oid, GIT_OBJECT_COMMIT));
/* Disable verification and try again */
cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_STRICT_HASH_VERIFICATION, 0));
- cl_git_pass(git_object_lookup(&object, g_repo, &oid, GIT_OBJ_COMMIT));
+ cl_git_pass(git_object_lookup(&object, g_repo, &oid, GIT_OBJECT_COMMIT));
cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_STRICT_HASH_VERIFICATION, 1));
git_object_free(object);
- git_buf_free(&oldpath);
- git_buf_free(&newpath);
+ git_buf_dispose(&oldpath);
+ git_buf_dispose(&newpath);
}
cl_git_pass(git_repository_open(&g_repo, cl_fixture("attr/.gitted")));
cl_git_pass(git_repository_head(&head, g_repo));
- cl_git_pass(git_reference_peel((git_object**)&g_head_commit, head, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel((git_object**)&g_head_commit, head, GIT_OBJECT_COMMIT));
cl_git_pass(git_commit_tree(&g_root_tree, g_head_commit));
cl_git_pass(git_tree_entry_bypath(&tree_entry, g_root_tree, "subdir/subdir_test2.txt"));
cl_git_pass(git_object_lookup(&g_expectedobject, g_repo, git_tree_entry_id(tree_entry),
- GIT_OBJ_ANY));
+ GIT_OBJECT_ANY));
git_tree_entry_free(tree_entry);
git_reference_free(head);
{
cl_assert_equal_i(GIT_EINVALIDSPEC,
git_object_lookup_bypath(&g_actualobject, (git_object*)g_root_tree,
- "subdir/subdir_test2.txt", GIT_OBJ_TREE)); // It's not a tree
+ "subdir/subdir_test2.txt", GIT_OBJECT_TREE)); /* It's not a tree */
cl_assert_equal_i(GIT_ENOTFOUND,
git_object_lookup_bypath(&g_actualobject, (git_object*)g_root_tree,
- "file/doesnt/exist", GIT_OBJ_ANY));
+ "file/doesnt/exist", GIT_OBJECT_ANY));
}
void test_object_lookupbypath__from_root_tree(void)
{
cl_git_pass(git_object_lookup_bypath(&g_actualobject, (git_object*)g_root_tree,
- "subdir/subdir_test2.txt", GIT_OBJ_BLOB));
+ "subdir/subdir_test2.txt", GIT_OBJECT_BLOB));
cl_assert_equal_oid(git_object_id(g_expectedobject),
git_object_id(g_actualobject));
}
void test_object_lookupbypath__from_head_commit(void)
{
cl_git_pass(git_object_lookup_bypath(&g_actualobject, (git_object*)g_head_commit,
- "subdir/subdir_test2.txt", GIT_OBJ_BLOB));
+ "subdir/subdir_test2.txt", GIT_OBJECT_BLOB));
cl_assert_equal_oid(git_object_id(g_expectedobject),
git_object_id(g_actualobject));
}
cl_git_pass(git_tree_lookup(&tree, g_repo, git_tree_entry_id(entry)));
cl_git_pass(git_object_lookup_bypath(&g_actualobject, (git_object*)tree,
- "subdir_test2.txt", GIT_OBJ_BLOB));
+ "subdir_test2.txt", GIT_OBJECT_BLOB));
cl_assert_equal_oid(git_object_id(g_expectedobject),
git_object_id(g_actualobject));
git_message_prettify(&prettified_message, input, strip_comments, '#');
cl_assert_equal_s(expected_output, git_buf_cstr(&prettified_message));
- git_buf_free(&prettified_message);
+ git_buf_dispose(&prettified_message);
}
#define t40 "A quick brown fox jumps over the lazy do"
#define s40 " "
-#define sss s40 s40 s40 s40 s40 s40 s40 s40 s40 s40 // # 400
-#define ttt t40 t40 t40 t40 t40 t40 t40 t40 t40 t40 // # 400
+#define sss s40 s40 s40 s40 s40 s40 s40 s40 s40 s40 /* # 400 */
+#define ttt t40 t40 t40 t40 t40 t40 t40 t40 t40 t40 /* # 400 */
/* Ported from git.git */
/* see https://github.com/git/git/blob/master/t/t0030-stripspace.sh */
memset(&buffer, 0, sizeof(buffer));
cl_git_pass(git_message_prettify(&buffer, "", 0, '#'));
cl_assert_equal_s(buffer.ptr, "");
- git_buf_free(&buffer);
+ git_buf_dispose(&buffer);
cl_git_pass(git_message_prettify(&buffer, "", 1, '#'));
cl_assert_equal_s(buffer.ptr, "");
- git_buf_free(&buffer);
+ git_buf_dispose(&buffer);
cl_git_pass(git_message_prettify(&buffer, "Short", 0, '#'));
cl_assert_equal_s("Short\n", buffer.ptr);
- git_buf_free(&buffer);
+ git_buf_dispose(&buffer);
cl_git_pass(git_message_prettify(&buffer, "Short", 1, '#'));
cl_assert_equal_s("Short\n", buffer.ptr);
- git_buf_free(&buffer);
+ git_buf_dispose(&buffer);
cl_git_pass(git_message_prettify(&buffer, "This is longer\nAnd multiline\n# with some comments still in\n", 0, '#'));
cl_assert_equal_s(buffer.ptr, "This is longer\nAnd multiline\n# with some comments still in\n");
- git_buf_free(&buffer);
+ git_buf_dispose(&buffer);
cl_git_pass(git_message_prettify(&buffer, "This is longer\nAnd multiline\n# with some comments still in\n", 1, '#'));
cl_assert_equal_s(buffer.ptr, "This is longer\nAnd multiline\n");
- git_buf_free(&buffer);
+ git_buf_dispose(&buffer);
}
static void assert_peel(
const char *sha,
- git_otype requested_type,
+ git_object_t requested_type,
const char* expected_sha,
- git_otype expected_type)
+ git_object_t expected_type)
{
git_oid oid, expected_oid;
git_object *obj;
git_object *peeled;
cl_git_pass(git_oid_fromstr(&oid, sha));
- cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY));
-
+ cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJECT_ANY));
+
cl_git_pass(git_object_peel(&peeled, obj, requested_type));
cl_git_pass(git_oid_fromstr(&expected_oid, expected_sha));
git_object_free(obj);
}
-static void assert_peel_error(int error, const char *sha, git_otype requested_type)
+static void assert_peel_error(int error, const char *sha, git_object_t requested_type)
{
git_oid oid;
git_object *obj;
git_object *peeled;
cl_git_pass(git_oid_fromstr(&oid, sha));
- cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJ_ANY));
-
+ cl_git_pass(git_object_lookup(&obj, g_repo, &oid, GIT_OBJECT_ANY));
+
cl_assert_equal_i(error, git_object_peel(&peeled, obj, requested_type));
git_object_free(obj);
void test_object_peel__peeling_an_object_into_its_own_type_returns_another_instance_of_it(void)
{
- assert_peel("e90810b8df3e80c413d903f631643c716887138d", GIT_OBJ_COMMIT,
- "e90810b8df3e80c413d903f631643c716887138d", GIT_OBJ_COMMIT);
- assert_peel("7b4384978d2493e851f9cca7858815fac9b10980", GIT_OBJ_TAG,
- "7b4384978d2493e851f9cca7858815fac9b10980", GIT_OBJ_TAG);
- assert_peel("53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_TREE,
- "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_TREE);
- assert_peel("0266163a49e280c4f5ed1e08facd36a2bd716bcf", GIT_OBJ_BLOB,
- "0266163a49e280c4f5ed1e08facd36a2bd716bcf", GIT_OBJ_BLOB);
+ assert_peel("e90810b8df3e80c413d903f631643c716887138d", GIT_OBJECT_COMMIT,
+ "e90810b8df3e80c413d903f631643c716887138d", GIT_OBJECT_COMMIT);
+ assert_peel("7b4384978d2493e851f9cca7858815fac9b10980", GIT_OBJECT_TAG,
+ "7b4384978d2493e851f9cca7858815fac9b10980", GIT_OBJECT_TAG);
+ assert_peel("53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJECT_TREE,
+ "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJECT_TREE);
+ assert_peel("0266163a49e280c4f5ed1e08facd36a2bd716bcf", GIT_OBJECT_BLOB,
+ "0266163a49e280c4f5ed1e08facd36a2bd716bcf", GIT_OBJECT_BLOB);
}
void test_object_peel__tag(void)
{
- assert_peel("7b4384978d2493e851f9cca7858815fac9b10980", GIT_OBJ_COMMIT,
- "e90810b8df3e80c413d903f631643c716887138d", GIT_OBJ_COMMIT);
- assert_peel("7b4384978d2493e851f9cca7858815fac9b10980", GIT_OBJ_TREE,
- "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_TREE);
- assert_peel_error(GIT_EPEEL, "7b4384978d2493e851f9cca7858815fac9b10980", GIT_OBJ_BLOB);
- assert_peel("7b4384978d2493e851f9cca7858815fac9b10980", GIT_OBJ_ANY,
- "e90810b8df3e80c413d903f631643c716887138d", GIT_OBJ_COMMIT);
+ assert_peel("7b4384978d2493e851f9cca7858815fac9b10980", GIT_OBJECT_COMMIT,
+ "e90810b8df3e80c413d903f631643c716887138d", GIT_OBJECT_COMMIT);
+ assert_peel("7b4384978d2493e851f9cca7858815fac9b10980", GIT_OBJECT_TREE,
+ "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJECT_TREE);
+ assert_peel_error(GIT_EPEEL, "7b4384978d2493e851f9cca7858815fac9b10980", GIT_OBJECT_BLOB);
+ assert_peel("7b4384978d2493e851f9cca7858815fac9b10980", GIT_OBJECT_ANY,
+ "e90810b8df3e80c413d903f631643c716887138d", GIT_OBJECT_COMMIT);
}
void test_object_peel__commit(void)
{
- assert_peel_error(GIT_EINVALIDSPEC, "e90810b8df3e80c413d903f631643c716887138d", GIT_OBJ_BLOB);
- assert_peel("e90810b8df3e80c413d903f631643c716887138d", GIT_OBJ_TREE,
- "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_TREE);
- assert_peel("e90810b8df3e80c413d903f631643c716887138d", GIT_OBJ_COMMIT,
- "e90810b8df3e80c413d903f631643c716887138d", GIT_OBJ_COMMIT);
- assert_peel_error(GIT_EINVALIDSPEC, "e90810b8df3e80c413d903f631643c716887138d", GIT_OBJ_TAG);
- assert_peel("e90810b8df3e80c413d903f631643c716887138d", GIT_OBJ_ANY,
- "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_TREE);
+ assert_peel_error(GIT_EINVALIDSPEC, "e90810b8df3e80c413d903f631643c716887138d", GIT_OBJECT_BLOB);
+ assert_peel("e90810b8df3e80c413d903f631643c716887138d", GIT_OBJECT_TREE,
+ "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJECT_TREE);
+ assert_peel("e90810b8df3e80c413d903f631643c716887138d", GIT_OBJECT_COMMIT,
+ "e90810b8df3e80c413d903f631643c716887138d", GIT_OBJECT_COMMIT);
+ assert_peel_error(GIT_EINVALIDSPEC, "e90810b8df3e80c413d903f631643c716887138d", GIT_OBJECT_TAG);
+ assert_peel("e90810b8df3e80c413d903f631643c716887138d", GIT_OBJECT_ANY,
+ "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJECT_TREE);
}
void test_object_peel__tree(void)
{
- assert_peel_error(GIT_EINVALIDSPEC, "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_BLOB);
- assert_peel("53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_TREE,
- "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_TREE);
- assert_peel_error(GIT_EINVALIDSPEC, "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_COMMIT);
- assert_peel_error(GIT_EINVALIDSPEC, "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_TAG);
- assert_peel_error(GIT_EINVALIDSPEC, "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_ANY);
+ assert_peel_error(GIT_EINVALIDSPEC, "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJECT_BLOB);
+ assert_peel("53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJECT_TREE,
+ "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJECT_TREE);
+ assert_peel_error(GIT_EINVALIDSPEC, "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJECT_COMMIT);
+ assert_peel_error(GIT_EINVALIDSPEC, "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJECT_TAG);
+ assert_peel_error(GIT_EINVALIDSPEC, "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJECT_ANY);
}
void test_object_peel__blob(void)
{
- assert_peel("0266163a49e280c4f5ed1e08facd36a2bd716bcf", GIT_OBJ_BLOB,
- "0266163a49e280c4f5ed1e08facd36a2bd716bcf", GIT_OBJ_BLOB);
- assert_peel_error(GIT_EINVALIDSPEC, "0266163a49e280c4f5ed1e08facd36a2bd716bcf", GIT_OBJ_TREE);
- assert_peel_error(GIT_EINVALIDSPEC, "0266163a49e280c4f5ed1e08facd36a2bd716bcf", GIT_OBJ_COMMIT);
- assert_peel_error(GIT_EINVALIDSPEC, "0266163a49e280c4f5ed1e08facd36a2bd716bcf", GIT_OBJ_TAG);
- assert_peel_error(GIT_EINVALIDSPEC, "0266163a49e280c4f5ed1e08facd36a2bd716bcf", GIT_OBJ_ANY);
+ assert_peel("0266163a49e280c4f5ed1e08facd36a2bd716bcf", GIT_OBJECT_BLOB,
+ "0266163a49e280c4f5ed1e08facd36a2bd716bcf", GIT_OBJECT_BLOB);
+ assert_peel_error(GIT_EINVALIDSPEC, "0266163a49e280c4f5ed1e08facd36a2bd716bcf", GIT_OBJECT_TREE);
+ assert_peel_error(GIT_EINVALIDSPEC, "0266163a49e280c4f5ed1e08facd36a2bd716bcf", GIT_OBJECT_COMMIT);
+ assert_peel_error(GIT_EINVALIDSPEC, "0266163a49e280c4f5ed1e08facd36a2bd716bcf", GIT_OBJECT_TAG);
+ assert_peel_error(GIT_EINVALIDSPEC, "0266163a49e280c4f5ed1e08facd36a2bd716bcf", GIT_OBJECT_ANY);
}
void test_object_peel__target_any_object_for_type_change(void)
{
/* tag to commit */
- assert_peel("7b4384978d2493e851f9cca7858815fac9b10980", GIT_OBJ_ANY,
- "e90810b8df3e80c413d903f631643c716887138d", GIT_OBJ_COMMIT);
+ assert_peel("7b4384978d2493e851f9cca7858815fac9b10980", GIT_OBJECT_ANY,
+ "e90810b8df3e80c413d903f631643c716887138d", GIT_OBJECT_COMMIT);
/* commit to tree */
- assert_peel("e90810b8df3e80c413d903f631643c716887138d", GIT_OBJ_ANY,
- "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_TREE);
+ assert_peel("e90810b8df3e80c413d903f631643c716887138d", GIT_OBJECT_ANY,
+ "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJECT_TREE);
}
static git_rawobj tree_obj = {
tree_data,
sizeof(tree_data),
- GIT_OBJ_TREE
+ GIT_OBJECT_TREE
};
static git_rawobj tag_obj = {
tag_data,
sizeof(tag_data),
- GIT_OBJ_TAG
+ GIT_OBJECT_TAG
};
static git_rawobj zero_obj = {
zero_data,
0,
- GIT_OBJ_BLOB
+ GIT_OBJECT_BLOB
};
static git_rawobj one_obj = {
one_data,
sizeof(one_data),
- GIT_OBJ_BLOB
+ GIT_OBJECT_BLOB
};
static git_rawobj two_obj = {
two_data,
sizeof(two_data),
- GIT_OBJ_BLOB
+ GIT_OBJECT_BLOB
};
static git_rawobj commit_obj = {
commit_data,
sizeof(commit_data),
- GIT_OBJ_COMMIT
+ GIT_OBJECT_COMMIT
};
static git_rawobj some_obj = {
some_data,
sizeof(some_data),
- GIT_OBJ_BLOB
+ GIT_OBJECT_BLOB
};
static git_rawobj junk_obj = {
NULL,
0,
- GIT_OBJ_BAD
+ GIT_OBJECT_INVALID
};
junk_obj.data = some_data;
hash_object_fail(&id, &junk_obj);
- junk_obj.type = GIT_OBJ__EXT1;
+ junk_obj.type = 0; /* EXT1 */
hash_object_fail(&id, &junk_obj);
- junk_obj.type = GIT_OBJ__EXT2;
+ junk_obj.type = 5; /* EXT2 */
hash_object_fail(&id, &junk_obj);
- junk_obj.type = GIT_OBJ_OFS_DELTA;
+ junk_obj.type = GIT_OBJECT_OFS_DELTA;
hash_object_fail(&id, &junk_obj);
- junk_obj.type = GIT_OBJ_REF_DELTA;
+ junk_obj.type = GIT_OBJECT_REF_DELTA;
+ hash_object_fail(&id, &junk_obj);
+
+ junk_obj.type = 42;
hash_object_fail(&id, &junk_obj);
/* data can be NULL only if len is zero: */
- junk_obj.type = GIT_OBJ_BLOB;
+ junk_obj.type = GIT_OBJECT_BLOB;
junk_obj.data = NULL;
hash_object_pass(&id, &junk_obj);
cl_assert(git_oid_cmp(&id, &id_zero) == 0);
void test_object_raw_type2string__convert_type_to_string(void)
{
- cl_assert_equal_s(git_object_type2string(GIT_OBJ_BAD), "");
- cl_assert_equal_s(git_object_type2string(GIT_OBJ__EXT1), "");
- cl_assert_equal_s(git_object_type2string(GIT_OBJ_COMMIT), "commit");
- cl_assert_equal_s(git_object_type2string(GIT_OBJ_TREE), "tree");
- cl_assert_equal_s(git_object_type2string(GIT_OBJ_BLOB), "blob");
- cl_assert_equal_s(git_object_type2string(GIT_OBJ_TAG), "tag");
- cl_assert_equal_s(git_object_type2string(GIT_OBJ__EXT2), "");
- cl_assert_equal_s(git_object_type2string(GIT_OBJ_OFS_DELTA), "OFS_DELTA");
- cl_assert_equal_s(git_object_type2string(GIT_OBJ_REF_DELTA), "REF_DELTA");
+ cl_assert_equal_s(git_object_type2string(GIT_OBJECT_INVALID), "");
+ cl_assert_equal_s(git_object_type2string(0), ""); /* EXT1 */
+ cl_assert_equal_s(git_object_type2string(GIT_OBJECT_COMMIT), "commit");
+ cl_assert_equal_s(git_object_type2string(GIT_OBJECT_TREE), "tree");
+ cl_assert_equal_s(git_object_type2string(GIT_OBJECT_BLOB), "blob");
+ cl_assert_equal_s(git_object_type2string(GIT_OBJECT_TAG), "tag");
+ cl_assert_equal_s(git_object_type2string(5), ""); /* EXT2 */
+ cl_assert_equal_s(git_object_type2string(GIT_OBJECT_OFS_DELTA), "OFS_DELTA");
+ cl_assert_equal_s(git_object_type2string(GIT_OBJECT_REF_DELTA), "REF_DELTA");
cl_assert_equal_s(git_object_type2string(-2), "");
cl_assert_equal_s(git_object_type2string(8), "");
void test_object_raw_type2string__convert_string_to_type(void)
{
- cl_assert(git_object_string2type(NULL) == GIT_OBJ_BAD);
- cl_assert(git_object_string2type("") == GIT_OBJ_BAD);
- cl_assert(git_object_string2type("commit") == GIT_OBJ_COMMIT);
- cl_assert(git_object_string2type("tree") == GIT_OBJ_TREE);
- cl_assert(git_object_string2type("blob") == GIT_OBJ_BLOB);
- cl_assert(git_object_string2type("tag") == GIT_OBJ_TAG);
- cl_assert(git_object_string2type("OFS_DELTA") == GIT_OBJ_OFS_DELTA);
- cl_assert(git_object_string2type("REF_DELTA") == GIT_OBJ_REF_DELTA);
-
- cl_assert(git_object_string2type("CoMmIt") == GIT_OBJ_BAD);
- cl_assert(git_object_string2type("hohoho") == GIT_OBJ_BAD);
+ cl_assert(git_object_string2type(NULL) == GIT_OBJECT_INVALID);
+ cl_assert(git_object_string2type("") == GIT_OBJECT_INVALID);
+ cl_assert(git_object_string2type("commit") == GIT_OBJECT_COMMIT);
+ cl_assert(git_object_string2type("tree") == GIT_OBJECT_TREE);
+ cl_assert(git_object_string2type("blob") == GIT_OBJECT_BLOB);
+ cl_assert(git_object_string2type("tag") == GIT_OBJECT_TAG);
+ cl_assert(git_object_string2type("OFS_DELTA") == GIT_OBJECT_OFS_DELTA);
+ cl_assert(git_object_string2type("REF_DELTA") == GIT_OBJECT_REF_DELTA);
+
+ cl_assert(git_object_string2type("CoMmIt") == GIT_OBJECT_INVALID);
+ cl_assert(git_object_string2type("hohoho") == GIT_OBJECT_INVALID);
}
void test_object_raw_type2string__check_type_is_loose(void)
{
- cl_assert(git_object_typeisloose(GIT_OBJ_BAD) == 0);
- cl_assert(git_object_typeisloose(GIT_OBJ__EXT1) == 0);
- cl_assert(git_object_typeisloose(GIT_OBJ_COMMIT) == 1);
- cl_assert(git_object_typeisloose(GIT_OBJ_TREE) == 1);
- cl_assert(git_object_typeisloose(GIT_OBJ_BLOB) == 1);
- cl_assert(git_object_typeisloose(GIT_OBJ_TAG) == 1);
- cl_assert(git_object_typeisloose(GIT_OBJ__EXT2) == 0);
- cl_assert(git_object_typeisloose(GIT_OBJ_OFS_DELTA) == 0);
- cl_assert(git_object_typeisloose(GIT_OBJ_REF_DELTA) == 0);
+ cl_assert(git_object_typeisloose(GIT_OBJECT_INVALID) == 0);
+ cl_assert(git_object_typeisloose(0) == 0); /* EXT1 */
+ cl_assert(git_object_typeisloose(GIT_OBJECT_COMMIT) == 1);
+ cl_assert(git_object_typeisloose(GIT_OBJECT_TREE) == 1);
+ cl_assert(git_object_typeisloose(GIT_OBJECT_BLOB) == 1);
+ cl_assert(git_object_typeisloose(GIT_OBJECT_TAG) == 1);
+ cl_assert(git_object_typeisloose(5) == 0); /* EXT2 */
+ cl_assert(git_object_typeisloose(GIT_OBJECT_OFS_DELTA) == 0);
+ cl_assert(git_object_typeisloose(GIT_OBJECT_REF_DELTA) == 0);
cl_assert(git_object_typeisloose(-2) == 0);
cl_assert(git_object_typeisloose(8) == 0);
-// Helpers
+/* Helpers */
static void remove_object_files(object_data *d)
{
cl_git_pass(p_unlink(d->file));
}
-// Standard test form
-void test_body(object_data *d, git_rawobj *o)
+/* Standard test form */
+void test_body(object_data *d, git_rawobj *o)
{
git_odb *db;
git_oid id1, id2;
git_rawobj commit_obj = {
commit_data,
sizeof(commit_data),
- GIT_OBJ_COMMIT
+ GIT_OBJECT_COMMIT
};
test_body(&commit, &commit_obj);
static git_rawobj tree_obj = {
tree_data,
sizeof(tree_data),
- GIT_OBJ_TREE
+ GIT_OBJECT_TREE
};
test_body(&tree, &tree_obj);
static git_rawobj tag_obj = {
tag_data,
sizeof(tag_data),
- GIT_OBJ_TAG
+ GIT_OBJECT_TAG
};
static git_rawobj zero_obj = {
zero_data,
0,
- GIT_OBJ_BLOB
+ GIT_OBJECT_BLOB
};
test_body(&zero, &zero_obj);
static git_rawobj one_obj = {
one_data,
sizeof(one_data),
- GIT_OBJ_BLOB
+ GIT_OBJECT_BLOB
};
test_body(&one, &one_obj);
static git_rawobj two_obj = {
two_data,
sizeof(two_data),
- GIT_OBJ_BLOB
+ GIT_OBJECT_BLOB
};
test_body(&two, &two_obj);
static git_rawobj some_obj = {
some_data,
sizeof(some_data),
- GIT_OBJ_BLOB
+ GIT_OBJECT_BLOB
};
test_body(&some, &some_obj);
git_buf shorty = {0};
git_oid_fromstr(&full, "ce013625030ba8dba906f756967f9e9ca394464a");
- cl_git_pass(git_object_lookup(&obj, _repo, &full, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&obj, _repo, &full, GIT_OBJECT_ANY));
cl_git_pass(git_object_short_id(&shorty, obj));
cl_assert_equal_i(7, shorty.size);
cl_assert_equal_s("ce01362", shorty.ptr);
git_object_free(obj);
git_oid_fromstr(&full, "038d718da6a1ebbc6a7780a96ed75a70cc2ad6e2");
- cl_git_pass(git_object_lookup(&obj, _repo, &full, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&obj, _repo, &full, GIT_OBJECT_ANY));
cl_git_pass(git_object_short_id(&shorty, obj));
cl_assert_equal_i(7, shorty.size);
cl_assert_equal_s("038d718", shorty.ptr);
git_object_free(obj);
git_oid_fromstr(&full, "dea509d097ce692e167dfc6a48a7a280cc5e877e");
- cl_git_pass(git_object_lookup(&obj, _repo, &full, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&obj, _repo, &full, GIT_OBJECT_ANY));
cl_git_pass(git_object_short_id(&shorty, obj));
cl_assert_equal_i(9, shorty.size);
cl_assert_equal_s("dea509d09", shorty.ptr);
git_object_free(obj);
git_oid_fromstr(&full, "dea509d0b3cb8ee0650f6ca210bc83f4678851ba");
- cl_git_pass(git_object_lookup(&obj, _repo, &full, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&obj, _repo, &full, GIT_OBJECT_ANY));
cl_git_pass(git_object_short_id(&shorty, obj));
cl_assert_equal_i(9, shorty.size);
cl_assert_equal_s("dea509d0b", shorty.ptr);
git_object_free(obj);
- git_buf_free(&shorty);
+ git_buf_dispose(&shorty);
}
const char* expected_results[MAX_USED_TAGS];
};
-// Helpers
+/* Helpers */
static void ensure_tag_pattern_match(git_repository *repo,
const struct pattern_match_t* data)
{
goto exit;
}
- // we have to be prepared that tags come in any order.
+ /* we have to be prepared that tags come in any order. */
for (i = 0; i < tag_list.count; i++)
{
for (j = 0; j < data->expected_matches; j++)
cl_git_pass(error);
}
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_object_tag_list__initialize(void)
{
g_repo = cl_git_sandbox_init("testrepo");
void test_object_tag_list__list_all(void)
{
- // list all tag names from the repository
+ /* list all tag names from the repository */
git_strarray tag_list;
cl_git_pass(git_tag_list(&tag_list, g_repo));
}
static const struct pattern_match_t matches[] = {
- // All tags, including a packed one and two namespaced ones.
+ /* All tags, including a packed one and two namespaced ones. */
{ "", 6, { "e90810b", "point_to_blob", "test", "packed-tag", "foo/bar", "foo/foo/bar" } },
- // beginning with
+ /* beginning with */
{ "t*", 1, { "test" } },
- // ending with
+ /* ending with */
{ "*b", 2, { "e90810b", "point_to_blob" } },
- // exact match
+ /* exact match */
{ "e", 0 },
{ "e90810b", 1, { "e90810b" } },
- // either or
+ /* either or */
{ "e90810[ab]", 1, { "e90810b" } },
- // glob in the middle
+ /* glob in the middle */
{ "foo/*/bar", 1, { "foo/foo/bar" } },
- // The matching of '*' is based on plain string matching analog to the regular expression ".*"
- // => a '/' in the tag name has no special meaning.
- // Compare to `git tag -l "*bar"`
+ /*
+ * The matching of '*' is based on plain string matching analog to the regular expression ".*"
+ * => a '/' in the tag name has no special meaning.
+ * Compare to `git tag -l "*bar"`
+ */
{ "*bar", 2, { "foo/bar", "foo/foo/bar" } },
- // End of list
+ /* End of list */
{ NULL }
};
void test_object_tag_list__list_by_pattern(void)
{
- // list all tag names from the repository matching a specified pattern
+ /* list all tag names from the repository matching a specified pattern */
size_t i = 0;
while (matches[i].pattern)
ensure_tag_pattern_match(g_repo, &matches[i++]);
--- /dev/null
+#include "clar_libgit2.h"
+#include "object.h"
+#include "signature.h"
+#include "tag.h"
+
+static void assert_tag_parses(const char *data, size_t datalen,
+ const char *expected_oid,
+ const char *expected_name,
+ const char *expected_tagger,
+ const char *expected_message)
+{
+ git_tag *tag;
+
+ if (!datalen)
+ datalen = strlen(data);
+
+ cl_git_pass(git_object__from_raw((git_object **) &tag, data, datalen, GIT_OBJECT_TAG));
+ cl_assert_equal_i(tag->type, GIT_OBJECT_TAG);
+
+ if (expected_oid) {
+ git_oid oid;
+ cl_git_pass(git_oid_fromstr(&oid, expected_oid));
+ cl_assert_equal_oid(&oid, &tag->target);
+ }
+
+ if (expected_name)
+ cl_assert_equal_s(expected_name, tag->tag_name);
+ else
+ cl_assert_equal_s(tag->message, NULL);
+
+ if (expected_tagger) {
+ git_signature *tagger;
+ cl_git_pass(git_signature_from_buffer(&tagger, expected_tagger));
+ cl_assert_equal_s(tagger->name, tag->tagger->name);
+ cl_assert_equal_s(tagger->email, tag->tagger->email);
+ cl_assert_equal_i(tagger->when.time, tag->tagger->when.time);
+ cl_assert_equal_i(tagger->when.offset, tag->tagger->when.offset);
+ cl_assert_equal_i(tagger->when.sign, tag->tagger->when.sign);
+ git_signature_free(tagger);
+ } else {
+ cl_assert_equal_s(tag->tagger, NULL);
+ }
+
+ if (expected_message)
+ cl_assert_equal_s(expected_message, tag->message);
+ else
+ cl_assert_equal_s(tag->message, NULL);
+
+ git_object__free(&tag->object);
+}
+
+static void assert_tag_fails(const char *data, size_t datalen)
+{
+ git_object *object;
+ if (!datalen)
+ datalen = strlen(data);
+ cl_git_fail(git_object__from_raw(&object, data, datalen, GIT_OBJECT_TAG));
+}
+
+void test_object_tag_parse__valid_tag_parses(void)
+{
+ const char *tag =
+ "object a8d447f68076d1520f69649bb52629941be7031f\n"
+ "type tag\n"
+ "tag tagname\n"
+ "tagger Taggy Mr. Taggart <taggy@taggart.com>\n"
+ "\n"
+ "Message";
+ assert_tag_parses(tag, 0,
+ "a8d447f68076d1520f69649bb52629941be7031f",
+ "tagname",
+ "Taggy Mr. Taggart <taggy@taggart.com>",
+ "Message");
+}
+
+void test_object_tag_parse__missing_tagger_parses(void)
+{
+ const char *tag =
+ "object a8d447f68076d1520f69649bb52629941be7031f\n"
+ "type tag\n"
+ "tag tagname\n"
+ "\n"
+ "Message";
+ assert_tag_parses(tag, 0,
+ "a8d447f68076d1520f69649bb52629941be7031f",
+ "tagname",
+ NULL,
+ "Message");
+}
+
+void test_object_tag_parse__missing_message_parses(void)
+{
+ const char *tag =
+ "object a8d447f68076d1520f69649bb52629941be7031f\n"
+ "type tag\n"
+ "tag tagname\n"
+ "tagger Taggy Mr. Taggart <taggy@taggart.com>\n";
+ assert_tag_parses(tag, 0,
+ "a8d447f68076d1520f69649bb52629941be7031f",
+ "tagname",
+ "Taggy Mr. Taggart <taggy@taggart.com>",
+ NULL);
+}
+
+void test_object_tag_parse__unknown_field_parses(void)
+{
+ const char *tag =
+ "object a8d447f68076d1520f69649bb52629941be7031f\n"
+ "type tag\n"
+ "tag tagname\n"
+ "tagger Taggy Mr. Taggart <taggy@taggart.com>\n"
+ "foo bar\n"
+ "frubble frabble\n"
+ "\n"
+ "Message";
+ assert_tag_parses(tag, 0,
+ "a8d447f68076d1520f69649bb52629941be7031f",
+ "tagname",
+ "Taggy Mr. Taggart <taggy@taggart.com>",
+ "Message");
+}
+
+void test_object_tag_parse__missing_object_fails(void)
+{
+ const char *tag =
+ "type tag\n"
+ "tag tagname\n"
+ "tagger Taggy Mr. Taggart <taggy@taggart.com>\n"
+ "\n"
+ "Message";
+ assert_tag_fails(tag, 0);
+}
+
+void test_object_tag_parse__malformatted_object_fails(void)
+{
+ const char *tag =
+ "object a8d447f68076d15xxxxxxxxxxxxxxxx41be7031f\n"
+ "type tag\n"
+ "tag tagname\n"
+ "tagger Taggy Mr. Taggart <taggy@taggart.com>\n"
+ "\n"
+ "Message";
+ assert_tag_fails(tag, 0);
+}
+
+void test_object_tag_parse__missing_type_fails(void)
+{
+ const char *tag =
+ "object a8d447f68076d1520f69649bb52629941be7031f\n"
+ "tag tagname\n"
+ "tagger Taggy Mr. Taggart <taggy@taggart.com>\n"
+ "\n"
+ "Message";
+ assert_tag_fails(tag, 0);
+}
+
+void test_object_tag_parse__invalid_type_fails(void)
+{
+ const char *tag =
+ "object a8d447f68076d1520f69649bb52629941be7031f\n"
+ "type garbage\n"
+ "tag tagname\n"
+ "tagger Taggy Mr. Taggart <taggy@taggart.com>\n"
+ "\n"
+ "Message";
+ assert_tag_fails(tag, 0);
+}
+
+void test_object_tag_parse__missing_tagname_fails(void)
+{
+ const char *tag =
+ "object a8d447f68076d1520f69649bb52629941be7031f\n"
+ "type tag\n"
+ "tagger Taggy Mr. Taggart <taggy@taggart.com>\n"
+ "\n"
+ "Message";
+ assert_tag_fails(tag, 0);
+}
+
+void test_object_tag_parse__misformatted_tagger_fails(void)
+{
+ const char *tag =
+ "object a8d447f68076d1520f69649bb52629941be7031f\n"
+ "type tag\n"
+ "tag Tag\n"
+ "tagger taggy@taggart.com>\n"
+ "\n"
+ "Message";
+ assert_tag_fails(tag, 0);
+}
+
+void test_object_tag_parse__missing_message_fails(void)
+{
+ const char *tag =
+ "object a8d447f68076d1520f69649bb52629941be7031f\n"
+ "type tag\n"
+ "tag Tag\n"
+ "tagger taggy@taggart.com>\n";
+ assert_tag_fails(tag, 0);
+}
+
+void test_object_tag_parse__no_oob_read_when_searching_message(void)
+{
+ const char *tag =
+ "object a8d447f68076d1520f69649bb52629941be7031f\n"
+ "type tag\n"
+ "tag \n"
+ "tagger <>\n"
+ " \n\n"
+ "Message";
+ /*
+ * The OOB read previously resulted in an OOM error. We
+ * thus want to make sure that the resulting error is the
+ * expected one.
+ */
+ assert_tag_fails(tag, strlen(tag) - strlen("\n\nMessage"));
+ cl_assert(strstr(git_error_last()->message, "tag contains no message"));
+}
static void retrieve_tag_from_oid(git_tag **tag_out, git_repository *repo, const char *sha)
{
git_oid oid;
-
+
cl_git_pass(git_oid_fromstr(&oid, sha));
cl_git_pass(git_tag_lookup(tag_out, repo, &oid));
}
retrieve_tag_from_oid(&tag, repo, "7b4384978d2493e851f9cca7858815fac9b10980");
cl_git_pass(git_tag_peel(&target, tag));
- cl_assert(git_object_type(target) == GIT_OBJ_COMMIT);
+ cl_assert(git_object_type(target) == GIT_OBJECT_COMMIT);
cl_git_pass(git_oid_streq(git_object_id(target), "e90810b8df3e80c413d903f631643c716887138d"));
}
retrieve_tag_from_oid(&tag, repo, "b25fa35b38051e4ae45d4222e795f9df2e43f1d1");
cl_git_pass(git_tag_peel(&target, tag));
- cl_assert(git_object_type(target) == GIT_OBJ_COMMIT);
+ cl_assert(git_object_type(target) == GIT_OBJECT_COMMIT);
cl_git_pass(git_oid_streq(git_object_id(target), "e90810b8df3e80c413d903f631643c716887138d"));
}
retrieve_tag_from_oid(&tag, repo, "521d87c1ec3aef9824daf6d96cc0ae3710766d91");
cl_git_pass(git_tag_peel(&target, tag));
- cl_assert(git_object_type(target) == GIT_OBJ_BLOB);
- cl_git_pass(git_oid_streq(git_object_id(target), "1385f264afb75a56a5bec74243be9b367ba4ca08"));
+ cl_assert(git_object_type(target) == GIT_OBJECT_BLOB);
+ cl_git_pass(git_oid_streq(git_object_id(target), "1385f264afb75a56a5bec74243be9b367ba4ca08"));
}
static git_repository *g_repo;
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_object_tag_read__initialize(void)
{
g_repo = cl_git_sandbox_init("testrepo");
void test_object_tag_read__parse(void)
{
- // read and parse a tag from the repository
+ /* read and parse a tag from the repository */
git_tag *tag1, *tag2;
git_commit *commit;
git_oid id1, id2, id_commit;
cl_git_pass(git_tag_lookup(&tag1, g_repo, &id1));
cl_assert_equal_s(git_tag_name(tag1), "test");
- cl_assert(git_tag_target_type(tag1) == GIT_OBJ_TAG);
+ cl_assert(git_tag_target_type(tag1) == GIT_OBJECT_TAG);
cl_git_pass(git_tag_target((git_object **)&tag2, tag1));
cl_assert(tag2 != NULL);
void test_object_tag_read__parse_without_tagger(void)
{
- // read and parse a tag without a tagger field
+ /* read and parse a tag without a tagger field */
git_repository *bad_tag_repo;
git_tag *bad_tag;
git_commit *commit;
git_oid id, id_commit;
- // TODO: This is a little messy
+ /* TODO: This is a little messy */
cl_git_pass(git_repository_open(&bad_tag_repo, cl_fixture("bad_tag.git")));
git_oid_fromstr(&id, bad_tag_id);
void test_object_tag_read__parse_without_message(void)
{
- // read and parse a tag without a message field
+ /* read and parse a tag without a message field */
git_repository *short_tag_repo;
git_tag *short_tag;
git_commit *commit;
git_oid id, id_commit;
- // TODO: This is a little messy
+ /* TODO: This is a little messy */
cl_git_pass(git_repository_open(&short_tag_repo, cl_fixture("short_tag.git")));
git_oid_fromstr(&id, short_tag_id);
cl_git_pass(git_tag_lookup(&tag, repo, &id));
cl_assert_equal_s(git_tag_name(tag), "taggerless");
- cl_assert(git_tag_target_type(tag) == GIT_OBJ_COMMIT);
+ cl_assert(git_tag_target_type(tag) == GIT_OBJECT_COMMIT);
cl_assert(tag->message == NULL);
cl_assert(tag->tagger == NULL);
cl_git_pass(git_repository_odb__weakptr(&odb, g_repo));
- cl_git_pass(git_odb_write(&id, odb, silly_tag, strlen(silly_tag), GIT_OBJ_TAG));
+ cl_git_pass(git_odb_write(&id, odb, silly_tag, strlen(silly_tag), GIT_OBJECT_TAG));
cl_git_pass(git_tag_lookup(&tag, g_repo, &id));
cl_assert_equal_s("v1_0_1 release\n", git_tag_message(tag));
static git_repository *g_repo;
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_object_tag_write__initialize(void)
{
g_repo = cl_git_sandbox_init("testrepo");
void test_object_tag_write__basic(void)
{
- // write a tag to the repository and read it again
+ /* write a tag to the repository and read it again */
git_tag *tag;
git_oid target_id, tag_id;
git_signature *tagger;
git_object *target;
git_oid_fromstr(&target_id, tagged_commit);
- cl_git_pass(git_object_lookup(&target, g_repo, &target_id, GIT_OBJ_COMMIT));
+ cl_git_pass(git_object_lookup(&target, g_repo, &target_id, GIT_OBJECT_COMMIT));
/* create signature */
cl_git_pass(git_signature_new(&tagger, tagger_name, tagger_email, 123456789, 60));
void test_object_tag_write__overwrite(void)
{
- // Attempt to write a tag bearing the same name than an already existing tag
+ /* Attempt to write a tag bearing the same name than an already existing tag */
git_oid target_id, tag_id;
git_signature *tagger;
git_object *target;
git_oid_fromstr(&target_id, tagged_commit);
- cl_git_pass(git_object_lookup(&target, g_repo, &target_id, GIT_OBJ_COMMIT));
+ cl_git_pass(git_object_lookup(&target, g_repo, &target_id, GIT_OBJECT_COMMIT));
/* create signature */
cl_git_pass(git_signature_new(&tagger, tagger_name, tagger_email, 123456789, 60));
void test_object_tag_write__replace(void)
{
- // Replace an already existing tag
+ /* Replace an already existing tag */
git_oid target_id, tag_id, old_tag_id;
git_signature *tagger;
git_reference *ref_tag;
git_object *target;
git_oid_fromstr(&target_id, tagged_commit);
- cl_git_pass(git_object_lookup(&target, g_repo, &target_id, GIT_OBJ_COMMIT));
+ cl_git_pass(git_object_lookup(&target, g_repo, &target_id, GIT_OBJECT_COMMIT));
cl_git_pass(git_reference_lookup(&ref_tag, g_repo, "refs/tags/e90810b"));
git_oid_cpy(&old_tag_id, git_reference_target(ref_tag));
void test_object_tag_write__lightweight(void)
{
- // write a lightweight tag to the repository and read it again
+ /* write a lightweight tag to the repository and read it again */
git_oid target_id, object_id;
git_reference *ref_tag;
git_object *target;
git_oid_fromstr(&target_id, tagged_commit);
- cl_git_pass(git_object_lookup(&target, g_repo, &target_id, GIT_OBJ_COMMIT));
+ cl_git_pass(git_object_lookup(&target, g_repo, &target_id, GIT_OBJECT_COMMIT));
cl_git_pass(git_tag_create_lightweight(
&object_id,
void test_object_tag_write__lightweight_over_existing(void)
{
- // Attempt to write a lightweight tag bearing the same name than an already existing tag
+ /* Attempt to write a lightweight tag bearing the same name than an already existing tag */
git_oid target_id, object_id, existing_object_id;
git_object *target;
git_oid_fromstr(&target_id, tagged_commit);
- cl_git_pass(git_object_lookup(&target, g_repo, &target_id, GIT_OBJ_COMMIT));
+ cl_git_pass(git_object_lookup(&target, g_repo, &target_id, GIT_OBJECT_COMMIT));
cl_assert_equal_i(GIT_EEXISTS, git_tag_create_lightweight(
&object_id,
void test_object_tag_write__delete(void)
{
- // Delete an already existing tag
+ /* Delete an already existing tag */
git_reference *ref_tag;
cl_git_pass(git_tag_delete(g_repo, "e90810b"));
git_object *target;
git_oid_fromstr(&target_id, tagged_commit);
- cl_git_pass(git_object_lookup(&target, g_repo, &target_id, GIT_OBJ_COMMIT));
+ cl_git_pass(git_object_lookup(&target, g_repo, &target_id, GIT_OBJECT_COMMIT));
cl_git_pass(git_signature_new(&tagger, tagger_name, tagger_email, 123456789, 60));
cl_git_pass(git_signature_new(&tagger, tagger_name, tagger_email, 123456789, 60));
git_oid_fromstr(&target_id, tagged_commit);
- cl_git_pass(git_object_lookup(&target, g_repo, &target_id, GIT_OBJ_COMMIT));
+ cl_git_pass(git_object_lookup(&target, g_repo, &target_id, GIT_OBJECT_COMMIT));
cl_git_pass(git_tag_annotation_create(tag_id, g_repo, name, target, tagger, "boom!"));
git_object_free(target);
* parent cf80f8de9f1185bf3a05f993f6121880dd0cfbc9
* author Ben Straub <bstraub@github.com> 1343755506 -0700
* committer Ben Straub <bstraub@github.com> 1343755506 -0700
- *
+ *
* Change a file mode
- *
+ *
* diff --git a/a/b.txt b/a/b.txt
* old mode 100644
* new mode 100755
{
git_oid oid;
const git_tree_entry *entry;
-
+
cl_git_pass(git_oid_fromstr(&oid,
"a8233120f6ad708f843d861ce2b7228ec4e3dec6")); /* blob oid (README) */
{
git_oid oid;
const git_tree_entry *entry;
-
+
cl_git_pass(git_oid_fromstr(&oid,
"a8233120f6ad708f843d861ce2b7228ec4e3dec6")); /* blob oid (README) */
tree_creator(&tid, two_blobs);
tree_checker(&tid, "a71586c1dfe8a71c6cbf6c129f404c5642ff31bd", GIT_FILEMODE_BLOB);
-
+
tree_creator(&tid, one_blob_and_one_tree);
tree_checker(&tid, "4e0883eeeeebc1fb1735161cea82f7cb5fab7e63", GIT_FILEMODE_TREE);
}
ancestor_entry.path = "duplicate";
ancestor_entry.mode = GIT_FILEMODE_BLOB;
- GIT_IDXENTRY_STAGE_SET(&ancestor_entry, 1);
+ GIT_INDEX_ENTRY_STAGE_SET(&ancestor_entry, 1);
git_oid_fromstr(&ancestor_entry.id, "a8233120f6ad708f843d861ce2b7228ec4e3dec6");
our_entry.path = "duplicate";
our_entry.mode = GIT_FILEMODE_BLOB;
- GIT_IDXENTRY_STAGE_SET(&our_entry, 2);
+ GIT_INDEX_ENTRY_STAGE_SET(&our_entry, 2);
git_oid_fromstr(&our_entry.id, "45b983be36b73c0788dc9cbcb76cbb80fc7bb057");
their_entry.path = "duplicate";
their_entry.mode = GIT_FILEMODE_BLOB;
- GIT_IDXENTRY_STAGE_SET(&their_entry, 3);
+ GIT_INDEX_ENTRY_STAGE_SET(&their_entry, 3);
git_oid_fromstr(&their_entry.id, "a71586c1dfe8a71c6cbf6c129f404c5642ff31bd");
cl_git_pass(git_index_conflict_add(index, &ancestor_entry, &our_entry, &their_entry));
cl_git_pass(git_repository_index(&index, _repo));
- add_fake_conflicts(index);
+ add_fake_conflicts(index);
cl_assert_equal_i(GIT_EUNMERGED, git_index_write_tree(&tid, index));
--- /dev/null
+#include "clar_libgit2.h"
+#include "tree.h"
+#include "object.h"
+
+#define OID1_HEX \
+ "\xae\x90\xf1\x2e\xea\x69\x97\x29\xed\x24" \
+ "\x55\x5e\x40\xb9\xfd\x66\x9d\xa1\x2a\x12"
+#define OID1_STR "ae90f12eea699729ed24555e40b9fd669da12a12"
+
+#define OID2_HEX \
+ "\xe8\xbf\xe5\xaf\x39\x57\x9a\x7e\x48\x98" \
+ "\xbb\x23\xf3\xa7\x6a\x72\xc3\x68\xce\xe6"
+#define OID2_STR "e8bfe5af39579a7e4898bb23f3a76a72c368cee6"
+
+typedef struct {
+ const char *filename;
+ uint16_t attr;
+ const char *oid;
+} expected_entry;
+
+static void assert_tree_parses(const char *data, size_t datalen,
+ expected_entry *expected_entries, size_t expected_nentries)
+{
+ git_tree *tree;
+ size_t n;
+
+ if (!datalen)
+ datalen = strlen(data);
+ cl_git_pass(git_object__from_raw((git_object **) &tree, data, datalen, GIT_OBJECT_TREE));
+
+ cl_assert_equal_i(git_tree_entrycount(tree), expected_nentries);
+
+ for (n = 0; n < expected_nentries; n++) {
+ expected_entry *expected = expected_entries + n;
+ const git_tree_entry *entry;
+ git_oid oid;
+
+ cl_git_pass(git_oid_fromstr(&oid, expected->oid));
+
+ cl_assert(entry = git_tree_entry_byname(tree, expected->filename));
+ cl_assert_equal_s(expected->filename, entry->filename);
+ cl_assert_equal_i(expected->attr, entry->attr);
+ cl_assert_equal_oid(&oid, entry->oid);
+ }
+
+ git_object_free(&tree->object);
+}
+
+static void assert_tree_fails(const char *data, size_t datalen)
+{
+ git_object *object;
+ if (!datalen)
+ datalen = strlen(data);
+ cl_git_fail(git_object__from_raw(&object, data, datalen, GIT_OBJECT_TREE));
+}
+
+void test_object_tree_parse__single_blob_parses(void)
+{
+ expected_entry entries[] = {
+ { "foo", 0100644, OID1_STR },
+ };
+ const char data[] = "100644 foo\x00" OID1_HEX;
+
+ assert_tree_parses(data, ARRAY_SIZE(data) - 1, entries, ARRAY_SIZE(entries));
+}
+
+void test_object_tree_parse__single_tree_parses(void)
+{
+ expected_entry entries[] = {
+ { "foo", 040000, OID1_STR },
+ };
+ const char data[] = "040000 foo\x00" OID1_HEX;
+
+ assert_tree_parses(data, ARRAY_SIZE(data) - 1, entries, ARRAY_SIZE(entries));
+}
+
+void test_object_tree_parse__leading_filename_spaces_parse(void)
+{
+ expected_entry entries[] = {
+ { " bar", 0100644, OID1_STR },
+ };
+ const char data[] = "100644 bar\x00" OID1_HEX;
+
+ assert_tree_parses(data, ARRAY_SIZE(data) - 1, entries, ARRAY_SIZE(entries));
+}
+
+void test_object_tree_parse__multiple_entries_parse(void)
+{
+ expected_entry entries[] = {
+ { "bar", 0100644, OID1_STR },
+ { "foo", 040000, OID2_STR },
+ };
+ const char data[] =
+ "100644 bar\x00" OID1_HEX
+ "040000 foo\x00" OID2_HEX;
+
+ assert_tree_parses(data, ARRAY_SIZE(data) - 1, entries, ARRAY_SIZE(entries));
+}
+
+void test_object_tree_parse__invalid_mode_fails(void)
+{
+ const char data[] = "10x644 bar\x00" OID1_HEX;
+ assert_tree_fails(data, ARRAY_SIZE(data) - 1);
+}
+
+void test_object_tree_parse__missing_mode_fails(void)
+{
+ const char data[] = " bar\x00" OID1_HEX;
+ assert_tree_fails(data, ARRAY_SIZE(data) - 1);
+}
+
+void test_object_tree_parse__mode_doesnt_cause_oob_read(void)
+{
+ const char data[] = "100644 bar\x00" OID1_HEX;
+ assert_tree_fails(data, 2);
+ /*
+ * An oob-read would correctly parse the filename and
+ * later fail to parse the OID with a different error
+ * message
+ */
+ cl_assert_equal_s(git_error_last()->message, "failed to parse tree: missing space after filemode");
+}
+
+void test_object_tree_parse__unreasonably_large_mode_fails(void)
+{
+ const char data[] = "10000000000000000000000000 bar\x00" OID1_HEX;
+ assert_tree_fails(data, ARRAY_SIZE(data) - 1);
+}
+
+void test_object_tree_parse__missing_filename_separator_fails(void)
+{
+ const char data[] = "100644bar\x00" OID1_HEX;
+ assert_tree_fails(data, ARRAY_SIZE(data) - 1);
+}
+
+void test_object_tree_parse__missing_filename_terminator_fails(void)
+{
+ const char data[] = "100644 bar" OID1_HEX;
+ assert_tree_fails(data, ARRAY_SIZE(data) - 1);
+}
+
+void test_object_tree_parse__empty_filename_fails(void)
+{
+ const char data[] = "100644 \x00" OID1_HEX;
+ assert_tree_fails(data, ARRAY_SIZE(data) - 1);
+}
+
+void test_object_tree_parse__trailing_garbage_fails(void)
+{
+ const char data[] = "100644 bar\x00" OID1_HEX "x";
+ assert_tree_fails(data, ARRAY_SIZE(data) - 1);
+}
+
+void test_object_tree_parse__leading_space_fails(void)
+{
+ const char data[] = " 100644 bar\x00" OID1_HEX;
+ assert_tree_fails(data, ARRAY_SIZE(data) - 1);
+}
+
+void test_object_tree_parse__truncated_oid_fails(void)
+{
+ const char data[] = " 100644 bar\x00" OID1_HEX;
+ assert_tree_fails(data, ARRAY_SIZE(data) - 2);
+}
static git_repository *g_repo;
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_object_tree_read__initialize(void)
{
g_repo = cl_git_sandbox_init("testrepo");
void test_object_tree_read__loaded(void)
{
- // acces randomly the entries on a loaded tree
+ /* acces randomly the entries on a loaded tree */
git_oid id;
git_tree *tree;
void test_object_tree_read__two(void)
{
- // read a tree from the repository
+ /* read a tree from the repository */
git_oid id;
git_tree *tree;
const git_tree_entry *entry;
cl_assert(git_tree_entrycount(tree) == 3);
/* GH-86: git_object_lookup() should also check the type if the object comes from the cache */
- cl_assert(git_object_lookup(&obj, g_repo, &id, GIT_OBJ_TREE) == 0);
+ cl_assert(git_object_lookup(&obj, g_repo, &id, GIT_OBJECT_TREE) == 0);
cl_assert(obj != NULL);
git_object_free(obj);
obj = NULL;
- cl_git_fail(git_object_lookup(&obj, g_repo, &id, GIT_OBJ_BLOB));
+ cl_git_fail(git_object_lookup(&obj, g_repo, &id, GIT_OBJECT_BLOB));
cl_assert(obj == NULL);
entry = git_tree_entry_byname(tree, "README");
GIT_UNUSED(root);
- if (git_tree_entry_type(entry) == GIT_OBJ_TREE)
+ if (git_tree_entry_type(entry) == GIT_OBJECT_TREE)
data->dirs++;
else
data->files++;
cl_git_pass(git_tree_entry_bypath(&te, tree, b.ptr));
cl_assert_equal_s(the_paths[j], git_tree_entry_name(te));
git_tree_entry_free(te);
- git_buf_free(&b);
+ git_buf_dispose(&b);
}
}
cl_git_pass(git_treebuilder_new(&bld, g_repo, NULL));
cl_git_fail(git_treebuilder_insert(NULL, bld, "null_oid_file", &null_oid, GIT_FILEMODE_BLOB));
- cl_assert(giterr_last() && strstr(giterr_last()->message, "null OID") != NULL);
+ cl_assert(git_error_last() && strstr(git_error_last()->message, "null OID") != NULL);
git_treebuilder_free(bld);
}
{
size_t i;
- git_buf_free(&destpath);
- git_buf_free(&filepath);
+ git_buf_dispose(&destpath);
+ git_buf_dispose(&filepath);
for (i = 0; i < ARRAY_SIZE(paths); i++)
cl_fixture_cleanup(paths[i]);
}
static int fake_backend__read(
- void **buffer_p, size_t *len_p, git_otype *type_p,
+ void **buffer_p, size_t *len_p, git_object_t *type_p,
git_odb_backend *backend, const git_oid *oid)
{
const fake_object *obj;
*len_p = strlen(obj->content);
*buffer_p = git__strdup(obj->content);
- *type_p = GIT_OBJ_BLOB;
+ *type_p = GIT_OBJECT_BLOB;
return 0;
}
static int fake_backend__read_header(
- size_t *len_p, git_otype *type_p,
+ size_t *len_p, git_object_t *type_p,
git_odb_backend *backend, const git_oid *oid)
{
const fake_object *obj;
return error;
*len_p = strlen(obj->content);
- *type_p = GIT_OBJ_BLOB;
+ *type_p = GIT_OBJECT_BLOB;
return 0;
}
static int fake_backend__read_prefix(
- git_oid *out_oid, void **buffer_p, size_t *len_p, git_otype *type_p,
+ git_oid *out_oid, void **buffer_p, size_t *len_p, git_object_t *type_p,
git_odb_backend *backend, const git_oid *short_oid, size_t len)
{
const fake_object *obj;
git_oid_fromstr(out_oid, obj->oid);
*len_p = strlen(obj->content);
*buffer_p = git__strdup(obj->content);
- *type_p = GIT_OBJ_BLOB;
+ *type_p = GIT_OBJECT_BLOB;
return 0;
}
fake_backend *backend;
backend = git__calloc(1, sizeof(fake_backend));
- GITERR_CHECK_ALLOC(backend);
+ GIT_ERROR_CHECK_ALLOC(backend);
backend->parent.version = GIT_ODB_BACKEND_VERSION;
void test_odb_backend_mempack__write_succeeds(void)
{
const char *data = "data";
- cl_git_pass(git_odb_write(&_oid, _odb, data, strlen(data) + 1, GIT_OBJ_BLOB));
+ cl_git_pass(git_odb_write(&_oid, _odb, data, strlen(data) + 1, GIT_OBJECT_BLOB));
cl_git_pass(git_odb_read(&_obj, _odb, &_oid));
}
void test_odb_backend_mempack__exists_with_existing_objects_succeeds(void)
{
const char *data = "data";
- cl_git_pass(git_odb_write(&_oid, _odb, data, strlen(data) + 1, GIT_OBJ_BLOB));
+ cl_git_pass(git_odb_write(&_oid, _odb, data, strlen(data) + 1, GIT_OBJECT_BLOB));
cl_assert(git_odb_exists(_odb, &_oid) == 1);
}
const git_error *err;
git_repository_odb(&odb, _repo);
- cl_git_fail(git_odb_write(&id, odb, "Hello world!\n", 13, GIT_OBJ_BLOB));
+ cl_git_fail(git_odb_write(&id, odb, "Hello world!\n", 13, GIT_OBJECT_BLOB));
- err = giterr_last();
+ err = git_error_last();
cl_assert_equal_s(err->message, "cannot write object - unsupported in the loaded odb backends");
git_odb_free(odb);
git_object *obj;
cl_git_fail_with(
- git_object_lookup(&obj, _repo, &_nonexisting_oid, GIT_OBJ_ANY),
+ git_object_lookup(&obj, _repo, &_nonexisting_oid, GIT_OBJECT_ANY),
GIT_ENOTFOUND);
cl_assert_equal_i(1, _fake->read_calls);
git_object *obj;
cl_git_fail_with(
- git_object_lookup_prefix(&obj, _repo, &_nonexisting_oid, 7, GIT_OBJ_ANY),
+ git_object_lookup_prefix(&obj, _repo, &_nonexisting_oid, 7, GIT_OBJECT_ANY),
GIT_ENOTFOUND);
cl_assert_equal_i(1, _fake->read_prefix_calls);
{
git_odb *odb;
size_t len;
- git_otype type;
+ git_object_t type;
cl_git_pass(git_repository_odb__weakptr(&odb, _repo));
{
git_object *obj;
- cl_git_pass(git_object_lookup(&obj, _repo, &_existing_oid, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&obj, _repo, &_existing_oid, GIT_OBJECT_ANY));
cl_assert_equal_i(1, _fake->read_calls);
{
git_object *obj;
- cl_git_pass(git_object_lookup_prefix(&obj, _repo, &_existing_oid, 7, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup_prefix(&obj, _repo, &_existing_oid, 7, GIT_OBJECT_ANY));
cl_assert_equal_i(1, _fake->read_prefix_calls);
{
git_odb *odb;
size_t len;
- git_otype type;
+ git_object_t type;
cl_git_pass(git_repository_odb__weakptr(&odb, _repo));
cl_assert(!git_odb_exists(_odb, &null_oid));
cl_git_fail_with(GIT_ENOTFOUND, git_odb_read(&obj, _odb, &null_oid));
- cl_assert(giterr_last() && strstr(giterr_last()->message, "null OID"));
+ cl_assert(git_error_last() && strstr(git_error_last()->message, "null OID"));
}
cl_git_pass(git_oid_fromstr(&id, "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391"));
cl_git_fail_with(GIT_ENOTFOUND, git_blob_lookup(&blob, g_repo, &id));
- cl_git_pass(git_odb_write(&written_id, g_odb, "", 0, GIT_OBJ_BLOB));
+ cl_git_pass(git_odb_write(&written_id, g_odb, "", 0, GIT_OBJECT_BLOB));
cl_assert(git_path_exists(TEST_REPO_PATH "/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391"));
}
cl_git_pass(git_oid_fromstr(&id, "4b825dc642cb6eb9a060e54bf8d69288fbee4904"));
cl_git_pass(git_tree_lookup(&tree, g_repo, &id));
- cl_assert_equal_i(GIT_OBJ_TREE, git_object_type((git_object *) tree));
+ cl_assert_equal_i(GIT_OBJECT_TREE, git_object_type((git_object *) tree));
cl_assert_equal_i(0, git_tree_entrycount(tree));
cl_assert_equal_p(NULL, git_tree_entry_byname(tree, "foo"));
git_tree_free(tree);
return -123;
}
+static int foreach_stop_cb_positive_ret(const git_oid *oid, void *data)
+{
+ int *nobj = data;
+ (*nobj)++;
+
+ GIT_UNUSED(oid);
+
+ return (*nobj == 1000) ? 321 : 0;
+}
+
void test_odb_foreach__interrupt_foreach(void)
{
int nobj = 0;
cl_assert_equal_i(-321, git_odb_foreach(_odb, foreach_stop_cb, &nobj));
cl_assert(nobj == 1000);
+ nobj = 0;
+
+ cl_assert_equal_i(321, git_odb_foreach(_odb, foreach_stop_cb_positive_ret, &nobj));
+ cl_assert(nobj == 1000);
+
git_odb_free(_odb);
git_repository_free(_repo);
cl_git_pass(git_repository_init(&_repo, "onlyloose.git", true));
git_repository_odb(&_odb, _repo);
- cl_git_pass(git_odb_write(&id, _odb, "", 0, GIT_OBJ_BLOB));
+ cl_git_pass(git_odb_write(&id, _odb, "", 0, GIT_OBJECT_BLOB));
cl_assert_equal_i(-123, git_odb_foreach(_odb, foreach_stop_first_cb, &nobj));
}
cl_git_pass(git_buf_printf(&buf, "%s/objects/somefile", git_repository_path(repo)));
cl_git_mkfile(buf.ptr, "");
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
cl_git_pass(git_repository_odb(&odb, repo));
cl_git_pass(git_odb_foreach(odb, foreach_cb, &nobj));
cl_must_pass(p_utimes(git_buf_cstr(&fullpath), old));
cl_must_pass(p_lstat(git_buf_cstr(&fullpath), out));
- git_buf_free(&fullpath);
+ git_buf_dispose(&fullpath);
}
#define LOOSE_STR "my new file\n"
/* ensure that packfile is freshened */
cl_git_pass(git_odb_write(&id, odb, PACKED_STR,
- CONST_STRLEN(PACKED_STR), GIT_OBJ_BLOB));
+ CONST_STRLEN(PACKED_STR), GIT_OBJECT_BLOB));
cl_assert_equal_oid(&expected_id, &id);
cl_must_pass(p_lstat("testrepo.git/objects/pack/" PACKED_FN, &after));
/* ensure that the pack file is not freshened again immediately */
cl_git_pass(git_odb_write(&id, odb, PACKED_STR,
- CONST_STRLEN(PACKED_STR), GIT_OBJ_BLOB));
+ CONST_STRLEN(PACKED_STR), GIT_OBJECT_BLOB));
cl_assert_equal_oid(&expected_id, &id);
cl_must_pass(p_lstat("testrepo.git/objects/pack/" PACKED_FN, &after));
for (i = 0; i < 3041; i++)
cl_git_pass(git_buf_puts(&buf, "Hello, world.\n"));
- cl_git_pass(git_odb_open_wstream(&stream, odb, LARGEFILE_SIZE, GIT_OBJ_BLOB));
+ cl_git_pass(git_odb_open_wstream(&stream, odb, LARGEFILE_SIZE, GIT_OBJECT_BLOB));
for (i = 0; i < 126103; i++)
cl_git_pass(git_odb_stream_write(stream, buf.ptr, buf.size));
cl_git_pass(git_odb_stream_finalize_write(oid, stream));
git_odb_stream_free(stream);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_odb_largefiles__write_from_memory(void)
cl_git_pass(git_buf_puts(&buf, "Hello, world.\n"));
git_oid_fromstr(&expected, "3fb56989cca483b21ba7cb0a6edb229d10e1c26c");
- cl_git_pass(git_odb_write(&oid, odb, buf.ptr, buf.size, GIT_OBJ_BLOB));
+ cl_git_pass(git_odb_write(&oid, odb, buf.ptr, buf.size, GIT_OBJECT_BLOB));
cl_assert_equal_oid(&expected, &oid);
}
char hdr[64];
size_t len, hdr_len, total = 0;
git_hash_ctx hash;
- git_otype type;
+ git_object_t type;
int ret;
#ifndef GIT_ARCH_64
cl_git_pass(git_odb_open_rstream(&stream, &len, &type, odb, &oid));
cl_assert_equal_sz(LARGEFILE_SIZE, len);
- cl_assert_equal_i(GIT_OBJ_BLOB, type);
+ cl_assert_equal_i(GIT_OBJECT_BLOB, type);
cl_git_pass(git_hash_ctx_init(&hash));
cl_git_pass(git_odb__format_object_header(&hdr_len, hdr, sizeof(hdr), len, type));
{
git_oid oid;
size_t len;
- git_otype type;
+ git_object_t type;
#ifndef GIT_ARCH_64
cl_skip();
cl_git_pass(git_odb_read_header(&len, &type, odb, &oid));
cl_assert_equal_sz(LARGEFILE_SIZE, len);
- cl_assert_equal_i(GIT_OBJ_BLOB, type);
+ cl_assert_equal_i(GIT_OBJECT_BLOB, type);
}
git_oid id;
git_odb *odb;
size_t len;
- git_otype type;
+ git_object_t type;
write_object_files(data);
cl_git_pass(git_odb_new(&odb));
cl_git_pass(git_odb_backend_loose(&backend, "test-objects", -1, 0, dir_mode, file_mode));
cl_git_pass(git_odb_add_backend(odb, backend, 1));
- cl_git_pass(git_odb_write(&oid, odb, "Test data\n", 10, GIT_OBJ_BLOB));
+ cl_git_pass(git_odb_write(&oid, odb, "Test data\n", 10, GIT_OBJECT_BLOB));
cl_git_pass(p_stat("test-objects/67", &statbuf));
cl_assert_equal_i(statbuf.st_mode & os_mask, (expected_dir_mode & ~mask) & os_mask);
cl_git_pass(git_odb_new(&odb));
cl_git_pass(git_odb_backend_loose(&backend, "test-objects", -1, fsync, 0777, 0666));
cl_git_pass(git_odb_add_backend(odb, backend, 1));
- cl_git_pass(git_odb_write(&oid, odb, "Test data\n", 10, GIT_OBJ_BLOB));
+ cl_git_pass(git_odb_write(&oid, odb, "Test data\n", 10, GIT_OBJECT_BLOB));
git_odb_free(odb);
}
cl_git_pass(git_repository_init(&repo, "test-objects", 1));
cl_git_pass(git_repository_odb__weakptr(&odb, repo));
- cl_git_pass(git_odb_write(&oid, odb, "No fsync here\n", 14, GIT_OBJ_BLOB));
+ cl_git_pass(git_odb_write(&oid, odb, "No fsync here\n", 14, GIT_OBJECT_BLOB));
cl_assert(p_fsync__cnt == 0);
git_repository_free(repo);
cl_git_pass(git_repository_open(&repo, "test-objects"));
cl_repo_set_bool(repo, "core.fsyncObjectFiles", true);
cl_git_pass(git_repository_odb__weakptr(&odb, repo));
- cl_git_pass(git_odb_write(&oid, odb, "Now fsync\n", 10, GIT_OBJ_BLOB));
+ cl_git_pass(git_odb_write(&oid, odb, "Now fsync\n", 10, GIT_OBJECT_BLOB));
cl_assert(p_fsync__cnt > 0);
git_repository_free(repo);
}
struct expand_id_test_data {
char *lookup_id;
char *expected_id;
- git_otype expected_type;
+ git_object_t expected_type;
};
struct expand_id_test_data expand_id_test_data[] = {
/* some prefixes and their expected values */
- { "dea509d0", NULL, GIT_OBJ_ANY },
- { "00000000", NULL, GIT_OBJ_ANY },
- { "dea509d0", NULL, GIT_OBJ_ANY },
- { "dea509d09", "dea509d097ce692e167dfc6a48a7a280cc5e877e", GIT_OBJ_BLOB },
- { "dea509d0b", "dea509d0b3cb8ee0650f6ca210bc83f4678851ba", GIT_OBJ_BLOB },
- { "ce0136250", "ce013625030ba8dba906f756967f9e9ca394464a", GIT_OBJ_BLOB },
- { "0ddeaded", NULL, GIT_OBJ_ANY },
- { "4d5979b", "4d5979b468252190cb572ae758aca36928e8a91e", GIT_OBJ_TREE },
- { "0ddeaded", NULL, GIT_OBJ_ANY },
- { "0ddeadede", "0ddeadede9e6d6ccddce0ee1e5749eed0485e5ea", GIT_OBJ_BLOB },
- { "0ddeaded9", "0ddeaded9502971eefe1e41e34d0e536853ae20f", GIT_OBJ_BLOB },
- { "f00b4e", NULL, GIT_OBJ_ANY },
+ { "dea509d0", NULL, GIT_OBJECT_ANY },
+ { "00000000", NULL, GIT_OBJECT_ANY },
+ { "dea509d0", NULL, GIT_OBJECT_ANY },
+ { "dea509d09", "dea509d097ce692e167dfc6a48a7a280cc5e877e", GIT_OBJECT_BLOB },
+ { "dea509d0b", "dea509d0b3cb8ee0650f6ca210bc83f4678851ba", GIT_OBJECT_BLOB },
+ { "ce0136250", "ce013625030ba8dba906f756967f9e9ca394464a", GIT_OBJECT_BLOB },
+ { "0ddeaded", NULL, GIT_OBJECT_ANY },
+ { "4d5979b", "4d5979b468252190cb572ae758aca36928e8a91e", GIT_OBJECT_TREE },
+ { "0ddeaded", NULL, GIT_OBJECT_ANY },
+ { "0ddeadede", "0ddeadede9e6d6ccddce0ee1e5749eed0485e5ea", GIT_OBJECT_BLOB },
+ { "0ddeaded9", "0ddeaded9502971eefe1e41e34d0e536853ae20f", GIT_OBJECT_BLOB },
+ { "f00b4e", NULL, GIT_OBJECT_ANY },
/* this OID is too short and should be ambiguous! */
- { "f00", NULL, GIT_OBJ_ANY },
+ { "f00", NULL, GIT_OBJECT_ANY },
/* some full-length object ids */
- { "0000000000000000000000000000000000000000", NULL, GIT_OBJ_ANY },
+ { "0000000000000000000000000000000000000000", NULL, GIT_OBJECT_ANY },
{
"dea509d097ce692e167dfc6a48a7a280cc5e877e",
"dea509d097ce692e167dfc6a48a7a280cc5e877e",
- GIT_OBJ_BLOB
+ GIT_OBJECT_BLOB
},
- { "f00f00f00f00f00f00f00f00f00f00f00f00f00f", NULL, GIT_OBJ_ANY },
+ { "f00f00f00f00f00f00f00f00f00f00f00f00f00f", NULL, GIT_OBJECT_ANY },
{
"4d5979b468252190cb572ae758aca36928e8a91e",
"4d5979b468252190cb572ae758aca36928e8a91e",
- GIT_OBJ_TREE
+ GIT_OBJECT_TREE
},
/*
* ensure we're not leaking the return error code for the
* last lookup if the last object is invalid
*/
- { "0ddeadedfff", NULL, GIT_OBJ_ANY },
+ { "0ddeadedfff", NULL, GIT_OBJECT_ANY },
};
static void setup_prefix_query(
for (i = 0; i < num; i++) {
git_oid expected_id = {{0}};
size_t expected_len = 0;
- git_otype expected_type = 0;
+ git_object_t expected_type = 0;
if (expand_id_test_data[i].expected_id) {
git_oid_fromstr(&expected_id, expand_id_test_data[i].expected_id);
assert_found_objects(ids);
git__free(ids);
- /* test looking for an explicit GIT_OBJ_ANY */
+ /* test looking for an explicit GIT_OBJECT_ANY */
setup_prefix_query(&ids, &num);
for (i = 0; i < num; i++)
- ids[i].type = GIT_OBJ_ANY;
+ ids[i].type = GIT_OBJECT_ANY;
cl_git_pass(git_odb_expand_ids(_odb, ids, num));
assert_found_objects(ids);
setup_prefix_query(&ids, &num);
for (i = 0; i < num; i++)
- ids[i].type = (ids[i].type == GIT_OBJ_BLOB) ?
- GIT_OBJ_TREE : GIT_OBJ_BLOB;
+ ids[i].type = (ids[i].type == GIT_OBJECT_BLOB) ?
+ GIT_OBJECT_TREE : GIT_OBJECT_BLOB;
cl_git_pass(git_odb_expand_ids(_odb, ids, num));
assert_notfound_objects(ids);
git_oid id;
git_odb_object *obj;
size_t len;
- git_otype type;
+ git_object_t type;
cl_git_pass(git_oid_fromstr(&id, packed_objects[i]));
git_oid id;
git_odb_object *obj;
size_t len;
- git_otype type;
+ git_object_t type;
cl_git_pass(git_oid_fromstr(&id, loose_objects[i]));
git_oid id;
git_odb_object *obj;
size_t len;
- git_otype type;
+ git_object_t type;
cl_git_pass(git_oid_fromstr(&id, packed_objects_one[i]));
repo = cl_git_sandbox_init("testrepo.git");
cl_git_pass(git_repository_odb(&odb, repo));
- cl_git_pass(git_odb_open_wstream(&stream, odb, 14, GIT_OBJ_BLOB));
+ cl_git_pass(git_odb_open_wstream(&stream, odb, 14, GIT_OBJECT_BLOB));
cl_assert_equal_sz(14, stream->declared_size);
}
static char *_remote_url = NULL;
static char *_remote_user = NULL;
static char *_remote_pass = NULL;
+static char *_remote_sslnoverify = NULL;
static char *_remote_ssh_pubkey = NULL;
static char *_remote_ssh_privkey = NULL;
static char *_remote_ssh_passphrase = NULL;
static char *_remote_ssh_fingerprint = NULL;
-static char *_remote_proxy_url = NULL;
+static char *_remote_proxy_scheme = NULL;
+static char *_remote_proxy_host = NULL;
static char *_remote_proxy_user = NULL;
static char *_remote_proxy_pass = NULL;
+static char *_remote_proxy_selfsigned = NULL;
+static int _orig_proxies_need_reset = 0;
+static char *_orig_http_proxy = NULL;
+static char *_orig_https_proxy = NULL;
+
+static int ssl_cert(git_cert *cert, int valid, const char *host, void *payload)
+{
+ GIT_UNUSED(cert);
+ GIT_UNUSED(host);
+ GIT_UNUSED(payload);
+
+ if (_remote_sslnoverify != NULL)
+ valid = 1;
+
+ return valid ? 0 : GIT_ECERTIFICATE;
+}
void test_online_clone__initialize(void)
{
g_options.checkout_opts = dummy_opts;
g_options.checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE;
g_options.fetch_opts = dummy_fetch;
+ g_options.fetch_opts.callbacks.certificate_check = ssl_cert;
_remote_url = cl_getenv("GITTEST_REMOTE_URL");
_remote_user = cl_getenv("GITTEST_REMOTE_USER");
_remote_pass = cl_getenv("GITTEST_REMOTE_PASS");
+ _remote_sslnoverify = cl_getenv("GITTEST_REMOTE_SSL_NOVERIFY");
_remote_ssh_pubkey = cl_getenv("GITTEST_REMOTE_SSH_PUBKEY");
_remote_ssh_privkey = cl_getenv("GITTEST_REMOTE_SSH_KEY");
_remote_ssh_passphrase = cl_getenv("GITTEST_REMOTE_SSH_PASSPHRASE");
_remote_ssh_fingerprint = cl_getenv("GITTEST_REMOTE_SSH_FINGERPRINT");
- _remote_proxy_url = cl_getenv("GITTEST_REMOTE_PROXY_URL");
+ _remote_proxy_scheme = cl_getenv("GITTEST_REMOTE_PROXY_SCHEME");
+ _remote_proxy_host = cl_getenv("GITTEST_REMOTE_PROXY_HOST");
_remote_proxy_user = cl_getenv("GITTEST_REMOTE_PROXY_USER");
_remote_proxy_pass = cl_getenv("GITTEST_REMOTE_PROXY_PASS");
+ _remote_proxy_selfsigned = cl_getenv("GITTEST_REMOTE_PROXY_SELFSIGNED");
+
+ _orig_proxies_need_reset = 0;
}
void test_online_clone__cleanup(void)
git__free(_remote_url);
git__free(_remote_user);
git__free(_remote_pass);
+ git__free(_remote_sslnoverify);
git__free(_remote_ssh_pubkey);
git__free(_remote_ssh_privkey);
git__free(_remote_ssh_passphrase);
git__free(_remote_ssh_fingerprint);
- git__free(_remote_proxy_url);
+ git__free(_remote_proxy_scheme);
+ git__free(_remote_proxy_host);
git__free(_remote_proxy_user);
git__free(_remote_proxy_pass);
+ git__free(_remote_proxy_selfsigned);
+
+ if (_orig_proxies_need_reset) {
+ cl_setenv("HTTP_PROXY", _orig_http_proxy);
+ cl_setenv("HTTPS_PROXY", _orig_https_proxy);
+
+ git__free(_orig_http_proxy);
+ git__free(_orig_https_proxy);
+ }
}
void test_online_clone__network_full(void)
cl_assert_equal_i(true, git_repository_head_unborn(g_repo));
cl_git_pass(git_reference_lookup(&head, g_repo, GIT_HEAD_FILE));
- cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(head));
+ cl_assert_equal_i(GIT_REFERENCE_SYMBOLIC, git_reference_type(head));
cl_assert_equal_s("refs/heads/master", git_reference_symbolic_target(head));
git_reference_free(head);
cl_assert_equal_i(true, git_path_isfile(git_buf_cstr(&path)));
cl_git_pass(git_reference_lookup(&head, g_repo, "HEAD"));
- cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(head));
+ cl_assert_equal_i(GIT_REFERENCE_SYMBOLIC, git_reference_type(head));
cl_assert_equal_s("refs/heads/master", git_reference_symbolic_target(head));
cl_assert_equal_i(true, checkout_progress_cb_was_called);
cl_assert_equal_i(true, fetch_progress_cb_was_called);
git_reference_free(head);
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
static int remote_mirror_cb(git_remote **out, git_repository *repo,
cl_git_pass(git_clone(&g_repo, LIVE_REPO_URL, "./foo.git", &opts));
cl_git_pass(git_reference_lookup(&head, g_repo, "HEAD"));
- cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(head));
+ cl_assert_equal_i(GIT_REFERENCE_SYMBOLIC, git_reference_type(head));
cl_assert_equal_s("refs/heads/master", git_reference_symbolic_target(head));
cl_assert_equal_i(true, fetch_progress_cb_was_called);
_remote_user, _remote_ssh_pubkey,
_remote_ssh_privkey, _remote_ssh_passphrase);
- giterr_set(GITERR_NET, "unexpected cred type");
+ git_error_set(GIT_ERROR_NET, "unexpected cred type");
return -1;
}
#endif
g_options.fetch_opts.callbacks.credentials = check_ssh_auth_methods;
g_options.fetch_opts.callbacks.payload = &with_user;
+ g_options.fetch_opts.callbacks.certificate_check = NULL;
with_user = 0;
cl_git_fail_with(GIT_EUSER,
g_options.fetch_opts.callbacks.transport = git_transport_ssh_with_paths;
g_options.fetch_opts.callbacks.credentials = cred_cb;
g_options.fetch_opts.callbacks.payload = &arr;
+ g_options.fetch_opts.callbacks.certificate_check = NULL;
cl_git_fail(git_clone(&g_repo, _remote_url, "./foo", &g_options));
return ret;
}
- giterr_set(GITERR_NET, "unexpected cred type");
+ git_error_set(GIT_ERROR_NET, "unexpected cred type");
return -1;
}
}
static int called_proxy_creds;
-static int proxy_creds(git_cred **out, const char *url, const char *username, unsigned int allowed, void *payload)
+static int proxy_cred_cb(git_cred **out, const char *url, const char *username, unsigned int allowed, void *payload)
{
GIT_UNUSED(url);
GIT_UNUSED(username);
return git_cred_userpass_plaintext_new(out, _remote_proxy_user, _remote_proxy_pass);
}
+static int proxy_cert_cb(git_cert *cert, int valid, const char *host, void *payload)
+{
+ char *colon;
+ size_t host_len;
+
+ GIT_UNUSED(cert);
+ GIT_UNUSED(valid);
+ GIT_UNUSED(payload);
+
+ cl_assert(_remote_proxy_host);
+
+ if ((colon = strchr(_remote_proxy_host, ':')) != NULL)
+ host_len = (colon - _remote_proxy_host);
+ else
+ host_len = strlen(_remote_proxy_host);
+
+ if (_remote_proxy_selfsigned != NULL &&
+ strlen(host) == host_len &&
+ strncmp(_remote_proxy_host, host, host_len) == 0)
+ valid = 1;
+
+ return valid ? 0 : GIT_ECERTIFICATE;
+}
+
void test_online_clone__proxy_credentials_request(void)
{
git_buf url = GIT_BUF_INIT;
- if (!_remote_proxy_url || !_remote_proxy_user || !_remote_proxy_pass)
+ if (!_remote_proxy_host || !_remote_proxy_user || !_remote_proxy_pass)
cl_skip();
- cl_git_pass(git_buf_printf(&url, "http://%s/", _remote_proxy_url));
+ cl_git_pass(git_buf_printf(&url, "%s://%s/",
+ _remote_proxy_scheme ? _remote_proxy_scheme : "http",
+ _remote_proxy_host));
g_options.fetch_opts.proxy_opts.type = GIT_PROXY_SPECIFIED;
g_options.fetch_opts.proxy_opts.url = url.ptr;
- g_options.fetch_opts.proxy_opts.credentials = proxy_creds;
+ g_options.fetch_opts.proxy_opts.credentials = proxy_cred_cb;
+ g_options.fetch_opts.proxy_opts.certificate_check = proxy_cert_cb;
called_proxy_creds = 0;
cl_git_pass(git_clone(&g_repo, "http://github.com/libgit2/TestGitRepository", "./foo", &g_options));
cl_assert(called_proxy_creds);
- git_buf_free(&url);
+ git_buf_dispose(&url);
}
void test_online_clone__proxy_credentials_in_url(void)
{
git_buf url = GIT_BUF_INIT;
- if (!_remote_proxy_url || !_remote_proxy_user || !_remote_proxy_pass)
+ if (!_remote_proxy_host || !_remote_proxy_user || !_remote_proxy_pass)
cl_skip();
- cl_git_pass(git_buf_printf(&url, "http://%s:%s@%s/", _remote_proxy_user, _remote_proxy_pass, _remote_proxy_url));
+ cl_git_pass(git_buf_printf(&url, "%s://%s:%s@%s/",
+ _remote_proxy_scheme ? _remote_proxy_scheme : "http",
+ _remote_proxy_user, _remote_proxy_pass, _remote_proxy_host));
g_options.fetch_opts.proxy_opts.type = GIT_PROXY_SPECIFIED;
g_options.fetch_opts.proxy_opts.url = url.ptr;
+ g_options.fetch_opts.proxy_opts.certificate_check = proxy_cert_cb;
called_proxy_creds = 0;
cl_git_pass(git_clone(&g_repo, "http://github.com/libgit2/TestGitRepository", "./foo", &g_options));
cl_assert(called_proxy_creds == 0);
- git_buf_free(&url);
+ git_buf_dispose(&url);
+}
+
+void test_online_clone__proxy_credentials_in_environment(void)
+{
+ git_buf url = GIT_BUF_INIT;
+
+ if (!_remote_proxy_host || !_remote_proxy_user || !_remote_proxy_pass)
+ cl_skip();
+
+ _orig_http_proxy = cl_getenv("HTTP_PROXY");
+ _orig_https_proxy = cl_getenv("HTTPS_PROXY");
+ _orig_proxies_need_reset = 1;
+
+ g_options.fetch_opts.proxy_opts.type = GIT_PROXY_AUTO;
+ g_options.fetch_opts.proxy_opts.certificate_check = proxy_cert_cb;
+
+ cl_git_pass(git_buf_printf(&url, "%s://%s:%s@%s/",
+ _remote_proxy_scheme ? _remote_proxy_scheme : "http",
+ _remote_proxy_user, _remote_proxy_pass, _remote_proxy_host));
+
+ cl_setenv("HTTP_PROXY", url.ptr);
+ cl_setenv("HTTPS_PROXY", url.ptr);
+
+ cl_git_pass(git_clone(&g_repo, "http://github.com/libgit2/TestGitRepository", "./foo", &g_options));
+
+ git_buf_dispose(&url);
+}
+
+void test_online_clone__proxy_auto_not_detected(void)
+{
+ g_options.fetch_opts.proxy_opts.type = GIT_PROXY_AUTO;
+
+ cl_git_pass(git_clone(&g_repo, "http://github.com/libgit2/TestGitRepository", "./foo", &g_options));
}
equals = (strcmp(fetchhead_buf.ptr, expected_fetchhead) == 0);
- git_buf_free(&fetchhead_buf);
+ git_buf_dispose(&fetchhead_buf);
cl_assert(equals);
}
cl_fail(git_buf_cstr(&msg));
- git_buf_free(&msg);
+ git_buf_dispose(&msg);
}
git_vector_foreach(actual, i, iter) {
git__free(actual_ref);
git_vector_free(&actual_refs);
- git_buf_free(&msg);
- git_buf_free(&ref_name);
+ git_buf_dispose(&msg);
+ git_buf_dispose(&ref_name);
}
static void verify_update_tips_callback(git_remote *remote, expected_ref expected_refs[], size_t expected_refs_len)
if (failed)
cl_fail(git_buf_cstr(&msg));
- git_buf_free(&ref_name);
- git_buf_free(&msg);
+ git_buf_dispose(&ref_name);
+ git_buf_dispose(&msg);
}
void test_online_push__initialize(void)
cl_fail(git_buf_cstr(&msg));
- git_buf_free(&msg);
+ git_buf_dispose(&msg);
}
};
static const unsigned int leaky_pack_len = 33;
+/*
+ * Packfile with a three objects. The first one is a tree referencing two blobs,
+ * the second object is one of those blobs. The second blob is missing.
+ */
+unsigned char incomplete_pack[] = {
+ 0x50, 0x41, 0x43, 0x4b, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02,
+ 0xae, 0x03, 0x78, 0x9c, 0x33, 0x34, 0x30, 0x30, 0x33, 0x31, 0x51, 0x48,
+ 0x4a, 0x2c, 0x62, 0x08, 0x17, 0x3b, 0x15, 0xd9, 0x7e, 0xfa, 0x67, 0x6d,
+ 0xf6, 0x56, 0x4f, 0x85, 0x7d, 0xcb, 0xd6, 0xde, 0x53, 0xd1, 0x6d, 0x7f,
+ 0x66, 0x08, 0x91, 0x4e, 0xcb, 0xcf, 0x67, 0x50, 0xad, 0x39, 0x9a, 0xa2,
+ 0xb3, 0x71, 0x41, 0xc8, 0x87, 0x9e, 0x13, 0xf6, 0xba, 0x53, 0xec, 0xc2,
+ 0xfe, 0xda, 0xed, 0x9b, 0x09, 0x00, 0xe8, 0xc8, 0x19, 0xab, 0x34, 0x78,
+ 0x9c, 0x4b, 0x4a, 0x2c, 0xe2, 0x02, 0x00, 0x03, 0x9d, 0x01, 0x40, 0x4b,
+ 0x72, 0xa2, 0x6f, 0xb6, 0x88, 0x2d, 0x6c, 0xa5, 0x07, 0xb2, 0xa5, 0x45,
+ 0xe8, 0xdb, 0xe6, 0x53, 0xb3, 0x52, 0xe2
+};
+unsigned int incomplete_pack_len = 115;
+
static const unsigned char base_obj[] = { 07, 076 };
static const unsigned int base_obj_len = 2;
git_indexer *idx = 0;
git_transfer_progress stats = { 0 };
- cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL, NULL));
+ cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL));
cl_git_pass(git_indexer_append(
idx, out_of_order_pack, out_of_order_pack_len, &stats));
cl_git_pass(git_indexer_commit(idx, &stats));
git_indexer *idx = 0;
git_transfer_progress stats = { 0 };
- cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL, NULL));
+ cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL));
cl_git_pass(git_indexer_append(
idx, missing_trailer_pack, missing_trailer_pack_len, &stats));
cl_git_fail(git_indexer_commit(idx, &stats));
- cl_assert(giterr_last() != NULL);
- cl_assert_equal_i(giterr_last()->klass, GITERR_INDEXER);
+ cl_assert(git_error_last() != NULL);
+ cl_assert_equal_i(git_error_last()->klass, GIT_ERROR_INDEXER);
git_indexer_free(idx);
}
git_indexer *idx = 0;
git_transfer_progress stats = { 0 };
- cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL, NULL));
+ cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL));
cl_git_pass(git_indexer_append(
idx, leaky_pack, leaky_pack_len, &stats));
cl_git_fail(git_indexer_commit(idx, &stats));
- cl_assert(giterr_last() != NULL);
- cl_assert_equal_i(giterr_last()->klass, GITERR_INDEXER);
+ cl_assert(git_error_last() != NULL);
+ cl_assert_equal_i(git_error_last()->klass, GIT_ERROR_INDEXER);
git_indexer_free(idx);
}
cl_git_pass(git_repository_odb(&odb, repo));
/* Store the missing base into your ODB so the indexer can fix the pack */
- cl_git_pass(git_odb_write(&id, odb, base_obj, base_obj_len, GIT_OBJ_BLOB));
+ cl_git_pass(git_odb_write(&id, odb, base_obj, base_obj_len, GIT_OBJECT_BLOB));
git_oid_fromstr(&should_id, "e68fe8129b546b101aee9510c5328e7f21ca1d18");
cl_assert_equal_oid(&should_id, &id);
- cl_git_pass(git_indexer_new(&idx, ".", 0, odb, NULL, NULL));
+ cl_git_pass(git_indexer_new(&idx, ".", 0, odb, NULL));
cl_git_pass(git_indexer_append(idx, thin_pack, thin_pack_len, &stats));
cl_git_pass(git_indexer_commit(idx, &stats));
cl_git_pass(p_stat(name, &st));
- cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL, NULL));
+ cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL));
read = p_read(fd, buffer, sizeof(buffer));
cl_assert(read != -1);
p_close(fd);
cl_git_pass(git_repository_odb(&odb, repo));
/* Store the missing base into your ODB so the indexer can fix the pack */
- cl_git_pass(git_odb_write(&id, odb, base_obj, base_obj_len, GIT_OBJ_BLOB));
+ cl_git_pass(git_odb_write(&id, odb, base_obj, base_obj_len, GIT_OBJECT_BLOB));
git_oid_fromstr(&should_id, "e68fe8129b546b101aee9510c5328e7f21ca1d18");
cl_assert_equal_oid(&should_id, &id);
- cl_git_pass(git_indexer_new(&idx, ".", 0, odb, NULL, NULL));
+ cl_git_pass(git_indexer_new(&idx, ".", 0, odb, NULL));
cl_git_pass(git_indexer_append(
idx, corrupt_thin_pack, corrupt_thin_pack_len, &stats));
cl_git_fail(git_indexer_commit(idx, &stats));
- cl_assert(giterr_last() != NULL);
- cl_assert_equal_i(giterr_last()->klass, GITERR_ZLIB);
+ cl_assert(git_error_last() != NULL);
+ cl_assert_equal_i(git_error_last()->klass, GIT_ERROR_ZLIB);
git_indexer_free(idx);
git_odb_free(odb);
git_repository_free(repo);
}
+void test_pack_indexer__incomplete_pack_fails_with_strict(void)
+{
+ git_indexer_options opts = GIT_INDEXER_OPTIONS_INIT;
+ git_indexer *idx = 0;
+ git_transfer_progress stats = { 0 };
+
+ opts.verify = 1;
+
+ cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, &opts));
+ cl_git_pass(git_indexer_append(
+ idx, incomplete_pack, incomplete_pack_len, &stats));
+ cl_git_fail(git_indexer_commit(idx, &stats));
+
+ cl_assert_equal_i(stats.total_objects, 2);
+ cl_assert_equal_i(stats.received_objects, 2);
+ cl_assert_equal_i(stats.indexed_objects, 2);
+
+ git_indexer_free(idx);
+}
+
+void test_pack_indexer__out_of_order_with_connectivity_checks(void)
+{
+ git_indexer_options opts = GIT_INDEXER_OPTIONS_INIT;
+ git_indexer *idx = 0;
+ git_transfer_progress stats = { 0 };
+
+ opts.verify = 1;
+
+ cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, &opts));
+ cl_git_pass(git_indexer_append(
+ idx, out_of_order_pack, out_of_order_pack_len, &stats));
+ cl_git_pass(git_indexer_commit(idx, &stats));
+
+ cl_assert_equal_i(stats.total_objects, 3);
+ cl_assert_equal_i(stats.received_objects, 3);
+ cl_assert_equal_i(stats.indexed_objects, 3);
+
+ git_indexer_free(idx);
+}
+
static int find_tmp_file_recurs(void *opaque, git_buf *path)
{
int error = 0;
/* Precondition: there are no temporary files. */
cl_git_pass(git_buf_sets(&path, clar_sandbox_path()));
cl_git_pass(find_tmp_file_recurs(&first_tmp_file, &path));
- git_buf_free(&path);
+ git_buf_dispose(&path);
cl_assert(git_buf_len(&first_tmp_file) == 0);
- cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL, NULL));
+ cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL));
git_indexer_free(idx);
cl_git_pass(git_buf_sets(&path, clar_sandbox_path()));
cl_git_pass(find_tmp_file_recurs(&first_tmp_file, &path));
- git_buf_free(&path);
+ git_buf_dispose(&path);
cl_assert(git_buf_len(&first_tmp_file) == 0);
- git_buf_free(&first_tmp_file);
+ git_buf_dispose(&first_tmp_file);
}
git_vector_foreach(&_commits, i, o) {
git_object *obj;
- cl_git_pass(git_object_lookup(&obj, _repo, o, GIT_OBJ_COMMIT));
+ cl_git_pass(git_object_lookup(&obj, _repo, o, GIT_OBJECT_COMMIT));
cl_git_pass(git_packbuilder_insert_tree(_packbuilder,
git_commit_tree_id((git_commit *)obj)));
git_object_free(obj);
seed_packbuilder();
- cl_git_pass(git_indexer_new(&_indexer, ".", 0, NULL, NULL, NULL));
+ cl_git_pass(git_indexer_new(&_indexer, ".", 0, NULL, NULL));
cl_git_pass(git_packbuilder_foreach(_packbuilder, feed_indexer, &stats));
cl_git_pass(git_indexer_commit(_indexer, &stats));
cl_git_pass(git_hash_final(&hash, &ctx));
git_hash_ctx_cleanup(&ctx);
- git_buf_free(&path);
- git_buf_free(&buf);
+ git_buf_dispose(&path);
+ git_buf_dispose(&buf);
git_oid_fmt(hex, &hash);
git_indexer *idx;
seed_packbuilder();
- cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL, NULL));
+ cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL));
cl_git_pass(git_packbuilder_foreach(_packbuilder, foreach_cb, idx));
cl_git_pass(git_indexer_commit(idx, &_stats));
git_indexer_free(idx);
git_indexer *idx;
seed_packbuilder();
- cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL, NULL));
+ cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL));
cl_git_fail_with(
git_packbuilder_foreach(_packbuilder, foreach_cancel_cb, idx), -1111);
git_indexer_free(idx);
git_repository *repo1, *repo2;
git_object *obj1, *obj2;
git_oid id;
- git_strmap_iter pos;
+ size_t pos;
void *data;
int error;
git_oid_fromstr(&id, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750");
- cl_git_pass(git_object_lookup(&obj1, repo1, &id, GIT_OBJ_ANY));
- cl_git_pass(git_object_lookup(&obj2, repo2, &id, GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&obj1, repo1, &id, GIT_OBJECT_ANY));
+ cl_git_pass(git_object_lookup(&obj2, repo2, &id, GIT_OBJECT_ANY));
pos = 0;
while ((error = git_strmap_next(&data, &pos, git__pack_cache)) == 0) {
"@@ -0,0 +1 @@\n" \
"+insert at front\n"
+/* An insertion at the beginning of the file and change in the middle */
+
+#define FILE_PREPEND_AND_CHANGE \
+ "insert at front\n" \
+ "hey!\n" \
+ "this is some context!\n" \
+ "around some lines\n" \
+ "that will change\n" \
+ "yes it is!\n" \
+ "(THIS line is changed!)\n" \
+ "and this\n" \
+ "is additional context\n" \
+ "below it!\n"
+
+#define PATCH_ORIGINAL_TO_PREPEND_AND_CHANGE \
+ "diff --git a/file.txt b/file.txt\n" \
+ "index 9432026..f73c8bb 100644\n" \
+ "--- a/file.txt\n" \
+ "+++ b/file.txt\n" \
+ "@@ -1,9 +1,10 @@\n" \
+ "+insert at front\n" \
+ " hey!\n" \
+ " this is some context!\n" \
+ " around some lines\n" \
+ " that will change\n" \
+ " yes it is!\n" \
+ "-(this line is changed)\n" \
+ "+(THIS line is changed!)\n" \
+ " and this\n" \
+ " is additional context\n" \
+ " below it!\n"
+
+#define PATCH_ORIGINAL_TO_PREPEND_AND_CHANGE_NOCONTEXT \
+ "diff --git a/file.txt b/file.txt\n" \
+ "index 9432026..f73c8bb 100644\n" \
+ "--- a/file.txt\n" \
+ "+++ b/file.txt\n" \
+ "@@ -0,0 +1 @@\n" \
+ "+insert at front\n" \
+ "@@ -6 +7 @@ yes it is!\n" \
+ "-(this line is changed)\n" \
+ "+(THIS line is changed!)\n"
+
+/* A deletion at the beginning of the file and a change in the middle */
+
+#define FILE_DELETE_AND_CHANGE \
+ "this is some context!\n" \
+ "around some lines\n" \
+ "that will change\n" \
+ "yes it is!\n" \
+ "(THIS line is changed!)\n" \
+ "and this\n" \
+ "is additional context\n" \
+ "below it!\n"
+
+#define PATCH_ORIGINAL_TO_DELETE_AND_CHANGE \
+ "diff --git a/file.txt b/file.txt\n" \
+ "index 9432026..1e2dfa6 100644\n" \
+ "--- a/file.txt\n" \
+ "+++ b/file.txt\n" \
+ "@@ -1,9 +1,8 @@\n" \
+ "-hey!\n" \
+ " this is some context!\n" \
+ " around some lines\n" \
+ " that will change\n" \
+ " yes it is!\n" \
+ "-(this line is changed)\n" \
+ "+(THIS line is changed!)\n" \
+ " and this\n" \
+ " is additional context\n" \
+ " below it!\n"
+
+#define PATCH_ORIGINAL_TO_DELETE_AND_CHANGE_NOCONTEXT \
+ "diff --git a/file.txt b/file.txt\n" \
+ "index 9432026..1e2dfa6 100644\n" \
+ "--- a/file.txt\n" \
+ "+++ b/file.txt\n" \
+ "@@ -1 +0,0 @@\n" \
+ "-hey!\n" \
+ "@@ -6 +5 @@ yes it is!\n" \
+ "-(this line is changed)\n" \
+ "+(THIS line is changed!)\n"
+
+/* A deletion at the beginning of the file */
+
+#define FILE_DELETE_FIRSTLINE \
+ "this is some context!\n" \
+ "around some lines\n" \
+ "that will change\n" \
+ "yes it is!\n" \
+ "(this line is changed)\n" \
+ "and this\n" \
+ "is additional context\n" \
+ "below it!\n"
+
+#define PATCH_ORIGINAL_TO_DELETE_FIRSTLINE \
+ "diff --git a/file.txt b/file.txt\n" \
+ "index 9432026..f31fa13 100644\n" \
+ "--- a/file.txt\n" \
+ "+++ b/file.txt\n" \
+ "@@ -1,4 +1,3 @@\n" \
+ "-hey!\n" \
+ " this is some context!\n" \
+ " around some lines\n" \
+ " that will change\n"
+
/* An insertion at the end of the file (and the resultant patch) */
#define FILE_APPEND \
cl_assert_equal_s(data, buf.ptr);
git_patch_free(patch);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_patch_print__change_middle(void)
git_buf_puts(&buf, path);
cl_assert_equal_i(expected_status, git_path_make_relative(&buf, parent));
cl_assert_equal_s(expected_path, buf.ptr);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_path_core__make_relative(void)
cl_assert_equal_s(expected_result, result.ptr);
cl_assert_equal_i(expected_rootlen, root_at);
- git_buf_free(&result);
+ git_buf_dispose(&result);
}
void test_path_core__join_unrooted(void)
/* Trailing slash in the base is ignored */
test_join_unrooted("c:/foo/bar/foobar", 6, "c:/foo/bar/foobar", "c:/foo/");
- git_buf_free(&out);
+ git_buf_dispose(&out);
}
void test_path_dotgit__dotgit_modules(void)
{
size_t i;
- cl_assert_equal_i(1, git_path_is_dotgit_modules(".gitmodules", strlen(".gitmodules")));
- cl_assert_equal_i(1, git_path_is_dotgit_modules(".git\xe2\x80\x8cmodules", strlen(".git\xe2\x80\x8cmodules")));
+
+ cl_assert_equal_i(1, git_path_is_gitfile(".gitmodules", strlen(".gitmodules"), GIT_PATH_GITFILE_GITMODULES, GIT_PATH_FS_GENERIC));
+ cl_assert_equal_i(1, git_path_is_gitfile(".git\xe2\x80\x8cmodules", strlen(".git\xe2\x80\x8cmodules"), GIT_PATH_GITFILE_GITMODULES, GIT_PATH_FS_GENERIC));
for (i = 0; i < ARRAY_SIZE(gitmodules_altnames); i++) {
const char *name = gitmodules_altnames[i];
- if (!git_path_is_dotgit_modules(name, strlen(name)))
+ if (!git_path_is_gitfile(name, strlen(name), GIT_PATH_GITFILE_GITMODULES, GIT_PATH_FS_GENERIC))
cl_fail(name);
}
for (i = 0; i < ARRAY_SIZE(gitmodules_not_altnames); i++) {
const char *name = gitmodules_not_altnames[i];
- if (git_path_is_dotgit_modules(name, strlen(name)))
+ if (git_path_is_gitfile(name, strlen(name), GIT_PATH_GITFILE_GITMODULES, GIT_PATH_FS_GENERIC))
cl_fail(name);
}
-
}
void test_path_dotgit__dotgit_modules_symlink(void)
#endif
}
-void test_canonicalize(const wchar_t *in, const wchar_t *expected)
-{
#ifdef GIT_WIN32
+static void test_canonicalize(const wchar_t *in, const wchar_t *expected)
+{
git_win32_path canonical;
cl_assert(wcslen(in) < MAX_PATH);
cl_must_pass(git_win32_path_canonicalize(canonical));
cl_assert_equal_wcs(expected, canonical);
+}
+#endif
+
+static void test_remove_namespace(const wchar_t *in, const wchar_t *expected)
+{
+#ifdef GIT_WIN32
+ git_win32_path canonical;
+
+ cl_assert(wcslen(in) < MAX_PATH);
+ wcscpy(canonical, in);
+
+ git_win32_path_remove_namespace(canonical, wcslen(in));
+ cl_assert_equal_wcs(expected, canonical);
#else
GIT_UNUSED(in);
GIT_UNUSED(expected);
#endif
}
+void test_path_win32__remove_namespace(void)
+{
+ test_remove_namespace(L"\\\\?\\C:\\Temp\\Foo", L"C:\\Temp\\Foo");
+ test_remove_namespace(L"\\\\?\\C:\\", L"C:\\");
+ test_remove_namespace(L"\\\\?\\", L"");
+
+ test_remove_namespace(L"\\??\\C:\\Temp\\Foo", L"C:\\Temp\\Foo");
+ test_remove_namespace(L"\\??\\C:\\", L"C:\\");
+ test_remove_namespace(L"\\??\\", L"");
+
+ test_remove_namespace(L"\\\\?\\UNC\\server\\C$\\folder", L"\\\\server\\C$\\folder");
+ test_remove_namespace(L"\\\\?\\UNC\\server\\C$\\folder", L"\\\\server\\C$\\folder");
+ test_remove_namespace(L"\\\\?\\UNC\\server\\C$", L"\\\\server\\C$");
+ test_remove_namespace(L"\\\\?\\UNC\\server\\", L"\\\\server");
+ test_remove_namespace(L"\\\\?\\UNC\\server", L"\\\\server");
+
+ test_remove_namespace(L"\\??\\UNC\\server\\C$\\folder", L"\\\\server\\C$\\folder");
+ test_remove_namespace(L"\\??\\UNC\\server\\C$\\folder", L"\\\\server\\C$\\folder");
+ test_remove_namespace(L"\\??\\UNC\\server\\C$", L"\\\\server\\C$");
+ test_remove_namespace(L"\\??\\UNC\\server\\", L"\\\\server");
+ test_remove_namespace(L"\\??\\UNC\\server", L"\\\\server");
+
+ test_remove_namespace(L"\\\\server\\C$\\folder", L"\\\\server\\C$\\folder");
+ test_remove_namespace(L"\\\\server\\C$", L"\\\\server\\C$");
+ test_remove_namespace(L"\\\\server\\", L"\\\\server");
+ test_remove_namespace(L"\\\\server", L"\\\\server");
+
+ test_remove_namespace(L"C:\\Foo\\Bar", L"C:\\Foo\\Bar");
+ test_remove_namespace(L"C:\\", L"C:\\");
+ test_remove_namespace(L"", L"");
+
+}
+
void test_path_win32__canonicalize(void)
{
#ifdef GIT_WIN32
static git_repository *repo;
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_rebase_abort__initialize(void)
{
repo = cl_git_sandbox_init("rebase");
static git_repository *repo;
static git_signature *signature;
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_rebase_inmemory__initialize(void)
{
repo = cl_git_sandbox_init("rebase");
static git_index *_index;
static git_signature *signature;
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_rebase_iterator__initialize(void)
{
repo = cl_git_sandbox_init("rebase");
git_config_free(cfg);
}
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_rebase_merge__initialize(void)
{
repo = cl_git_sandbox_init("rebase");
cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo));
cl_git_pass(git_reference_lookup(&head_ref, repo, "HEAD"));
- cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(head_ref));
+ cl_assert_equal_i(GIT_REFERENCE_SYMBOLIC, git_reference_type(head_ref));
cl_assert_equal_s("refs/heads/gravy", git_reference_symbolic_target(head_ref));
/* Make sure the reflogs are updated appropriately */
cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo));
cl_git_pass(git_reference_lookup(&head_ref, repo, "HEAD"));
- cl_assert_equal_i(GIT_REF_OID, git_reference_type(head_ref));
+ cl_assert_equal_i(GIT_REFERENCE_DIRECT, git_reference_type(head_ref));
/* Make sure the reflogs are updated appropriately */
cl_git_pass(git_reflog_read(&reflog, repo, "HEAD"));
cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo));
cl_git_pass(git_reference_lookup(&head_ref, repo, "HEAD"));
- cl_assert_equal_i(GIT_REF_OID, git_reference_type(head_ref));
+ cl_assert_equal_i(GIT_REFERENCE_DIRECT, git_reference_type(head_ref));
cl_assert_equal_oid(&commit_id, git_reference_target(head_ref));
/* reflogs are not updated as if we were operating on proper
cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref));
cl_git_pass(git_reference_peel((git_object **)&branch_commit,
- branch_ref, GIT_OBJ_COMMIT));
+ branch_ref, GIT_OBJECT_COMMIT));
/* Add a note to a commit */
cl_git_pass(git_note_create(¬e_id, repo, "refs/notes/test",
static git_index *_index;
static git_signature *signature;
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_rebase_setup__initialize(void)
{
repo = cl_git_sandbox_init("rebase");
git_oid_fromstr(&head_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00");
cl_git_pass(git_repository_head(&head, repo));
- cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJECT_COMMIT));
cl_assert_equal_oid(&head_id, git_commit_id(head_commit));
cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/ORIG_HEAD");
git_oid_fromstr(&head_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00");
cl_git_pass(git_repository_head(&head, repo));
- cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJECT_COMMIT));
cl_assert_equal_oid(&head_id, git_commit_id(head_commit));
cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/ORIG_HEAD");
git_oid_fromstr(&head_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00");
cl_git_pass(git_repository_head(&head, repo));
- cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJECT_COMMIT));
cl_assert_equal_oid(&head_id, git_commit_id(head_commit));
cl_assert_equal_file("d616d97082eb7bb2dc6f180a7cca940993b7a56f\n", 41, "rebase/.git/ORIG_HEAD");
git_oid_fromstr(&head_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00");
cl_git_pass(git_repository_head(&head, repo));
- cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJECT_COMMIT));
cl_assert_equal_oid(&head_id, git_commit_id(head_commit));
cl_assert_equal_file("f87d14a4a236582a0278a916340a793714256864\n", 41, "rebase/.git/ORIG_HEAD");
git_oid_fromstr(&head_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00");
cl_git_pass(git_repository_head(&head, repo));
- cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJECT_COMMIT));
cl_assert_equal_oid(&head_id, git_commit_id(head_commit));
cl_assert_equal_file("d616d97082eb7bb2dc6f180a7cca940993b7a56f\n", 41, "rebase/.git/ORIG_HEAD");
git_oid_fromstr(&head_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00");
cl_git_pass(git_repository_head(&head, repo));
- cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJECT_COMMIT));
cl_assert_equal_oid(&head_id, git_commit_id(head_commit));
cl_assert_equal_file("f87d14a4a236582a0278a916340a793714256864\n", 41, "rebase/.git/ORIG_HEAD");
git_oid_fromstr(&head_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00");
cl_git_pass(git_repository_head(&head, repo));
- cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJECT_COMMIT));
cl_assert_equal_oid(&head_id, git_commit_id(head_commit));
cl_assert_equal_file("12c084412b952396962eb420716df01022b847cc\n", 41, "rebase/.git/ORIG_HEAD");
git_oid_fromstr(&head_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00");
cl_git_pass(git_repository_head(&head, repo));
- cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJECT_COMMIT));
cl_assert_equal_oid(&head_id, git_commit_id(head_commit));
cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/ORIG_HEAD");
git_oid_fromstr(&head_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00");
cl_git_pass(git_repository_head(&head, repo));
- cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJECT_COMMIT));
cl_assert_equal_oid(&head_id, git_commit_id(head_commit));
cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/ORIG_HEAD");
git_oid_fromstr(&head_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00");
cl_git_pass(git_repository_head(&head, repo));
- cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJECT_COMMIT));
cl_assert_equal_oid(&head_id, git_commit_id(head_commit));
cl_assert_equal_file("b146bd7608eac53d9bf9e1a6963543588b555c64\n", 41, "rebase/.git/ORIG_HEAD");
git_reference *branch_ref, *upstream_ref;
git_annotated_commit *branch_head, *upstream_head;
-
+
cl_assert_equal_i(GIT_REPOSITORY_STATE_NONE, git_repository_state(repo));
-
+
cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef"));
cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master"));
-
+
cl_git_pass(git_annotated_commit_from_ref(&branch_head, repo, branch_ref));
cl_git_pass(git_annotated_commit_from_ref(&upstream_head, repo, upstream_ref));
-
+
error = git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, NULL);
git_annotated_commit_free(branch_head);
static git_repository *repo;
static git_signature *signature;
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_rebase_submodule__initialize(void)
{
git_index *index;
/* We have to commit the rewritten .gitmodules file */
cl_git_pass(git_repository_index(&index, repo));
cl_git_pass(git_index_add_bypath(index, ".gitmodules"));
- cl_git_pass(git_index_write_tree(&tree_oid, index));
+ cl_git_pass(git_index_write(index));
+ cl_git_pass(git_index_write_tree(&tree_oid, index));
cl_git_pass(git_tree_lookup(&tree, repo, &tree_oid));
cl_git_pass(git_repository_head(&master_ref, repo));
cl_git_pass(git_commit_create_v(&commit_id, repo, git_reference_name(master_ref), signature, signature, NULL, "Fixup .gitmodules", tree, 1, parent));
/* And a final reset, for good measure */
- cl_git_pass(git_object_lookup(&obj, repo, &commit_id, GIT_OBJ_COMMIT));
+ cl_git_pass(git_object_lookup(&obj, repo, &commit_id, GIT_OBJECT_COMMIT));
cl_git_pass(git_reset(repo, obj, GIT_RESET_HARD, &opts));
git_index_free(index);
fp = fopen(git_buf_cstr(&untracked_path), "w");
fprintf(fp, "An untracked file in a submodule should not block a rebase\n");
fclose(fp);
- git_buf_free(&untracked_path);
+ git_buf_dispose(&untracked_path);
cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, NULL));
git_oid_cmp(git_reference_target(ref), git_commit_id(target)));
git_reference_free(ref);
- git_buf_free(&b);
+ git_buf_dispose(&b);
}
void test_refs_branches_create__can_create_branch_with_unicode(void)
#include "refs.h"
#include "repo/repo_helpers.h"
#include "config/config_helpers.h"
+#include "fileops.h"
+#include "reflog.h"
static git_repository *repo;
static git_reference *fake_remote;
git_reference *head, *branch;
cl_git_pass(git_reference_lookup(&head, repo, GIT_HEAD_FILE));
- cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(head));
+ cl_assert_equal_i(GIT_REFERENCE_SYMBOLIC, git_reference_type(head));
cl_assert_equal_s("refs/heads/master", git_reference_symbolic_target(head));
git_reference_free(head);
git_reflog_free(log);
}
+void test_refs_branches_delete__removes_empty_folders(void)
+{
+ const char *commondir = git_repository_commondir(repo);
+ git_oid commit_id;
+ git_commit *commit;
+ git_reference *branch;
+
+ git_reflog *log;
+ git_oid oidzero = {{0}};
+ git_signature *sig;
+
+ git_buf ref_folder = GIT_BUF_INIT;
+ git_buf reflog_folder = GIT_BUF_INIT;
+
+ /* Create a new branch with a nested name */
+ cl_git_pass(git_oid_fromstr(&commit_id, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"));
+ cl_git_pass(git_commit_lookup(&commit, repo, &commit_id));
+ cl_git_pass(git_branch_create(&branch, repo, "some/deep/ref", commit, 0));
+ git_commit_free(commit);
+
+ /* Ensure the reflog has at least one entry */
+ cl_git_pass(git_signature_now(&sig, "Me", "user@example.com"));
+ cl_git_pass(git_reflog_read(&log, repo, "refs/heads/some/deep/ref"));
+ cl_git_pass(git_reflog_append(log, &oidzero, sig, "message"));
+ cl_assert(git_reflog_entrycount(log) > 0);
+ git_signature_free(sig);
+ git_reflog_free(log);
+
+ cl_git_pass(git_buf_joinpath(&ref_folder, commondir, "refs/heads/some/deep"));
+ cl_git_pass(git_buf_join3(&reflog_folder, '/', commondir, GIT_REFLOG_DIR, "refs/heads/some/deep"));
+
+ cl_assert(git_path_exists(git_buf_cstr(&ref_folder)) == true);
+ cl_assert(git_path_exists(git_buf_cstr(&reflog_folder)) == true);
+
+ cl_git_pass(git_branch_delete(branch));
+
+ cl_assert(git_path_exists(git_buf_cstr(&ref_folder)) == false);
+ cl_assert(git_path_exists(git_buf_cstr(&reflog_folder)) == false);
+
+ git_reference_free(branch);
+ git_buf_dispose(&ref_folder);
+ git_buf_dispose(&reflog_folder);
+}
+
cl_assert_equal_i(GIT_EEXISTS,
git_branch_move(&new_ref, original_ref, "master", 0));
- cl_assert(giterr_last()->message != NULL);
+ cl_assert(git_error_last()->message != NULL);
cl_git_pass(git_repository_config_snapshot(&config, repo));
cl_git_pass(git_config_get_string(&str, config, "branch.master.remote"));
cl_assert_equal_i(GIT_EEXISTS,
git_branch_move(&new_ref, original_ref, "cannot-fetch", 0));
- cl_assert(giterr_last()->message != NULL);
+ cl_assert(git_error_last()->message != NULL);
cl_git_pass(git_repository_config_snapshot(&config, repo));
cl_git_pass(git_config_get_string(&str, config, "branch.master.remote"));
cl_assert_equal_i(GIT_EEXISTS,
git_branch_move(&new_ref, original_ref, "master", 0));
- cl_assert(giterr_last()->message != NULL);
+ cl_assert(git_error_last()->message != NULL);
cl_git_pass(git_repository_config_snapshot(&config, repo));
cl_git_pass(git_config_get_string(&str, config, "branch.master.remote"));
cl_git_pass(git_branch_remote_name(&remotename, g_repo, remote_tracking_branch_name));
cl_assert_equal_s("test", remotename.ptr);
- git_buf_free(&remotename);
+ git_buf_dispose(&remotename);
}
void test_refs_branches_remote__no_matching_remote_returns_error(void)
const char *unknown = "refs/remotes/nonexistent/master";
git_buf buf;
- giterr_clear();
+ git_error_clear();
memset(&buf, 0, sizeof(git_buf));
cl_git_fail_with(git_branch_remote_name(&buf, g_repo, unknown), GIT_ENOTFOUND);
- cl_assert(giterr_last() != NULL);
+ cl_assert(git_error_last() != NULL);
}
void test_refs_branches_remote__local_remote_returns_error(void)
const char *local = "refs/heads/master";
git_buf buf;
- giterr_clear();
+ git_error_clear();
memset(&buf, 0, sizeof(git_buf));
cl_git_fail_with(git_branch_remote_name(&buf, g_repo, local), GIT_ERROR);
- cl_assert(giterr_last() != NULL);
+ cl_assert(git_error_last() != NULL);
}
void test_refs_branches_remote__ambiguous_remote_returns_error(void)
git_remote_free(remote);
- giterr_clear();
+ git_error_clear();
memset(&buf, 0, sizeof(git_buf));
cl_git_fail_with(git_branch_remote_name(&buf, g_repo, remote_tracking_branch_name), GIT_EAMBIGUOUS);
- cl_assert(giterr_last() != NULL);
+ cl_assert(git_error_last() != NULL);
}
cl_git_pass(git_branch_upstream_remote(&buf, repo, "refs/heads/master"));
cl_assert_equal_s("test", buf.ptr);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
}
void test_refs_branches_upstream__upstream_remote_empty_value(void)
{
git_reference *branch;
- cl_assert_equal_i(GIT_OBJ_COMMIT, git_object_type((git_object*)target));
+ cl_assert_equal_i(GIT_OBJECT_COMMIT, git_object_type((git_object*)target));
cl_git_pass(git_branch_create(&branch, repository, entry_name, (git_commit*)target, 0));
cl_assert_equal_i(GIT_ENOTFOUND, git_branch_upstream(&upstream, branch));
repository = cl_git_sandbox_init("testrepo.git");
cl_git_pass(git_repository_head(&head, repository));
- cl_git_pass(git_reference_peel(((git_object **)&target), head, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel(((git_object **)&target), head, GIT_OBJECT_COMMIT));
git_reference_free(head);
assert_merge_and_or_remote_key_missing(repository, target, "remoteless");
cl_git_pass(git_reference_create(&ref, repo, "refs/remotes/matching/master", git_reference_target(branch), 1, "fetch"));
cl_git_fail(git_branch_set_upstream(branch, "matching/master"));
cl_assert_equal_s("could not determine remote for 'refs/remotes/matching/master'",
- giterr_last()->message);
+ git_error_last()->message);
/* we can't set it automatically, so let's test the user setting it by hand */
cl_git_pass(git_repository_config(&cfg, repo));
void test_refs_branches_upstreamname__cleanup(void)
{
- git_buf_free(&upstream_name);
+ git_buf_dispose(&upstream_name);
git_repository_free(repo);
repo = NULL;
/* Ensure the reference can be looked-up... */
cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, new_head_tracker));
- cl_assert(git_reference_type(looked_up_ref) & GIT_REF_SYMBOLIC);
+ cl_assert(git_reference_type(looked_up_ref) & GIT_REFERENCE_SYMBOLIC);
cl_assert(reference_is_packed(looked_up_ref) == 0);
cl_assert_equal_s(looked_up_ref->name, new_head_tracker);
/* ...peeled.. */
cl_git_pass(git_reference_resolve(&resolved_ref, looked_up_ref));
- cl_assert(git_reference_type(resolved_ref) == GIT_REF_OID);
+ cl_assert(git_reference_type(resolved_ref) == GIT_REFERENCE_DIRECT);
/* ...and that it points to the current master tip */
cl_assert_equal_oid(&id, git_reference_target(resolved_ref));
/* Ensure the reference can be looked-up... */
cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, new_head_tracker));
- cl_assert(git_reference_type(looked_up_ref) & GIT_REF_SYMBOLIC);
+ cl_assert(git_reference_type(looked_up_ref) & GIT_REFERENCE_SYMBOLIC);
cl_assert(reference_is_packed(looked_up_ref) == 0);
cl_assert_equal_s(looked_up_ref->name, new_head_tracker);
git_reference_free(looked_up_ref);
/* Ensure the reference can be looked-up... */
cl_git_pass(git_reference_lookup(&looked_up_ref, repo2, new_head_tracker));
- cl_assert(git_reference_type(looked_up_ref) & GIT_REF_SYMBOLIC);
+ cl_assert(git_reference_type(looked_up_ref) & GIT_REFERENCE_SYMBOLIC);
cl_assert(reference_is_packed(looked_up_ref) == 0);
cl_assert_equal_s(looked_up_ref->name, new_head_tracker);
/* Ensure the reference can be looked-up... */
cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, new_head));
- cl_assert(git_reference_type(looked_up_ref) & GIT_REF_OID);
+ cl_assert(git_reference_type(looked_up_ref) & GIT_REFERENCE_DIRECT);
cl_assert(reference_is_packed(looked_up_ref) == 0);
cl_assert_equal_s(looked_up_ref->name, new_head);
void test_refs_delete__packed_loose(void)
{
- // deleting a ref which is both packed and loose should remove both tracks in the filesystem
+ /* deleting a ref which is both packed and loose should remove both tracks in the filesystem */
git_reference *looked_up_ref, *another_looked_up_ref;
git_buf temp_path = GIT_BUF_INIT;
cl_assert(!git_path_exists(temp_path.ptr));
git_reference_free(another_looked_up_ref);
- git_buf_free(&temp_path);
+ git_buf_dispose(&temp_path);
}
void test_refs_delete__packed_only(void)
{
- // can delete a just packed reference
+ /* can delete a just packed reference */
git_reference *ref;
git_refdb *refdb;
git_oid id;
assert_retrieval("refs/heads/*", 12);
}
+void test_refs_foreachglob__retrieve_nonexistant(void)
+{
+ assert_retrieval("refs/nonexistent/*", 0);
+}
+
void test_refs_foreachglob__retrieve_partially_named_references(void)
{
/*
void test_refs_list__all(void)
{
- // try to list all the references in our test repo
+ /* try to list all the references in our test repo */
git_strarray ref_list;
cl_git_pass(git_reference_list(&ref_list, g_repo));
git_reference *ref;
cl_git_fail_with(GIT_ENOTFOUND, git_reference_dwim(&ref, g_repo, "idontexist"));
- cl_assert_equal_s("no reference found for shorthand 'idontexist'", giterr_last()->message);
+ cl_assert_equal_s("no reference found for shorthand 'idontexist'", git_error_last()->message);
}
#include "git2/reflog.h"
#include "reflog.h"
-// Helpers
+/* Helpers */
static void ensure_refname_normalized(
unsigned int flags,
const char *input_refname,
void test_refs_normalize__can_normalize_a_direct_reference_name(void)
{
ensure_refname_normalized(
- GIT_REF_FORMAT_NORMAL, "refs/dummy/a", "refs/dummy/a");
+ GIT_REFERENCE_FORMAT_NORMAL, "refs/dummy/a", "refs/dummy/a");
ensure_refname_normalized(
- GIT_REF_FORMAT_NORMAL, "refs/stash", "refs/stash");
+ GIT_REFERENCE_FORMAT_NORMAL, "refs/stash", "refs/stash");
ensure_refname_normalized(
- GIT_REF_FORMAT_NORMAL, "refs/tags/a", "refs/tags/a");
+ GIT_REFERENCE_FORMAT_NORMAL, "refs/tags/a", "refs/tags/a");
ensure_refname_normalized(
- GIT_REF_FORMAT_NORMAL, "refs/heads/a/b", "refs/heads/a/b");
+ GIT_REFERENCE_FORMAT_NORMAL, "refs/heads/a/b", "refs/heads/a/b");
ensure_refname_normalized(
- GIT_REF_FORMAT_NORMAL, "refs/heads/a./b", "refs/heads/a./b");
+ GIT_REFERENCE_FORMAT_NORMAL, "refs/heads/a./b", "refs/heads/a./b");
ensure_refname_normalized(
- GIT_REF_FORMAT_NORMAL, "refs/heads/v@ation", "refs/heads/v@ation");
+ GIT_REFERENCE_FORMAT_NORMAL, "refs/heads/v@ation", "refs/heads/v@ation");
ensure_refname_normalized(
- GIT_REF_FORMAT_NORMAL, "refs///heads///a", "refs/heads/a");
+ GIT_REFERENCE_FORMAT_NORMAL, "refs///heads///a", "refs/heads/a");
}
void test_refs_normalize__cannot_normalize_any_direct_reference_name(void)
{
ensure_refname_invalid(
- GIT_REF_FORMAT_NORMAL, "a");
+ GIT_REFERENCE_FORMAT_NORMAL, "a");
ensure_refname_invalid(
- GIT_REF_FORMAT_NORMAL, "/a");
+ GIT_REFERENCE_FORMAT_NORMAL, "/a");
ensure_refname_invalid(
- GIT_REF_FORMAT_NORMAL, "//a");
+ GIT_REFERENCE_FORMAT_NORMAL, "//a");
ensure_refname_invalid(
- GIT_REF_FORMAT_NORMAL, "");
+ GIT_REFERENCE_FORMAT_NORMAL, "");
ensure_refname_invalid(
- GIT_REF_FORMAT_NORMAL, "/refs/heads/a/");
+ GIT_REFERENCE_FORMAT_NORMAL, "/refs/heads/a/");
ensure_refname_invalid(
- GIT_REF_FORMAT_NORMAL, "refs/heads/a/");
+ GIT_REFERENCE_FORMAT_NORMAL, "refs/heads/a/");
ensure_refname_invalid(
- GIT_REF_FORMAT_NORMAL, "refs/heads/a.");
+ GIT_REFERENCE_FORMAT_NORMAL, "refs/heads/a.");
ensure_refname_invalid(
- GIT_REF_FORMAT_NORMAL, "refs/heads/a.lock");
+ GIT_REFERENCE_FORMAT_NORMAL, "refs/heads/a.lock");
ensure_refname_invalid(
- GIT_REF_FORMAT_NORMAL, "refs/heads/foo?bar");
+ GIT_REFERENCE_FORMAT_NORMAL, "refs/heads/foo?bar");
ensure_refname_invalid(
- GIT_REF_FORMAT_NORMAL, "refs/heads\foo");
+ GIT_REFERENCE_FORMAT_NORMAL, "refs/heads\foo");
ensure_refname_normalized(
- GIT_REF_FORMAT_NORMAL, "refs/heads/v@ation", "refs/heads/v@ation");
+ GIT_REFERENCE_FORMAT_NORMAL, "refs/heads/v@ation", "refs/heads/v@ation");
ensure_refname_normalized(
- GIT_REF_FORMAT_NORMAL, "refs///heads///a", "refs/heads/a");
+ GIT_REFERENCE_FORMAT_NORMAL, "refs///heads///a", "refs/heads/a");
ensure_refname_invalid(
- GIT_REF_FORMAT_NORMAL, "refs/heads/.a/b");
+ GIT_REFERENCE_FORMAT_NORMAL, "refs/heads/.a/b");
ensure_refname_invalid(
- GIT_REF_FORMAT_NORMAL, "refs/heads/foo/../bar");
+ GIT_REFERENCE_FORMAT_NORMAL, "refs/heads/foo/../bar");
ensure_refname_invalid(
- GIT_REF_FORMAT_NORMAL, "refs/heads/foo..bar");
+ GIT_REFERENCE_FORMAT_NORMAL, "refs/heads/foo..bar");
ensure_refname_invalid(
- GIT_REF_FORMAT_NORMAL, "refs/heads/./foo");
+ GIT_REFERENCE_FORMAT_NORMAL, "refs/heads/./foo");
ensure_refname_invalid(
- GIT_REF_FORMAT_NORMAL, "refs/heads/v@{ation");
+ GIT_REFERENCE_FORMAT_NORMAL, "refs/heads/v@{ation");
}
void test_refs_normalize__symbolic(void)
{
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "");
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "heads\foo");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "heads\foo");
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "/");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "/");
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "///");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "///");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "ALL_CAPS_AND_UNDERSCORES", "ALL_CAPS_AND_UNDERSCORES");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "ALL_CAPS_AND_UNDERSCORES", "ALL_CAPS_AND_UNDERSCORES");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/MixedCasing", "refs/MixedCasing");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/MixedCasing", "refs/MixedCasing");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs///heads///a", "refs/heads/a");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs///heads///a", "refs/heads/a");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "HEAD", "HEAD");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "HEAD", "HEAD");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "MERGE_HEAD", "MERGE_HEAD");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "MERGE_HEAD", "MERGE_HEAD");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "FETCH_HEAD", "FETCH_HEAD");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "FETCH_HEAD", "FETCH_HEAD");
}
/* Ported from JGit, BSD licence.
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
+
void test_refs_normalize__jgit_suite(void)
{
- // tests borrowed from JGit
+ /* tests borrowed from JGit */
/* EmptyString */
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "");
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "/");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "/");
/* MustHaveTwoComponents */
ensure_refname_invalid(
- GIT_REF_FORMAT_NORMAL, "master");
+ GIT_REFERENCE_FORMAT_NORMAL, "master");
ensure_refname_normalized(
- GIT_REF_FORMAT_NORMAL, "heads/master", "heads/master");
+ GIT_REFERENCE_FORMAT_NORMAL, "heads/master", "heads/master");
/* ValidHead */
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master", "refs/heads/master");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/master", "refs/heads/master");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/pu", "refs/heads/pu");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/pu", "refs/heads/pu");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/z", "refs/heads/z");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/z", "refs/heads/z");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/FoO", "refs/heads/FoO");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/FoO", "refs/heads/FoO");
/* ValidTag */
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/tags/v1.0", "refs/tags/v1.0");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/tags/v1.0", "refs/tags/v1.0");
/* NoLockSuffix */
- ensure_refname_invalid(GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master.lock");
+ ensure_refname_invalid(GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/master.lock");
/* NoDirectorySuffix */
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master/");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/master/");
/* NoSpace */
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/i haz space");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/i haz space");
/* NoAsciiControlCharacters */
{
char c;
char buffer[GIT_REFNAME_MAX];
for (c = '\1'; c < ' '; c++) {
- strncpy(buffer, "refs/heads/mast", 15);
- strncpy(buffer + 15, (const char *)&c, 1);
- strncpy(buffer + 16, "er", 2);
- buffer[18 - 1] = '\0';
- ensure_refname_invalid(GIT_REF_FORMAT_ALLOW_ONELEVEL, buffer);
+ p_snprintf(buffer, sizeof(buffer), "refs/heads/mast%cer", c);
+ ensure_refname_invalid(GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, buffer);
}
}
/* NoBareDot */
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/.");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/.");
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/..");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/..");
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/./master");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/./master");
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/../master");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/../master");
/* NoLeadingOrTrailingDot */
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, ".");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, ".");
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/.bar");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/.bar");
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/..bar");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/..bar");
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/bar.");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/bar.");
/* ContainsDot */
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/m.a.s.t.e.r", "refs/heads/m.a.s.t.e.r");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/m.a.s.t.e.r", "refs/heads/m.a.s.t.e.r");
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master..pu");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/master..pu");
/* NoMagicRefCharacters */
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master^");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/master^");
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/^master");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/^master");
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "^refs/heads/master");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "^refs/heads/master");
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master~");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/master~");
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/~master");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/~master");
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "~refs/heads/master");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "~refs/heads/master");
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master:");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/master:");
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/:master");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/:master");
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, ":refs/heads/master");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, ":refs/heads/master");
/* ShellGlob */
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master?");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/master?");
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/?master");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/?master");
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "?refs/heads/master");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "?refs/heads/master");
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master[");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/master[");
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/[master");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/[master");
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "[refs/heads/master");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "[refs/heads/master");
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master*");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/master*");
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/*master");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/*master");
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "*refs/heads/master");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "*refs/heads/master");
/* ValidSpecialCharacters */
ensure_refname_normalized
- (GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/!", "refs/heads/!");
+ (GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/!", "refs/heads/!");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/\"", "refs/heads/\"");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/\"", "refs/heads/\"");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/#", "refs/heads/#");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/#", "refs/heads/#");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/$", "refs/heads/$");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/$", "refs/heads/$");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/%", "refs/heads/%");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/%", "refs/heads/%");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/&", "refs/heads/&");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/&", "refs/heads/&");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/'", "refs/heads/'");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/'", "refs/heads/'");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/(", "refs/heads/(");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/(", "refs/heads/(");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/)", "refs/heads/)");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/)", "refs/heads/)");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/+", "refs/heads/+");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/+", "refs/heads/+");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/,", "refs/heads/,");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/,", "refs/heads/,");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/-", "refs/heads/-");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/-", "refs/heads/-");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/;", "refs/heads/;");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/;", "refs/heads/;");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/<", "refs/heads/<");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/<", "refs/heads/<");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/=", "refs/heads/=");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/=", "refs/heads/=");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/>", "refs/heads/>");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/>", "refs/heads/>");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/@", "refs/heads/@");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/@", "refs/heads/@");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/]", "refs/heads/]");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/]", "refs/heads/]");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/_", "refs/heads/_");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/_", "refs/heads/_");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/`", "refs/heads/`");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/`", "refs/heads/`");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/{", "refs/heads/{");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/{", "refs/heads/{");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/|", "refs/heads/|");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/|", "refs/heads/|");
ensure_refname_normalized(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/}", "refs/heads/}");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/}", "refs/heads/}");
- // This is valid on UNIX, but not on Windows
- // hence we make in invalid due to non-portability
- //
+ /*
+ * This is valid on UNIX, but not on Windows
+ * hence we make in invalid due to non-portability
+ */
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/\\");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/\\");
/* UnicodeNames */
/*
* Currently this fails.
- * ensure_refname_normalized(GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/\u00e5ngstr\u00f6m", "refs/heads/\u00e5ngstr\u00f6m");
+ * ensure_refname_normalized(GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/\u00e5ngstr\u00f6m", "refs/heads/\u00e5ngstr\u00f6m");
*/
/* RefLogQueryIsValidRef */
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master@{1}");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/master@{1}");
ensure_refname_invalid(
- GIT_REF_FORMAT_ALLOW_ONELEVEL, "refs/heads/master@{1.hour.ago}");
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL, "refs/heads/master@{1.hour.ago}");
}
void test_refs_normalize__buffer_has_to_be_big_enough_to_hold_the_normalized_version(void)
char buffer_out[21];
cl_git_pass(git_reference_normalize_name(
- buffer_out, 21, "refs//heads///long///name", GIT_REF_FORMAT_NORMAL));
+ buffer_out, 21, "refs//heads///long///name", GIT_REFERENCE_FORMAT_NORMAL));
cl_git_fail(git_reference_normalize_name(
- buffer_out, 20, "refs//heads///long///name", GIT_REF_FORMAT_NORMAL));
+ buffer_out, 20, "refs//heads///long///name", GIT_REFERENCE_FORMAT_NORMAL));
}
#define ONE_LEVEL_AND_REFSPEC \
- GIT_REF_FORMAT_ALLOW_ONELEVEL \
- | GIT_REF_FORMAT_REFSPEC_PATTERN
+ GIT_REFERENCE_FORMAT_ALLOW_ONELEVEL \
+ | GIT_REFERENCE_FORMAT_REFSPEC_PATTERN
void test_refs_normalize__refspec_pattern(void)
{
ensure_refname_invalid(
- GIT_REF_FORMAT_REFSPEC_PATTERN, "heads/*foo/bar");
+ GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "heads/*foo/bar");
ensure_refname_invalid(
- GIT_REF_FORMAT_REFSPEC_PATTERN, "heads/foo*/bar");
+ GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "heads/foo*/bar");
ensure_refname_invalid(
- GIT_REF_FORMAT_REFSPEC_PATTERN, "heads/f*o/bar");
+ GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "heads/f*o/bar");
ensure_refname_invalid(
- GIT_REF_FORMAT_REFSPEC_PATTERN, "foo");
+ GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "foo");
ensure_refname_normalized(
ONE_LEVEL_AND_REFSPEC, "FOO", "FOO");
ensure_refname_normalized(
- GIT_REF_FORMAT_REFSPEC_PATTERN, "foo/bar", "foo/bar");
+ GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "foo/bar", "foo/bar");
ensure_refname_normalized(
ONE_LEVEL_AND_REFSPEC, "foo/bar", "foo/bar");
ensure_refname_normalized(
- GIT_REF_FORMAT_REFSPEC_PATTERN, "*/foo", "*/foo");
+ GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "*/foo", "*/foo");
ensure_refname_normalized(
ONE_LEVEL_AND_REFSPEC, "*/foo", "*/foo");
ensure_refname_normalized(
- GIT_REF_FORMAT_REFSPEC_PATTERN, "foo/*/bar", "foo/*/bar");
+ GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "foo/*/bar", "foo/*/bar");
ensure_refname_normalized(
ONE_LEVEL_AND_REFSPEC, "foo/*/bar", "foo/*/bar");
ensure_refname_invalid(
- GIT_REF_FORMAT_REFSPEC_PATTERN, "*");
+ GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "*");
ensure_refname_normalized(
ONE_LEVEL_AND_REFSPEC, "*", "*");
ensure_refname_invalid(
- GIT_REF_FORMAT_REFSPEC_PATTERN, "foo/*/*");
+ GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "foo/*/*");
ensure_refname_invalid(
ONE_LEVEL_AND_REFSPEC, "foo/*/*");
ensure_refname_invalid(
- GIT_REF_FORMAT_REFSPEC_PATTERN, "*/foo/*");
+ GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "*/foo/*");
ensure_refname_invalid(
ONE_LEVEL_AND_REFSPEC, "*/foo/*");
ensure_refname_invalid(
- GIT_REF_FORMAT_REFSPEC_PATTERN, "*/*/foo");
+ GIT_REFERENCE_FORMAT_REFSPEC_PATTERN, "*/*/foo");
ensure_refname_invalid(
ONE_LEVEL_AND_REFSPEC, "*/*/foo");
}
void test_refs_overwrite__symbolic(void)
{
- // Overwrite an existing symbolic reference
+ /* Overwrite an existing symbolic reference */
git_reference *ref, *branch_ref;
/* The target needds to exist and we need to check the name has changed */
/* Ensure it points to the right place*/
cl_git_pass(git_reference_lookup(&ref, g_repo, ref_name));
- cl_assert(git_reference_type(ref) & GIT_REF_SYMBOLIC);
+ cl_assert(git_reference_type(ref) & GIT_REFERENCE_SYMBOLIC);
cl_assert_equal_s(git_reference_symbolic_target(ref), ref_branch_name);
git_reference_free(ref);
/* Ensure it points to the right place */
cl_git_pass(git_reference_lookup(&ref, g_repo, ref_name));
- cl_assert(git_reference_type(ref) & GIT_REF_SYMBOLIC);
+ cl_assert(git_reference_type(ref) & GIT_REFERENCE_SYMBOLIC);
cl_assert_equal_s(git_reference_symbolic_target(ref), ref_master_name);
git_reference_free(ref);
void test_refs_overwrite__object_id(void)
{
- // Overwrite an existing object id reference
+ /* Overwrite an existing object id reference */
git_reference *ref;
git_oid id;
cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name));
- cl_assert(git_reference_type(ref) & GIT_REF_OID);
+ cl_assert(git_reference_type(ref) & GIT_REFERENCE_DIRECT);
git_oid_cpy(&id, git_reference_target(ref));
git_reference_free(ref);
git_reference_free(ref);
cl_git_pass(git_reference_lookup(&ref, g_repo, ref_test_name));
- cl_assert(git_reference_type(ref) & GIT_REF_OID);
+ cl_assert(git_reference_type(ref) & GIT_REFERENCE_DIRECT);
git_oid_cpy(&id, git_reference_target(ref));
git_reference_free(ref);
void test_refs_overwrite__object_id_with_symbolic(void)
{
- // Overwrite an existing object id reference with a symbolic one
+ /* Overwrite an existing object id reference with a symbolic one */
git_reference *ref;
git_oid id;
cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name));
- cl_assert(git_reference_type(ref) & GIT_REF_OID);
+ cl_assert(git_reference_type(ref) & GIT_REFERENCE_DIRECT);
git_oid_cpy(&id, git_reference_target(ref));
git_reference_free(ref);
/* Ensure it points to the right place */
cl_git_pass(git_reference_lookup(&ref, g_repo, ref_name));
- cl_assert(git_reference_type(ref) & GIT_REF_SYMBOLIC);
+ cl_assert(git_reference_type(ref) & GIT_REFERENCE_SYMBOLIC);
cl_assert_equal_s(git_reference_symbolic_target(ref), ref_master_name);
git_reference_free(ref);
void test_refs_overwrite__symbolic_with_object_id(void)
{
- // Overwrite an existing symbolic reference with an object id one
+ /* Overwrite an existing symbolic reference with an object id one */
git_reference *ref;
git_oid id;
cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name));
- cl_assert(git_reference_type(ref) & GIT_REF_OID);
+ cl_assert(git_reference_type(ref) & GIT_REFERENCE_DIRECT);
git_oid_cpy(&id, git_reference_target(ref));
git_reference_free(ref);
/* Ensure it points to the right place */
cl_git_pass(git_reference_lookup(&ref, g_repo, ref_name));
- cl_assert(git_reference_type(ref) & GIT_REF_OID);
+ cl_assert(git_reference_type(ref) & GIT_REFERENCE_DIRECT);
cl_assert_equal_oid(&id, git_reference_target(ref));
git_reference_free(ref);
cl_git_pass(git_buf_join_n(&temp_path, '/', 3, git_repository_path(g_repo), GIT_REFS_HEADS_DIR, "empty_dir"));
cl_git_pass(git_futils_mkdir_r(temp_path.ptr, GIT_REFS_DIR_MODE));
- git_buf_free(&temp_path);
+ git_buf_dispose(&temp_path);
packall();
}
cl_assert(!git_path_exists(temp_path.ptr));
git_reference_free(reference);
- git_buf_free(&temp_path);
+ git_buf_dispose(&temp_path);
}
void test_refs_pack__symbolic(void)
static void assert_peel_generic(
git_repository *repo,
const char *ref_name,
- git_otype requested_type,
+ git_object_t requested_type,
const char* expected_sha,
- git_otype expected_type)
+ git_object_t expected_type)
{
git_oid expected_oid;
git_reference *ref;
git_object *peeled;
cl_git_pass(git_reference_lookup(&ref, repo, ref_name));
-
+
cl_git_pass(git_reference_peel(&peeled, ref, requested_type));
cl_git_pass(git_oid_fromstr(&expected_oid, expected_sha));
static void assert_peel(
const char *ref_name,
- git_otype requested_type,
+ git_object_t requested_type,
const char* expected_sha,
- git_otype expected_type)
+ git_object_t expected_type)
{
assert_peel_generic(g_repo, ref_name, requested_type,
expected_sha, expected_type);
}
-static void assert_peel_error(int error, const char *ref_name, git_otype requested_type)
+static void assert_peel_error(int error, const char *ref_name, git_object_t requested_type)
{
git_reference *ref;
git_object *peeled;
cl_git_pass(git_reference_lookup(&ref, g_repo, ref_name));
-
+
cl_assert_equal_i(error, git_reference_peel(&peeled, ref, requested_type));
git_reference_free(ref);
void test_refs_peel__can_peel_a_tag(void)
{
- assert_peel("refs/tags/test", GIT_OBJ_TAG,
- "b25fa35b38051e4ae45d4222e795f9df2e43f1d1", GIT_OBJ_TAG);
- assert_peel("refs/tags/test", GIT_OBJ_COMMIT,
- "e90810b8df3e80c413d903f631643c716887138d", GIT_OBJ_COMMIT);
- assert_peel("refs/tags/test", GIT_OBJ_TREE,
- "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJ_TREE);
- assert_peel("refs/tags/point_to_blob", GIT_OBJ_BLOB,
- "1385f264afb75a56a5bec74243be9b367ba4ca08", GIT_OBJ_BLOB);
+ assert_peel("refs/tags/test", GIT_OBJECT_TAG,
+ "b25fa35b38051e4ae45d4222e795f9df2e43f1d1", GIT_OBJECT_TAG);
+ assert_peel("refs/tags/test", GIT_OBJECT_COMMIT,
+ "e90810b8df3e80c413d903f631643c716887138d", GIT_OBJECT_COMMIT);
+ assert_peel("refs/tags/test", GIT_OBJECT_TREE,
+ "53fc32d17276939fc79ed05badaef2db09990016", GIT_OBJECT_TREE);
+ assert_peel("refs/tags/point_to_blob", GIT_OBJECT_BLOB,
+ "1385f264afb75a56a5bec74243be9b367ba4ca08", GIT_OBJECT_BLOB);
}
void test_refs_peel__can_peel_a_branch(void)
{
- assert_peel("refs/heads/master", GIT_OBJ_COMMIT,
- "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", GIT_OBJ_COMMIT);
- assert_peel("refs/heads/master", GIT_OBJ_TREE,
- "944c0f6e4dfa41595e6eb3ceecdb14f50fe18162", GIT_OBJ_TREE);
+ assert_peel("refs/heads/master", GIT_OBJECT_COMMIT,
+ "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", GIT_OBJECT_COMMIT);
+ assert_peel("refs/heads/master", GIT_OBJECT_TREE,
+ "944c0f6e4dfa41595e6eb3ceecdb14f50fe18162", GIT_OBJECT_TREE);
}
void test_refs_peel__can_peel_a_symbolic_reference(void)
{
- assert_peel("HEAD", GIT_OBJ_COMMIT,
- "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", GIT_OBJ_COMMIT);
- assert_peel("HEAD", GIT_OBJ_TREE,
- "944c0f6e4dfa41595e6eb3ceecdb14f50fe18162", GIT_OBJ_TREE);
+ assert_peel("HEAD", GIT_OBJECT_COMMIT,
+ "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", GIT_OBJECT_COMMIT);
+ assert_peel("HEAD", GIT_OBJECT_TREE,
+ "944c0f6e4dfa41595e6eb3ceecdb14f50fe18162", GIT_OBJECT_TREE);
}
void test_refs_peel__cannot_peel_into_a_non_existing_target(void)
{
- assert_peel_error(GIT_EINVALIDSPEC, "refs/tags/point_to_blob", GIT_OBJ_TAG);
+ assert_peel_error(GIT_EINVALIDSPEC, "refs/tags/point_to_blob", GIT_OBJECT_TAG);
}
void test_refs_peel__can_peel_into_any_non_tag_object(void)
{
- assert_peel("refs/heads/master", GIT_OBJ_ANY,
- "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", GIT_OBJ_COMMIT);
- assert_peel("refs/tags/point_to_blob", GIT_OBJ_ANY,
- "1385f264afb75a56a5bec74243be9b367ba4ca08", GIT_OBJ_BLOB);
- assert_peel("refs/tags/test", GIT_OBJ_ANY,
- "e90810b8df3e80c413d903f631643c716887138d", GIT_OBJ_COMMIT);
+ assert_peel("refs/heads/master", GIT_OBJECT_ANY,
+ "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", GIT_OBJECT_COMMIT);
+ assert_peel("refs/tags/point_to_blob", GIT_OBJECT_ANY,
+ "1385f264afb75a56a5bec74243be9b367ba4ca08", GIT_OBJECT_BLOB);
+ assert_peel("refs/tags/test", GIT_OBJECT_ANY,
+ "e90810b8df3e80c413d903f631643c716887138d", GIT_OBJECT_COMMIT);
}
void test_refs_peel__can_peel_fully_peeled_packed_refs(void)
{
assert_peel_generic(g_peel_repo,
- "refs/tags/tag-inside-tags", GIT_OBJ_ANY,
+ "refs/tags/tag-inside-tags", GIT_OBJECT_ANY,
"0df1a5865c8abfc09f1f2182e6a31be550e99f07",
- GIT_OBJ_COMMIT);
+ GIT_OBJECT_COMMIT);
assert_peel_generic(g_peel_repo,
- "refs/foo/tag-outside-tags", GIT_OBJ_ANY,
+ "refs/foo/tag-outside-tags", GIT_OBJECT_ANY,
"0df1a5865c8abfc09f1f2182e6a31be550e99f07",
- GIT_OBJ_COMMIT);
+ GIT_OBJECT_COMMIT);
}
void test_refs_peel__can_peel_fully_peeled_tag_to_tag(void)
{
assert_peel_generic(g_peel_repo,
- "refs/tags/tag-inside-tags", GIT_OBJ_TAG,
+ "refs/tags/tag-inside-tags", GIT_OBJECT_TAG,
"c2596aa0151888587ec5c0187f261e63412d9e11",
- GIT_OBJ_TAG);
+ GIT_OBJECT_TAG);
assert_peel_generic(g_peel_repo,
- "refs/foo/tag-outside-tags", GIT_OBJ_TAG,
+ "refs/foo/tag-outside-tags", GIT_OBJECT_TAG,
"c2596aa0151888587ec5c0187f261e63412d9e11",
- GIT_OBJ_TAG);
+ GIT_OBJECT_TAG);
}
void test_refs_read__loose_tag(void)
{
- // lookup a loose tag reference
+ /* lookup a loose tag reference */
git_reference *reference;
git_object *object;
git_buf ref_name_from_tag_name = GIT_BUF_INIT;
cl_git_pass(git_reference_lookup(&reference, g_repo, loose_tag_ref_name));
- cl_assert(git_reference_type(reference) & GIT_REF_OID);
+ cl_assert(git_reference_type(reference) & GIT_REFERENCE_DIRECT);
cl_assert(reference_is_packed(reference) == 0);
cl_assert_equal_s(reference->name, loose_tag_ref_name);
- cl_git_pass(git_object_lookup(&object, g_repo, git_reference_target(reference), GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&object, g_repo, git_reference_target(reference), GIT_OBJECT_ANY));
cl_assert(object != NULL);
- cl_assert(git_object_type(object) == GIT_OBJ_TAG);
+ cl_assert(git_object_type(object) == GIT_OBJECT_TAG);
/* Ensure the name of the tag matches the name of the reference */
cl_git_pass(git_buf_joinpath(&ref_name_from_tag_name, GIT_REFS_TAGS_DIR, git_tag_name((git_tag *)object)));
cl_assert_equal_s(ref_name_from_tag_name.ptr, loose_tag_ref_name);
- git_buf_free(&ref_name_from_tag_name);
+ git_buf_dispose(&ref_name_from_tag_name);
git_object_free(object);
void test_refs_read__nonexisting_tag(void)
{
- // lookup a loose tag reference that doesn't exist
+ /* lookup a loose tag reference that doesn't exist */
git_reference *reference;
cl_git_fail(git_reference_lookup(&reference, g_repo, non_existing_tag_ref_name));
void test_refs_read__symbolic(void)
{
- // lookup a symbolic reference
+ /* lookup a symbolic reference */
git_reference *reference, *resolved_ref;
git_object *object;
git_oid id;
cl_git_pass(git_reference_lookup(&reference, g_repo, GIT_HEAD_FILE));
- cl_assert(git_reference_type(reference) & GIT_REF_SYMBOLIC);
+ cl_assert(git_reference_type(reference) & GIT_REFERENCE_SYMBOLIC);
cl_assert(reference_is_packed(reference) == 0);
cl_assert_equal_s(reference->name, GIT_HEAD_FILE);
cl_git_pass(git_reference_resolve(&resolved_ref, reference));
- cl_assert(git_reference_type(resolved_ref) == GIT_REF_OID);
+ cl_assert(git_reference_type(resolved_ref) == GIT_REFERENCE_DIRECT);
- cl_git_pass(git_object_lookup(&object, g_repo, git_reference_target(resolved_ref), GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&object, g_repo, git_reference_target(resolved_ref), GIT_OBJECT_ANY));
cl_assert(object != NULL);
- cl_assert(git_object_type(object) == GIT_OBJ_COMMIT);
+ cl_assert(git_object_type(object) == GIT_OBJECT_COMMIT);
git_oid_fromstr(&id, current_master_tip);
cl_assert_equal_oid(&id, git_object_id(object));
void test_refs_read__nested_symbolic(void)
{
- // lookup a nested symbolic reference
+ /* lookup a nested symbolic reference */
git_reference *reference, *resolved_ref;
git_object *object;
git_oid id;
cl_git_pass(git_reference_lookup(&reference, g_repo, head_tracker_sym_ref_name));
- cl_assert(git_reference_type(reference) & GIT_REF_SYMBOLIC);
+ cl_assert(git_reference_type(reference) & GIT_REFERENCE_SYMBOLIC);
cl_assert(reference_is_packed(reference) == 0);
cl_assert_equal_s(reference->name, head_tracker_sym_ref_name);
cl_git_pass(git_reference_resolve(&resolved_ref, reference));
- cl_assert(git_reference_type(resolved_ref) == GIT_REF_OID);
+ cl_assert(git_reference_type(resolved_ref) == GIT_REFERENCE_DIRECT);
- cl_git_pass(git_object_lookup(&object, g_repo, git_reference_target(resolved_ref), GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&object, g_repo, git_reference_target(resolved_ref), GIT_OBJECT_ANY));
cl_assert(object != NULL);
- cl_assert(git_object_type(object) == GIT_OBJ_COMMIT);
+ cl_assert(git_object_type(object) == GIT_OBJECT_COMMIT);
git_oid_fromstr(&id, current_master_tip);
cl_assert_equal_oid(&id, git_object_id(object));
void test_refs_read__head_then_master(void)
{
- // lookup the HEAD and resolve the master branch
+ /* lookup the HEAD and resolve the master branch */
git_reference *reference, *resolved_ref, *comp_base_ref;
cl_git_pass(git_reference_lookup(&reference, g_repo, head_tracker_sym_ref_name));
void test_refs_read__master_then_head(void)
{
- // lookup the master branch and then the HEAD
+ /* lookup the master branch and then the HEAD */
git_reference *reference, *master_ref, *resolved_ref;
cl_git_pass(git_reference_lookup(&master_ref, g_repo, current_head_target));
void test_refs_read__packed(void)
{
- // lookup a packed reference
+ /* lookup a packed reference */
git_reference *reference;
git_object *object;
cl_git_pass(git_reference_lookup(&reference, g_repo, packed_head_name));
- cl_assert(git_reference_type(reference) & GIT_REF_OID);
+ cl_assert(git_reference_type(reference) & GIT_REFERENCE_DIRECT);
cl_assert(reference_is_packed(reference));
cl_assert_equal_s(reference->name, packed_head_name);
- cl_git_pass(git_object_lookup(&object, g_repo, git_reference_target(reference), GIT_OBJ_ANY));
+ cl_git_pass(git_object_lookup(&object, g_repo, git_reference_target(reference), GIT_OBJECT_ANY));
cl_assert(object != NULL);
- cl_assert(git_object_type(object) == GIT_OBJ_COMMIT);
+ cl_assert(git_object_type(object) == GIT_OBJECT_COMMIT);
git_object_free(object);
void test_refs_read__loose_first(void)
{
- // assure that a loose reference is looked up before a packed reference
+ /* assure that a loose reference is looked up before a packed reference */
git_reference *reference;
cl_git_pass(git_reference_lookup(&reference, g_repo, packed_head_name));
git_reference_free(reference);
cl_git_pass(git_reference_lookup(&reference, g_repo, packed_test_head_name));
- cl_assert(git_reference_type(reference) & GIT_REF_OID);
+ cl_assert(git_reference_type(reference) & GIT_REFERENCE_DIRECT);
cl_assert(reference_is_packed(reference) == 0);
cl_assert_equal_s(reference->name, packed_test_head_name);
packed = !git_path_isfile(ref_path.ptr);
- git_buf_free(&ref_path);
+ git_buf_dispose(&ref_path);
return packed;
}
cl_git_pass(git_signature_now(&sig, "me", "foo@example.com"));
cl_git_pass(git_repository_head(&ref, g_repo));
- cl_git_pass(git_reference_peel((git_object **) &tree, ref, GIT_OBJ_TREE));
+ cl_git_pass(git_reference_peel((git_object **) &tree, ref, GIT_OBJECT_TREE));
cl_git_pass(git_repository_set_head(g_repo, "refs/heads/orphan"));
cl_git_pass(git_signature_now(&sig, "me", "foo@example.com"));
cl_git_pass(git_repository_head(&ref1, g_repo));
- cl_git_pass(git_reference_peel((git_object **) &tree, ref1, GIT_OBJ_TREE));
+ cl_git_pass(git_reference_peel((git_object **) &tree, ref1, GIT_OBJECT_TREE));
nentries_master = reflog_entrycount(g_repo, "refs/heads/master");
g_email, "branch: Created from e90810b8df3");
git_annotated_commit_free(annotated);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_commit_free(target);
git_reference_free(branch1);
git_reference_free(branch2);
static git_repository *g_repo;
-// helpers
+/* helpers */
static void assert_signature(const git_signature *expected, const git_signature *actual)
{
cl_assert(actual);
}
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_refs_reflog_reflog__initialize(void)
{
- g_repo = cl_git_sandbox_init("testrepo.git");
+ g_repo = cl_git_sandbox_init("testrepo.git");
}
void test_refs_reflog_reflog__cleanup(void)
{
- cl_git_sandbox_cleanup();
+ cl_git_sandbox_cleanup();
}
static void assert_appends(const git_signature *committer, const git_oid *oid)
cl_assert_equal_i(true, git_path_isfile(git_buf_cstr(&moved_log_path)));
git_reference_free(new_master);
- git_buf_free(&moved_log_path);
- git_buf_free(&master_log_path);
+ git_buf_dispose(&moved_log_path);
+ git_buf_dispose(&master_log_path);
}
void test_refs_reflog_reflog__deleting_the_reference_deletes_the_reflog(void)
git_reference_free(master);
cl_assert_equal_i(false, git_path_isfile(git_buf_cstr(&master_log_path)));
- git_buf_free(&master_log_path);
+ git_buf_dispose(&master_log_path);
}
void test_refs_reflog_reflog__removes_empty_reflog_dir(void)
cl_git_pass(git_reference_create(&ref, g_repo, "refs/heads/new-dir", &id, 0, NULL));
git_reference_free(ref);
- git_buf_free(&log_path);
+ git_buf_dispose(&log_path);
}
void test_refs_reflog_reflog__fails_gracefully_on_nonempty_reflog_dir(void)
cl_git_fail_with(GIT_EDIRECTORY, git_reference_create(&ref, g_repo, "refs/heads/new-dir", &id, 0, NULL));
git_reference_free(ref);
- git_buf_free(&log_path);
+ git_buf_dispose(&log_path);
}
static void assert_has_reflog(bool expected_result, const char *name)
cl_assert_equal_i(0, (int)git_reflog_entrycount(reflog));
git_reflog_free(reflog);
- git_buf_free(&subtrees_log_path);
+ git_buf_dispose(&subtrees_log_path);
}
void test_refs_reflog_reflog__reading_a_reflog_with_invalid_format_returns_error(void)
cl_assert(strstr(git_buf_cstr(&logcontents), "Reflog\nmessage") != NULL);
/* clear the error state so we can capture the error generated by git_reflog_read */
- giterr_clear();
+ git_error_clear();
cl_git_fail(git_reflog_read(&reflog, g_repo, refname));
- error = giterr_last();
+ error = git_error_last();
cl_assert(error != NULL);
cl_assert_equal_s("unable to parse OID - contains invalid characters", error->message);
git_reference_free(ref);
- git_buf_free(&logpath);
- git_buf_free(&logcontents);
+ git_buf_dispose(&logpath);
+ git_buf_dispose(&logcontents);
}
void test_refs_reflog_reflog__cannot_write_a_moved_reflog(void)
git_reflog_free(reflog);
git_reference_free(new_master);
- git_buf_free(&moved_log_path);
- git_buf_free(&master_log_path);
+ git_buf_dispose(&moved_log_path);
+ git_buf_dispose(&master_log_path);
}
void test_refs_reflog_reflog__renaming_with_an_invalid_name_returns_EINVALIDSPEC(void)
assert_no_reflog_update();
}
+void test_refs_reflog_reflog__logallrefupdates_bare_set_always(void)
+{
+ git_config *config;
+ git_reference *ref;
+ git_reflog *log;
+ git_oid id;
+
+ cl_git_pass(git_repository_config(&config, g_repo));
+ cl_git_pass(git_config_set_string(config, "core.logallrefupdates", "always"));
+ git_config_free(config);
+
+ git_oid_fromstr(&id, "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
+ cl_git_pass(git_reference_create(&ref, g_repo, "refs/bork", &id, 1, "message"));
+
+ cl_git_pass(git_reflog_read(&log, g_repo, "refs/bork"));
+ cl_assert_equal_i(1, git_reflog_entrycount(log));
+ cl_assert_equal_s("message", git_reflog_entry_byindex(log, 0)->msg);
+
+ git_reflog_free(log);
+ git_reference_free(ref);
+}
+
void test_refs_reflog_reflog__logallrefupdates_bare_unset(void)
{
git_config *config;
if (git_buf_len(&result) != 0)
clar__fail(file, line, "Reflog entry mismatch", git_buf_cstr(&result), 1);
- git_buf_free(&result);
+ git_buf_dispose(&result);
git_reflog_free(log);
}
}
fprintf(stderr, "%s", git_buf_cstr(&out));
- git_buf_free(&out);
+ git_buf_dispose(&out);
git_reflog_free(reflog);
}
void test_refs_rename__loose(void)
{
- // rename a loose reference
+ /* rename a loose reference */
git_reference *looked_up_ref, *new_ref, *another_looked_up_ref;
git_buf temp_path = GIT_BUF_INIT;
const char *new_name = "refs/tags/Nemo/knows/refs.kung-fu";
git_reference_free(new_ref);
git_reference_free(another_looked_up_ref);
- git_buf_free(&temp_path);
+ git_buf_dispose(&temp_path);
}
void test_refs_rename__packed(void)
{
- // rename a packed reference (should make it loose)
+ /* rename a packed reference (should make it loose) */
git_reference *looked_up_ref, *new_ref, *another_looked_up_ref;
git_buf temp_path = GIT_BUF_INIT;
const char *brand_new_name = "refs/heads/brand_new_name";
git_reference_free(new_ref);
git_reference_free(another_looked_up_ref);
- git_buf_free(&temp_path);
+ git_buf_dispose(&temp_path);
}
void test_refs_rename__packed_doesnt_pack_others(void)
{
- // renaming a packed reference does not pack another reference which happens to be in both loose and pack state
+ /* renaming a packed reference does not pack another reference which happens to be in both loose and pack state */
git_reference *looked_up_ref, *another_looked_up_ref, *renamed_ref;
git_buf temp_path = GIT_BUF_INIT;
const char *brand_new_name = "refs/heads/brand_new_name";
git_reference_free(renamed_ref);
git_reference_free(another_looked_up_ref);
- git_buf_free(&temp_path);
+ git_buf_dispose(&temp_path);
}
void test_refs_rename__name_collision(void)
{
- // can not rename a reference with the name of an existing reference
+ /* can not rename a reference with the name of an existing reference */
git_reference *looked_up_ref, *renamed_ref;
/* An existing reference... */
void test_refs_rename__invalid_name(void)
{
- // can not rename a reference with an invalid name
+ /* can not rename a reference with an invalid name */
git_reference *looked_up_ref, *renamed_ref;
/* An existing oid reference... */
void test_refs_rename__force_loose_packed(void)
{
- // can force-rename a packed reference with the name of an existing loose and packed reference
+ /* can force-rename a packed reference with the name of an existing loose and packed reference */
git_reference *looked_up_ref, *renamed_ref;
git_oid oid;
void test_refs_rename__force_loose(void)
{
- // can force-rename a loose reference with the name of an existing loose reference
+ /* can force-rename a loose reference with the name of an existing loose reference */
git_reference *looked_up_ref, *renamed_ref;
git_oid oid;
void test_refs_rename__overwrite(void)
{
- // can not overwrite name of existing reference
+ /* can not overwrite name of existing reference */
git_reference *ref, *ref_one, *ref_one_new, *ref_two;
git_refdb *refdb;
git_oid id;
cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name));
- cl_assert(git_reference_type(ref) & GIT_REF_OID);
+ cl_assert(git_reference_type(ref) & GIT_REFERENCE_DIRECT);
git_oid_cpy(&id, git_reference_target(ref));
void test_refs_rename__prefix(void)
{
- // can be renamed to a new name prefixed with the old name
+ /* can be renamed to a new name prefixed with the old name */
git_reference *ref, *ref_two, *looked_up_ref, *renamed_ref;
git_oid id;
cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name));
- cl_assert(git_reference_type(ref) & GIT_REF_OID);
+ cl_assert(git_reference_type(ref) & GIT_REFERENCE_DIRECT);
git_oid_cpy(&id, git_reference_target(ref));
void test_refs_rename__move_up(void)
{
- // can move a reference to a upper reference hierarchy
+ /* can move a reference to a upper reference hierarchy */
git_reference *ref, *ref_two, *looked_up_ref, *renamed_ref;
git_oid id;
cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name));
- cl_assert(git_reference_type(ref) & GIT_REF_OID);
+ cl_assert(git_reference_type(ref) & GIT_REFERENCE_DIRECT);
git_oid_cpy(&id, git_reference_target(ref));
cl_assert_equal_i(true, git_path_isfile(git_buf_cstr(&log_path)));
- git_buf_free(&log_path);
+ git_buf_dispose(&log_path);
git_reference_free(new_master);
}
git_oid id;
cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name));
- cl_assert(git_reference_type(ref) == GIT_REF_OID);
+ cl_assert(git_reference_type(ref) == GIT_REFERENCE_DIRECT);
git_oid_cpy(&id, git_reference_target(ref));
git_reference_free(ref);
cl_git_pass(git_reference_lookup(&test_ref, g_repo, ref_test_name));
- cl_assert(git_reference_type(test_ref) == GIT_REF_OID);
+ cl_assert(git_reference_type(test_ref) == GIT_REFERENCE_DIRECT);
cl_git_pass(git_reference_set_target(&new_ref, test_ref, &id, NULL));
git_reference_free(new_ref);
cl_git_pass(git_reference_lookup(&test_ref, g_repo, ref_test_name));
- cl_assert(git_reference_type(test_ref) == GIT_REF_OID);
+ cl_assert(git_reference_type(test_ref) == GIT_REFERENCE_DIRECT);
cl_assert_equal_oid(&id, git_reference_target(test_ref));
git_reference_free(test_ref);
}
git_reference *head, *new_head;
cl_git_pass(git_reference_lookup(&head, g_repo, "HEAD"));
- cl_assert(git_reference_type(head) == GIT_REF_SYMBOLIC);
+ cl_assert(git_reference_type(head) == GIT_REFERENCE_SYMBOLIC);
cl_assert(strcmp(git_reference_symbolic_target(head), ref_master_name) == 0);
cl_git_pass(git_reference_symbolic_set_target(&new_head, head, ref_test_name, NULL));
git_reference_free(head);
cl_git_pass(git_reference_lookup(&head, g_repo, "HEAD"));
- cl_assert(git_reference_type(head) == GIT_REF_SYMBOLIC);
+ cl_assert(git_reference_type(head) == GIT_REFERENCE_SYMBOLIC);
cl_assert(strcmp(git_reference_symbolic_target(head), ref_test_name) == 0);
git_reference_free(head);
}
void test_refs_setter__cant_update_direct_with_symbolic(void)
{
- // Overwrite an existing object id reference with a symbolic one
+ /* Overwrite an existing object id reference with a symbolic one */
git_reference *ref, *new;
git_oid id;
cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name));
- cl_assert(git_reference_type(ref) == GIT_REF_OID);
+ cl_assert(git_reference_type(ref) == GIT_REFERENCE_DIRECT);
git_oid_cpy(&id, git_reference_target(ref));
cl_git_fail(git_reference_symbolic_set_target(&new, ref, ref_name, NULL));
void test_refs_setter__cant_update_symbolic_with_direct(void)
{
- // Overwrite an existing symbolic reference with an object id one
+ /* Overwrite an existing symbolic reference with an object id one */
git_reference *ref, *new;
git_oid id;
cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name));
- cl_assert(git_reference_type(ref) == GIT_REF_OID);
+ cl_assert(git_reference_type(ref) == GIT_REFERENCE_DIRECT);
git_oid_cpy(&id, git_reference_target(ref));
git_reference_free(ref);
git_reference *head;
cl_git_pass(git_reference_lookup(&head, g_repo, GIT_HEAD_FILE));
- cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(head));
+ cl_assert_equal_i(GIT_REFERENCE_SYMBOLIC, git_reference_type(head));
git_reference_free(head);
cl_assert_equal_i(GIT_EINVALIDSPEC, git_reference_symbolic_create(&head, g_repo, GIT_HEAD_FILE, "refs/heads/inv@{id", 1, NULL));
--- /dev/null
+#include "clar_libgit2.h"
+#include "config/config_helpers.h"
+
+static git_repository *_repo;
+static git_config *_config;
+
+#define TEST_URL "http://github.com/libgit2/libgit2.git"
+
+void test_remote_create__initialize(void)
+{
+ cl_fixture_sandbox("testrepo.git");
+
+ cl_git_pass(git_repository_open(&_repo, "testrepo.git"));
+
+ cl_git_pass(git_repository_config(&_config, _repo));
+}
+
+void test_remote_create__cleanup(void)
+{
+ git_config_free(_config);
+
+ git_repository_free(_repo);
+
+ cl_fixture_cleanup("testrepo.git");
+}
+
+void test_remote_create__manual(void)
+{
+ git_remote *remote;
+ cl_git_pass(git_config_set_string(_config, "remote.origin.fetch", "+refs/heads/*:refs/remotes/origin/*"));
+ cl_git_pass(git_config_set_string(_config, "remote.origin.url", TEST_URL));
+
+ cl_git_pass(git_remote_lookup(&remote, _repo, "origin"));
+ cl_assert_equal_s(git_remote_name(remote), "origin");
+ cl_assert_equal_s(git_remote_url(remote), TEST_URL);
+
+ git_remote_free(remote);
+}
+
+void test_remote_create__named(void)
+{
+ git_remote *remote;
+ git_config *cfg;
+ const char *cfg_val;
+
+ size_t section_count = count_config_entries_match(_repo, "remote\\.");
+
+ cl_git_pass(git_remote_create(&remote, _repo, "valid-name", TEST_URL));
+
+ cl_assert_equal_s(git_remote_name(remote), "valid-name");
+ cl_assert_equal_s(git_remote_url(remote), TEST_URL);
+ cl_assert_equal_p(git_remote_owner(remote), _repo);
+
+ cl_git_pass(git_repository_config_snapshot(&cfg, _repo));
+
+ cl_git_pass(git_config_get_string(&cfg_val, cfg, "remote.valid-name.fetch"));
+ cl_assert_equal_s(cfg_val, "+refs/heads/*:refs/remotes/valid-name/*");
+
+ cl_git_pass(git_config_get_string(&cfg_val, cfg, "remote.valid-name.url"));
+ cl_assert_equal_s(cfg_val, TEST_URL);
+
+ cl_assert_equal_i(section_count + 2, count_config_entries_match(_repo, "remote\\."));
+
+ git_config_free(cfg);
+ git_remote_free(remote);
+}
+
+void test_remote_create__named_fail_on_invalid_name(void)
+{
+ const char *names[] = {
+ NULL,
+ "Inv@{id",
+ "",
+ "/",
+ "//",
+ ".lock",
+ "a.lock",
+ };
+ size_t i;
+
+ for (i = 0; i < ARRAY_SIZE(names); i++) {
+ git_remote *remote = NULL;
+ cl_git_fail_with(GIT_EINVALIDSPEC, git_remote_create(&remote, _repo, names[i], TEST_URL));
+ cl_assert_equal_p(remote, NULL);
+ }
+}
+
+void test_remote_create__named_fail_on_invalid_url(void)
+{
+ git_remote *remote = NULL;
+
+ cl_git_fail_with(GIT_ERROR, git_remote_create(&remote, _repo, "bad-url", ""));
+ cl_assert_equal_p(remote, NULL);
+}
+
+void test_remote_create__named_fail_on_conflicting_name(void)
+{
+ git_remote *remote = NULL;
+
+ cl_git_fail_with(GIT_EEXISTS, git_remote_create(&remote, _repo, "test", TEST_URL));
+ cl_assert_equal_p(remote, NULL);
+}
+
+void test_remote_create__with_fetchspec(void)
+{
+ git_remote *remote;
+ git_strarray array;
+ size_t section_count = count_config_entries_match(_repo, "remote\\.");
+
+ cl_git_pass(git_remote_create_with_fetchspec(&remote, _repo, "test-new", "git://github.com/libgit2/libgit2", "+refs/*:refs/*"));
+ cl_assert_equal_s(git_remote_name(remote), "test-new");
+ cl_assert_equal_s(git_remote_url(remote), "git://github.com/libgit2/libgit2");
+ cl_assert_equal_p(git_remote_owner(remote), _repo);
+
+ cl_git_pass(git_remote_get_fetch_refspecs(&array, remote));
+ cl_assert_equal_s("+refs/*:refs/*", array.strings[0]);
+ cl_assert_equal_i(1, array.count);
+ cl_assert_equal_i(section_count + 2, count_config_entries_match(_repo, "remote\\."));
+
+ git_strarray_free(&array);
+ git_remote_free(remote);
+}
+
+void test_remote_create__with_empty_fetchspec(void)
+{
+ git_remote *remote;
+ git_strarray array;
+ size_t section_count = count_config_entries_match(_repo, "remote\\.");
+
+ cl_git_pass(git_remote_create_with_fetchspec(&remote, _repo, "test-new", "git://github.com/libgit2/libgit2", NULL));
+ cl_git_pass(git_remote_get_fetch_refspecs(&array, remote));
+ cl_assert_equal_i(0, array.count);
+ cl_assert_equal_i(section_count + 1, count_config_entries_match(_repo, "remote\\."));
+
+ git_strarray_free(&array);
+ git_remote_free(remote);
+}
+
+void test_remote_create__with_fetchspec_invalid_name(void)
+{
+ git_remote *remote = NULL;
+
+ cl_git_fail_with(GIT_EINVALIDSPEC, git_remote_create_with_fetchspec(&remote, _repo, NULL, TEST_URL, NULL));
+ cl_assert_equal_p(remote, NULL);
+}
+
+void test_remote_create__with_fetchspec_invalid_url(void)
+{
+ git_remote *remote = NULL;
+
+ cl_git_fail_with(GIT_EINVALIDSPEC, git_remote_create_with_fetchspec(&remote, _repo, NULL, "", NULL));
+ cl_assert_equal_p(remote, NULL);
+}
+
+void test_remote_create__anonymous(void)
+{
+ git_remote *remote;
+ git_strarray array;
+ size_t section_count = count_config_entries_match(_repo, "remote\\.");
+
+ cl_git_pass(git_remote_create_anonymous(&remote, _repo, TEST_URL));
+ cl_assert_equal_s(git_remote_name(remote), NULL);
+ cl_assert_equal_s(git_remote_url(remote), TEST_URL);
+ cl_assert_equal_p(git_remote_owner(remote), _repo);
+
+ cl_git_pass(git_remote_get_fetch_refspecs(&array, remote));
+ cl_assert_equal_i(0, array.count);
+ cl_assert_equal_i(section_count, count_config_entries_match(_repo, "remote\\."));
+
+ git_strarray_free(&array);
+ git_remote_free(remote);
+}
+
+void test_remote_create__anonymous_invalid_url(void)
+{
+ git_remote *remote = NULL;
+
+ cl_git_fail_with(GIT_EINVALIDSPEC, git_remote_create_anonymous(&remote, _repo, ""));
+ cl_assert_equal_p(remote, NULL);
+}
+
+void test_remote_create__detached(void)
+{
+ git_remote *remote;
+ git_strarray array;
+
+ size_t section_count = count_config_entries_match(_repo, "remote\\.");
+
+ cl_git_pass(git_remote_create_detached(&remote, TEST_URL));
+ cl_assert_equal_s(git_remote_name(remote), NULL);
+ cl_assert_equal_s(git_remote_url(remote), TEST_URL);
+ cl_assert_equal_p(git_remote_owner(remote), NULL);
+
+ cl_git_pass(git_remote_get_fetch_refspecs(&array, remote));
+ cl_assert_equal_i(0, array.count);
+ cl_assert_equal_i(section_count, count_config_entries_match(_repo, "remote\\."));
+
+ git_strarray_free(&array);
+ git_remote_free(remote);
+}
+
+void test_remote_create__detached_invalid_url(void)
+{
+ git_remote *remote = NULL;
+
+ cl_git_fail_with(GIT_EINVALIDSPEC, git_remote_create_detached(&remote, ""));
+ cl_assert_equal_p(remote, NULL);
+}
+
+void test_remote_create__with_opts_named(void)
+{
+ git_remote *remote;
+ git_strarray array;
+ git_remote_create_options opts = GIT_REMOTE_CREATE_OPTIONS_INIT;
+
+ opts.name = "test-new";
+ opts.repository = _repo;
+
+ cl_git_pass(git_remote_create_with_opts(&remote, TEST_URL, &opts));
+ cl_assert_equal_s(git_remote_name(remote), "test-new");
+ cl_assert_equal_s(git_remote_url(remote), TEST_URL);
+ cl_assert_equal_p(git_remote_owner(remote), _repo);
+
+ cl_git_pass(git_remote_get_fetch_refspecs(&array, remote));
+ cl_assert_equal_i(1, array.count);
+ cl_assert_equal_s("+refs/heads/*:refs/remotes/test-new/*", array.strings[0]);
+
+ git_strarray_free(&array);
+ git_remote_free(remote);
+}
+
+void test_remote_create__with_opts_named_and_fetchspec(void)
+{
+ git_remote *remote;
+ git_strarray array;
+ git_remote_create_options opts = GIT_REMOTE_CREATE_OPTIONS_INIT;
+
+ opts.name = "test-new";
+ opts.repository = _repo;
+ opts.fetchspec = "+refs/*:refs/*";
+
+ cl_git_pass(git_remote_create_with_opts(&remote, TEST_URL, &opts));
+ cl_assert_equal_s(git_remote_name(remote), "test-new");
+ cl_assert_equal_s(git_remote_url(remote), TEST_URL);
+ cl_assert_equal_p(git_remote_owner(remote), _repo);
+
+ cl_git_pass(git_remote_get_fetch_refspecs(&array, remote));
+ cl_assert_equal_i(1, array.count);
+ cl_assert_equal_s("+refs/*:refs/*", array.strings[0]);
+
+ git_strarray_free(&array);
+ git_remote_free(remote);
+}
+
+void test_remote_create__with_opts_named_no_fetchspec(void)
+{
+ git_remote *remote;
+ git_strarray array;
+ git_remote_create_options opts = GIT_REMOTE_CREATE_OPTIONS_INIT;
+
+ opts.name = "test-new";
+ opts.repository = _repo;
+ opts.flags = GIT_REMOTE_CREATE_SKIP_DEFAULT_FETCHSPEC;
+
+ cl_git_pass(git_remote_create_with_opts(&remote, TEST_URL, &opts));
+ cl_assert_equal_s(git_remote_name(remote), "test-new");
+ cl_assert_equal_s(git_remote_url(remote), TEST_URL);
+ cl_assert_equal_p(git_remote_owner(remote), _repo);
+
+ cl_git_pass(git_remote_get_fetch_refspecs(&array, remote));
+ cl_assert_equal_i(0, array.count);
+
+ git_strarray_free(&array);
+ git_remote_free(remote);
+}
+
+void test_remote_create__with_opts_anonymous(void)
+{
+ git_remote *remote;
+ git_strarray array;
+ git_remote_create_options opts = GIT_REMOTE_CREATE_OPTIONS_INIT;
+
+ opts.repository = _repo;
+
+ cl_git_pass(git_remote_create_with_opts(&remote, TEST_URL, &opts));
+ cl_assert_equal_s(git_remote_name(remote), NULL);
+ cl_assert_equal_s(git_remote_url(remote), TEST_URL);
+ cl_assert_equal_p(git_remote_owner(remote), _repo);
+
+ cl_git_pass(git_remote_get_fetch_refspecs(&array, remote));
+ cl_assert_equal_i(0, array.count);
+
+ git_strarray_free(&array);
+ git_remote_free(remote);
+}
+
+void test_remote_create__with_opts_detached(void)
+{
+ git_remote *remote;
+ git_strarray array;
+ git_remote_create_options opts = GIT_REMOTE_CREATE_OPTIONS_INIT;
+
+ cl_git_pass(git_remote_create_with_opts(&remote, TEST_URL, &opts));
+ cl_assert_equal_s(git_remote_name(remote), NULL);
+ cl_assert_equal_s(git_remote_url(remote), TEST_URL);
+ cl_assert_equal_p(git_remote_owner(remote), NULL);
+
+ cl_git_pass(git_remote_get_fetch_refspecs(&array, remote));
+ cl_assert_equal_i(0, array.count);
+
+ git_strarray_free(&array);
+
+ git_remote_free(remote);
+
+ cl_git_pass(git_remote_create_with_opts(&remote, TEST_URL, NULL));
+ cl_assert_equal_s(git_remote_name(remote), NULL);
+ cl_assert_equal_s(git_remote_url(remote), TEST_URL);
+ cl_assert_equal_p(git_remote_owner(remote), NULL);
+
+ cl_git_pass(git_remote_get_fetch_refspecs(&array, remote));
+ cl_assert_equal_i(0, array.count);
+
+ git_strarray_free(&array);
+
+ git_remote_free(remote);
+}
+
+
+void test_remote_create__with_opts_insteadof_disabled(void)
+{
+ git_remote *remote;
+ git_remote_create_options opts = GIT_REMOTE_CREATE_OPTIONS_INIT;
+
+ opts.repository = _repo;
+ opts.flags = GIT_REMOTE_CREATE_SKIP_INSTEADOF;
+
+ cl_git_pass(git_remote_create_with_opts(&remote, "http://example.com/libgit2/libgit2", &opts));
+
+ cl_assert_equal_s(git_remote_url(remote), "http://example.com/libgit2/libgit2");
+ cl_assert_equal_p(git_remote_pushurl(remote), NULL);
+
+ git_remote_free(remote);
+}
+
+static int create_with_name(git_remote **remote, git_repository *repo, const char *name, const char *url)
+{
+ git_remote_create_options opts = GIT_REMOTE_CREATE_OPTIONS_INIT;
+
+ opts.repository = repo;
+ opts.name = name;
+
+ return git_remote_create_with_opts(remote, url, &opts);
+}
+
+void test_remote_create__with_opts_invalid_name(void)
+{
+ const char *names[] = {
+ "Inv@{id",
+ "",
+ "/",
+ "//",
+ ".lock",
+ "a.lock",
+ };
+ size_t i;
+
+ for (i = 0; i < ARRAY_SIZE(names); i++) {
+ git_remote *remote = NULL;
+ cl_git_fail_with(GIT_EINVALIDSPEC, create_with_name(&remote, _repo, names[i], TEST_URL));
+ cl_assert_equal_p(remote, NULL);
+ }
+}
+
+void test_remote_create__with_opts_conflicting_name(void)
+{
+ git_remote *remote = NULL;
+
+ cl_git_fail_with(GIT_EEXISTS, create_with_name(&remote, _repo, "test", TEST_URL));
+ cl_assert_equal_p(remote, NULL);
+}
+
+void test_remote_create__with_opts_invalid_url(void)
+{
+ git_remote *remote = NULL;
+
+ cl_git_fail_with(GIT_EINVALIDSPEC, create_with_name(&remote, _repo, "test-new", ""));
+ cl_assert_equal_p(remote, NULL);
+}
{
cl_sandbox_set_search_path_defaults();
- git_buf_free(&path);
+ git_buf_dispose(&path);
cl_git_pass(
git_futils_rmdir_r("alternate", NULL, GIT_RMDIR_REMOVE_FILES));
cl_git_pass(git_libgit2_opts(
GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_XDG, path.ptr));
- git_buf_free(&path);
+ git_buf_dispose(&path);
cl_git_pass(git_repository_open(&repo, "empty_standard_repo"));
cl_git_pass(git_repository_config(&config, repo));
cl_assert_equal_s(found_path.ptr, resolved.ptr);
- git_buf_free(&resolved);
- git_buf_free(&found_path);
+ git_buf_dispose(&resolved);
+ git_buf_dispose(&found_path);
}
static void write_file(const char *path, const char *content)
cl_git_pass(error);
}
-//no check is performed on ceiling_dirs length, so be sure it's long enough
+/*no check is performed on ceiling_dirs length, so be sure it's long enough */
static void append_ceiling_dir(git_buf *ceiling_dirs, const char *path)
{
git_buf pretty_path = GIT_BUF_INIT;
git_buf_puts(ceiling_dirs, pretty_path.ptr);
- git_buf_free(&pretty_path);
+ git_buf_dispose(&pretty_path);
cl_assert(git_buf_oom(ceiling_dirs) == 0);
}
void test_repo_discover__cleanup(void)
{
- git_buf_free(&discovered);
- git_buf_free(&ceiling_dirs);
+ git_buf_dispose(&discovered);
+ git_buf_dispose(&ceiling_dirs);
cl_git_pass(git_futils_rmdir_r(TEMP_REPO_FOLDER, NULL, GIT_RMDIR_REMOVE_FILES));
}
va_end(args);
ret = cl_setenv(name, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
return ret;
}
cl_must_pass(p_chdir(path));
passfail_(NULL, file, line);
cl_must_pass(p_chdir(git_buf_cstr(&cwd_buf)));
- git_buf_free(&cwd_buf);
+ git_buf_dispose(&cwd_buf);
}
#define env_cd_pass(path) env_cd_((path), env_pass_, __FILE__, __LINE__)
#define env_cd_fail(path) env_cd_((path), env_fail_, __FILE__, __LINE__)
cl_git_expect(git_repository_open_ext(&repo, "attr", GIT_REPOSITORY_OPEN_FROM_ENV, NULL), 0, file, line);
if (a) {
- cl_git_expect(git_object_lookup(&object, repo, &oid_a, GIT_OBJ_BLOB), 0, file, line);
+ cl_git_expect(git_object_lookup(&object, repo, &oid_a, GIT_OBJECT_BLOB), 0, file, line);
git_object_free(object);
} else {
- cl_git_fail_at_line(git_object_lookup(&object, repo, &oid_a, GIT_OBJ_BLOB), file, line);
+ cl_git_fail_at_line(git_object_lookup(&object, repo, &oid_a, GIT_OBJECT_BLOB), file, line);
}
if (t) {
- cl_git_expect(git_object_lookup(&object, repo, &oid_t, GIT_OBJ_BLOB), 0, file, line);
+ cl_git_expect(git_object_lookup(&object, repo, &oid_t, GIT_OBJECT_BLOB), 0, file, line);
git_object_free(object);
} else {
- cl_git_fail_at_line(git_object_lookup(&object, repo, &oid_t, GIT_OBJ_BLOB), file, line);
+ cl_git_fail_at_line(git_object_lookup(&object, repo, &oid_t, GIT_OBJECT_BLOB), file, line);
}
if (p) {
- cl_git_expect(git_object_lookup(&object, repo, &oid_p, GIT_OBJ_COMMIT), 0, file, line);
+ cl_git_expect(git_object_lookup(&object, repo, &oid_p, GIT_OBJECT_COMMIT), 0, file, line);
git_object_free(object);
} else {
- cl_git_fail_at_line(git_object_lookup(&object, repo, &oid_p, GIT_OBJ_COMMIT), file, line);
+ cl_git_fail_at_line(git_object_lookup(&object, repo, &oid_p, GIT_OBJECT_COMMIT), file, line);
}
git_repository_free(repo);
cl_fixture_cleanup("testrepo.git");
cl_fixture_cleanup("attr");
- git_buf_free(&repo_dir_buf);
+ git_buf_dispose(&repo_dir_buf);
clear_git_env();
}
git_buf full = GIT_BUF_INIT;
/* hash with repo relative path */
- cl_git_pass(git_odb_hashfile(&a, "status/current_file", GIT_OBJ_BLOB));
- cl_git_pass(git_repository_hashfile(&b, _repo, "current_file", GIT_OBJ_BLOB, NULL));
+ cl_git_pass(git_odb_hashfile(&a, "status/current_file", GIT_OBJECT_BLOB));
+ cl_git_pass(git_repository_hashfile(&b, _repo, "current_file", GIT_OBJECT_BLOB, NULL));
cl_assert_equal_oid(&a, &b);
cl_git_pass(git_buf_joinpath(&full, git_repository_workdir(_repo), "current_file"));
/* hash with full path */
- cl_git_pass(git_odb_hashfile(&a, full.ptr, GIT_OBJ_BLOB));
- cl_git_pass(git_repository_hashfile(&b, _repo, full.ptr, GIT_OBJ_BLOB, NULL));
+ cl_git_pass(git_odb_hashfile(&a, full.ptr, GIT_OBJECT_BLOB));
+ cl_git_pass(git_repository_hashfile(&b, _repo, full.ptr, GIT_OBJECT_BLOB, NULL));
cl_assert_equal_oid(&a, &b);
/* hash with invalid type */
- cl_git_fail(git_odb_hashfile(&a, full.ptr, GIT_OBJ_ANY));
- cl_git_fail(git_repository_hashfile(&b, _repo, full.ptr, GIT_OBJ_OFS_DELTA, NULL));
+ cl_git_fail(git_odb_hashfile(&a, full.ptr, GIT_OBJECT_ANY));
+ cl_git_fail(git_repository_hashfile(&b, _repo, full.ptr, GIT_OBJECT_OFS_DELTA, NULL));
- git_buf_free(&full);
+ git_buf_dispose(&full);
}
void test_repo_hashfile__filtered(void)
cl_git_mkfile("status/testfile.bin", "other\r\nstuff\r\n");
/* not equal hashes because of filtering */
- cl_git_pass(git_odb_hashfile(&a, "status/testfile.txt", GIT_OBJ_BLOB));
- cl_git_pass(git_repository_hashfile(&b, _repo, "testfile.txt", GIT_OBJ_BLOB, NULL));
+ cl_git_pass(git_odb_hashfile(&a, "status/testfile.txt", GIT_OBJECT_BLOB));
+ cl_git_pass(git_repository_hashfile(&b, _repo, "testfile.txt", GIT_OBJECT_BLOB, NULL));
cl_assert(git_oid_cmp(&a, &b));
/* equal hashes because filter is binary */
- cl_git_pass(git_odb_hashfile(&a, "status/testfile.bin", GIT_OBJ_BLOB));
- cl_git_pass(git_repository_hashfile(&b, _repo, "testfile.bin", GIT_OBJ_BLOB, NULL));
+ cl_git_pass(git_odb_hashfile(&a, "status/testfile.bin", GIT_OBJECT_BLOB));
+ cl_git_pass(git_repository_hashfile(&b, _repo, "testfile.bin", GIT_OBJECT_BLOB, NULL));
cl_assert_equal_oid(&a, &b);
/* equal hashes when 'as_file' points to binary filtering */
- cl_git_pass(git_odb_hashfile(&a, "status/testfile.txt", GIT_OBJ_BLOB));
- cl_git_pass(git_repository_hashfile(&b, _repo, "testfile.txt", GIT_OBJ_BLOB, "foo.bin"));
+ cl_git_pass(git_odb_hashfile(&a, "status/testfile.txt", GIT_OBJECT_BLOB));
+ cl_git_pass(git_repository_hashfile(&b, _repo, "testfile.txt", GIT_OBJECT_BLOB, "foo.bin"));
cl_assert_equal_oid(&a, &b);
/* not equal hashes when 'as_file' points to text filtering */
- cl_git_pass(git_odb_hashfile(&a, "status/testfile.bin", GIT_OBJ_BLOB));
- cl_git_pass(git_repository_hashfile(&b, _repo, "testfile.bin", GIT_OBJ_BLOB, "foo.txt"));
+ cl_git_pass(git_odb_hashfile(&a, "status/testfile.bin", GIT_OBJECT_BLOB));
+ cl_git_pass(git_repository_hashfile(&b, _repo, "testfile.bin", GIT_OBJECT_BLOB, "foo.txt"));
cl_assert(git_oid_cmp(&a, &b));
/* equal hashes when 'as_file' is empty and turns off filtering */
- cl_git_pass(git_odb_hashfile(&a, "status/testfile.txt", GIT_OBJ_BLOB));
- cl_git_pass(git_repository_hashfile(&b, _repo, "testfile.txt", GIT_OBJ_BLOB, ""));
+ cl_git_pass(git_odb_hashfile(&a, "status/testfile.txt", GIT_OBJECT_BLOB));
+ cl_git_pass(git_repository_hashfile(&b, _repo, "testfile.txt", GIT_OBJECT_BLOB, ""));
cl_assert_equal_oid(&a, &b);
- cl_git_pass(git_odb_hashfile(&a, "status/testfile.bin", GIT_OBJ_BLOB));
- cl_git_pass(git_repository_hashfile(&b, _repo, "testfile.bin", GIT_OBJ_BLOB, ""));
+ cl_git_pass(git_odb_hashfile(&a, "status/testfile.bin", GIT_OBJECT_BLOB));
+ cl_git_pass(git_repository_hashfile(&b, _repo, "testfile.bin", GIT_OBJECT_BLOB, ""));
cl_assert_equal_oid(&a, &b);
/* some hash type failures */
cl_git_fail(git_odb_hashfile(&a, "status/testfile.txt", 0));
- cl_git_fail(git_repository_hashfile(&b, _repo, "testfile.txt", GIT_OBJ_ANY, NULL));
+ cl_git_fail(git_repository_hashfile(&b, _repo, "testfile.txt", GIT_OBJECT_ANY, NULL));
}
cl_git_pass(git_repository_head(&head, repo));
- cl_git_pass(git_object_lookup(&commit, repo, git_reference_target(head), GIT_OBJ_COMMIT));
+ cl_git_pass(git_object_lookup(&commit, repo, git_reference_target(head), GIT_OBJECT_COMMIT));
git_object_free(commit);
git_reference_free(head);
git_object *tag;
cl_git_pass(git_revparse_single(&tag, repo, "tags/test"));
- cl_assert_equal_i(GIT_OBJ_TAG, git_object_type(tag));
+ cl_assert_equal_i(GIT_OBJECT_TAG, git_object_type(tag));
cl_git_pass(git_repository_set_head_detached(repo, git_object_id(tag)));
#include "config.h"
#include "path.h"
#include "config/config_helpers.h"
+#include "repo/repo_helpers.h"
enum repo_mode {
STANDARD_REPOSITORY = 0,
static git_repository *_repo = NULL;
static git_buf _global_path = GIT_BUF_INIT;
-static git_buf _tmp_path = GIT_BUF_INIT;
static mode_t g_umask = 0;
void test_repo_init__initialize(void)
{
git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL,
_global_path.ptr);
- git_buf_free(&_global_path);
+ git_buf_dispose(&_global_path);
- if (_tmp_path.size > 0 && git_path_isdir(_tmp_path.ptr))
- git_futils_rmdir_r(_tmp_path.ptr, NULL, GIT_RMDIR_REMOVE_FILES);
- git_buf_free(&_tmp_path);
+ cl_fixture_cleanup("tmp_global_path");
}
static void cleanup_repository(void *path)
cl_git_pass(chdir(git_buf_cstr(&path_current_workdir)));
- git_buf_free(&path_current_workdir);
- git_buf_free(&path_repository);
+ git_buf_dispose(&path_current_workdir);
+ git_buf_dispose(&path_repository);
cleanup_repository("a");
}
cl_assert(git_path_isdir(git_buf_cstr(&path)));
/* won't confirm specific contents of hooks dir since it may vary */
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
static void assert_config_entry_on_init_bytype(
"core.ignorecase", found_without_match ? true : GIT_ENOTFOUND);
}
+/*
+ * Windows: if the filesystem supports symlinks (because we're running
+ * as administrator, or because the user has opted into it for normal
+ * users) then we can also opt-in explicitly by settings `core.symlinks`
+ * in the global config. Symlinks remain off by default.
+ */
+
+void test_repo_init__symlinks_win32_enabled_by_global_config(void)
+{
+#ifndef GIT_WIN32
+ cl_skip();
+#else
+ git_config *config, *repo_config;
+ int val;
+
+ if (!filesystem_supports_symlinks("link"))
+ cl_skip();
+
+ create_tmp_global_config("tmp_global_config", "core.symlinks", "true");
+
+ /*
+ * Create a new repository (can't use `assert_config_on_init` since we
+ * want to examine configuration levels with more granularity.)
+ */
+ cl_git_pass(git_repository_init(&_repo, "config_entry/test.non.bare.git", false));
+
+ /* Ensure that core.symlinks remains set (via the global config). */
+ cl_git_pass(git_repository_config(&config, _repo));
+ cl_git_pass(git_config_get_bool(&val, config, "core.symlinks"));
+ cl_assert_equal_i(1, val);
+
+ /*
+ * Ensure that the repository config does not set core.symlinks.
+ * It should remain inherited.
+ */
+ cl_git_pass(git_config_open_level(&repo_config, config, GIT_CONFIG_LEVEL_LOCAL));
+ cl_git_fail_with(GIT_ENOTFOUND, git_config_get_bool(&val, repo_config, "core.symlinks"));
+ git_config_free(repo_config);
+
+ git_config_free(config);
+#endif
+}
+
+void test_repo_init__symlinks_win32_off_by_default(void)
+{
+#ifndef GIT_WIN32
+ cl_skip();
+#else
+ assert_config_entry_on_init("core.symlinks", false);
+#endif
+}
+
+void test_repo_init__symlinks_posix_detected(void)
+{
+#ifdef GIT_WIN32
+ cl_skip();
+#else
+ assert_config_entry_on_init(
+ "core.symlinks", filesystem_supports_symlinks("link") ? GIT_ENOTFOUND : false);
+#endif
+}
+
void test_repo_init__detect_precompose_unicode_required(void)
{
#ifdef GIT_USE_ICONV
cl_assert((S_ISGID & st.st_mode) == 0);
cl_git_pass(git_reference_lookup(&ref, _repo, "HEAD"));
- cl_assert(git_reference_type(ref) == GIT_REF_SYMBOLIC);
+ cl_assert(git_reference_type(ref) == GIT_REFERENCE_SYMBOLIC);
cl_assert_equal_s("refs/heads/development", git_reference_symbolic_target(ref));
git_reference_free(ref);
cl_git_pass(git_futils_readbuffer(&dot_git_content, "root/b/c_wd/.git"));
cl_assert_equal_s("gitdir: ../my_repository/", dot_git_content.ptr);
- git_buf_free(&dot_git_content);
+ git_buf_dispose(&dot_git_content);
cleanup_repository("root");
}
/* make the directory first, then it should succeed */
cl_git_pass(git_repository_init_ext(&_repo, "root/b/my_repository", &opts));
- git_buf_free(&full_path);
+ git_buf_dispose(&full_path);
cl_assert(!git__suffixcmp(git_repository_workdir(_repo), "root/b/c_wd/"));
cl_assert(!git__suffixcmp(git_repository_path(_repo), "root/b/my_repository/"));
cl_git_pass(git_futils_readbuffer(&dot_git_content, "root/b/c_wd/.git"));
cl_assert_equal_s("gitdir: ../my_repository/", dot_git_content.ptr);
- git_buf_free(&dot_git_content);
+ git_buf_dispose(&dot_git_content);
cleanup_repository("root");
}
cl_assert_equal_i_fmt(expected_mode, st.st_mode, "%07o");
}
- git_buf_free(&expected);
- git_buf_free(&actual);
+ git_buf_dispose(&expected);
+ git_buf_dispose(&actual);
}
static void assert_mode_seems_okay(
cl_git_pass(git_buf_joinpath(&full, base, path));
cl_git_pass(git_path_lstat(full.ptr, &st));
- git_buf_free(&full);
+ git_buf_dispose(&full);
if (!core_filemode) {
CLEAR_FOR_CORE_FILEMODE(expect_mode);
/* create a file starting with a dot */
cl_git_pass(git_buf_joinpath(&dotfile_path, hooks_path.ptr, ".dotfile"));
cl_git_mkfile(dotfile_path.ptr, "something\n");
- git_buf_free(&dotfile_path);
+ git_buf_dispose(&dotfile_path);
- git_buf_free(&dotfile_path);
- git_buf_free(&link_path);
- git_buf_free(&hooks_path);
+ git_buf_dispose(&dotfile_path);
+ git_buf_dispose(&link_path);
+ git_buf_dispose(&hooks_path);
return path;
}
static void configure_templatedir(const char *template_path)
{
- git_buf config_path = GIT_BUF_INIT;
- git_buf config_data = GIT_BUF_INIT;
-
- cl_git_pass(git_libgit2_opts(GIT_OPT_GET_SEARCH_PATH,
- GIT_CONFIG_LEVEL_GLOBAL, &_tmp_path));
- cl_git_pass(git_buf_puts(&_tmp_path, ".tmp"));
- cl_git_pass(git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH,
- GIT_CONFIG_LEVEL_GLOBAL, _tmp_path.ptr));
-
- cl_must_pass(p_mkdir(_tmp_path.ptr, 0777));
-
- cl_git_pass(git_buf_joinpath(&config_path, _tmp_path.ptr, ".gitconfig"));
-
- cl_git_pass(git_buf_printf(&config_data,
- "[init]\n\ttemplatedir = \"%s\"\n", template_path));
-
- cl_git_mkfile(config_path.ptr, config_data.ptr);
-
- git_buf_free(&config_path);
- git_buf_free(&config_data);
+ create_tmp_global_config("tmp_global_path", "init.templatedir", template_path);
}
static void validate_templates(git_repository *repo, const char *template_path)
template_path, git_repository_path(repo),
"hooks/.dotfile", filemode);
- git_buf_free(&expected);
- git_buf_free(&actual);
- git_buf_free(&repo_description);
- git_buf_free(&template_description);
+ git_buf_dispose(&expected);
+ git_buf_dispose(&actual);
+ git_buf_dispose(&repo_description);
+ git_buf_dispose(&template_description);
}
void test_repo_init__external_templates_specified_in_options(void)
validate_templates(_repo, "template");
cl_fixture_cleanup("template");
- git_buf_free(&template_path);
+ git_buf_dispose(&template_path);
}
void test_repo_init__external_templates_with_leading_dot(void)
validate_templates(_repo, ".template_with_leading_dot");
cl_fixture_cleanup(".template_with_leading_dot");
- git_buf_free(&template_path);
+ git_buf_dispose(&template_path);
}
void test_repo_init__extended_with_template_and_shared_mode(void)
cl_assert(git_path_isdir(root.ptr));
cl_git_pass(git_futils_rmdir_r(root.ptr, NULL, GIT_RMDIR_REMOVE_FILES));
- git_buf_free(&root);
+ git_buf_dispose(&root);
git_repository_free(repo);
}
cl_git_pass(git_repository_message(&actual, _repo));
cl_assert_equal_s(expected, git_buf_cstr(&actual));
- git_buf_free(&actual);
+ git_buf_dispose(&actual);
cl_git_pass(p_unlink(git_buf_cstr(&path)));
cl_assert_equal_i(GIT_ENOTFOUND, git_repository_message(&actual, _repo));
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
cl_git_pass(git_futils_mkdir(dir, 0777, GIT_MKDIR_VERIFY_DIR));
cl_git_pass(git_buf_joinpath(&path, dir, ".git"));
cl_git_rewritefile(path.ptr, linktext);
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
void test_repo_open__gitlinked(void)
}
}
- git_buf_free(&link_tgt);
- git_buf_free(&link);
- git_buf_free(&body);
+ git_buf_dispose(&link_tgt);
+ git_buf_dispose(&link);
+ git_buf_dispose(&body);
cl_git_pass(git_repository_open(&repo2, "alternate"));
GIT_REPOSITORY_OPEN_NO_SEARCH | GIT_REPOSITORY_OPEN_NO_DOTGIT,
NULL));
- git_buf_free(&ceiling);
+ git_buf_dispose(&ceiling);
}
void test_repo_open__bad_gitlinks(void)
cl_assert(git__suffixcmp(git_repository_workdir(repo2), repo_wd) == 0);
git_repository_free(repo2);
- git_buf_free(&winpath);
+ git_buf_dispose(&winpath);
#endif
}
cl_git_pass(git_libgit2_opts(
GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_XDG, path.ptr));
- git_buf_free(&path);
+ git_buf_dispose(&path);
cl_git_pass(git_repository_open(&repo, "empty_standard_repo"));
cl_git_pass(git_repository_config(&config, repo));
cl_git_pass(git_buf_joinpath(&head_path, git_repository_path(repo), GIT_HEAD_FILE));
cl_git_pass(p_unlink(git_buf_cstr(&head_path)));
- git_buf_free(&head_path);
+ git_buf_dispose(&head_path);
+}
+
+int filesystem_supports_symlinks(const char *path)
+{
+ struct stat st;
+ bool support = 0;
+
+ if (p_symlink("target", path) == 0) {
+ if (p_lstat(path, &st) == 0 && S_ISLNK(st.st_mode))
+ support = 1;
+
+ p_unlink(path);
+ }
+
+ return support;
+}
+
+void create_tmp_global_config(const char *dirname, const char *key, const char *val)
+{
+ git_buf path = GIT_BUF_INIT;
+ git_config *config;
+
+ cl_git_pass(git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH,
+ GIT_CONFIG_LEVEL_GLOBAL, dirname));
+ cl_must_pass(p_mkdir(dirname, 0777));
+ cl_git_pass(git_buf_joinpath(&path, dirname, ".gitconfig"));
+ cl_git_pass(git_config_open_ondisk(&config, path.ptr));
+ cl_git_pass(git_config_set_string(config, key, val));
+ git_config_free(config);
+ git_buf_dispose(&path);
}
extern void make_head_unborn(git_repository* repo, const char *target);
extern void delete_head(git_repository* repo);
+extern int filesystem_supports_symlinks(const char *path);
+extern void create_tmp_global_config(const char *path, const char *key, const char *val);
cl_git_pass(git_submodule_update(sm, 1, &update_options));
git_submodule_free(sm);
- git_buf_free(&url);
+ git_buf_dispose(&url);
}
cl_git_pass(git_futils_readbuffer(&content, "./new_workdir/.git"));
cl_assert(git__prefixcmp(git_buf_cstr(&content), "gitdir: ") == 0);
cl_assert(git__suffixcmp(git_buf_cstr(&content), "testrepo.git/") == 0);
- git_buf_free(&content);
+ git_buf_dispose(&content);
cl_git_pass(git_repository_config(&cfg, repo));
cl_git_pass(git_config_get_string_buf(&buf, cfg, "core.worktree"));
cl_assert(git__suffixcmp(git_buf_cstr(&buf), "new_workdir/") == 0);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_config_free(cfg);
}
{
g_repo = cl_git_sandbox_init("testrepo.git");
cl_assert_equal_i(0, git_repository_is_shallow(g_repo));
- cl_assert_equal_p(NULL, giterr_last());
+ cl_assert_equal_p(NULL, git_error_last());
}
void test_repo_state__cleanup(void)
{
cl_git_sandbox_cleanup();
- git_buf_free(&_path);
+ git_buf_dispose(&_path);
}
static void setup_simple_state(const char *filename)
}
}
- git_buf_free(&content);
- git_buf_free(&path);
+ git_buf_dispose(&content);
+ git_buf_dispose(&path);
}
void test_reset_hard__cannot_reset_in_a_bare_repository(void)
memset(&entry, 0x0, sizeof(git_index_entry));
entry.path = "conflicting_file";
- GIT_IDXENTRY_STAGE_SET(&entry, side);
+ GIT_INDEX_ENTRY_STAGE_SET(&entry, side);
entry.mode = 0100644;
git_oid_cpy(&entry.id, oid);
cl_assert(git_path_exists(git_buf_cstr(&orig_head_path)));
cl_git_pass(p_unlink(git_buf_cstr(&orig_head_path)));
- git_buf_free(&merge_head_path);
- git_buf_free(&merge_msg_path);
- git_buf_free(&merge_mode_path);
- git_buf_free(&orig_head_path);
+ git_buf_dispose(&merge_head_path);
+ git_buf_dispose(&merge_msg_path);
+ git_buf_dispose(&merge_mode_path);
+ git_buf_dispose(&orig_head_path);
}
void test_reset_hard__reflog_is_correct(void)
reflog_check(repo, "HEAD", 4, NULL, git_buf_cstr(&buf));
reflog_check(repo, "refs/heads/master", 4, NULL, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
/* Moved branch, expect revspec in message */
exp_msg = "reset: moving to HEAD~^{commit}";
git_oid src_id, tgt_id;
cl_git_pass(git_repository_odb(&odb, repo));
- cl_git_pass(git_odb_write(&entry.id, odb, "", 0, GIT_OBJ_BLOB));
+ cl_git_pass(git_odb_write(&entry.id, odb, "", 0, GIT_OBJECT_BLOB));
git_odb_free(odb);
entry.mode = GIT_FILEMODE_BLOB;
git_signature_free(sig);
/* Let's go to a known state of the src commit with the file named 'dir' */
- cl_git_pass(git_object_lookup(&commit, repo, &src_id, GIT_OBJ_COMMIT));
+ cl_git_pass(git_object_lookup(&commit, repo, &src_id, GIT_OBJECT_COMMIT));
cl_git_pass(git_reset(repo, commit, GIT_RESET_HARD, NULL));
git_object_free(commit);
/* And now we move over to the commit with the directory named 'dir' */
- cl_git_pass(git_object_lookup(&commit, repo, &tgt_id, GIT_OBJ_COMMIT));
+ cl_git_pass(git_object_lookup(&commit, repo, &tgt_id, GIT_OBJECT_COMMIT));
cl_git_pass(git_reset(repo, commit, GIT_RESET_HARD, NULL));
git_object_free(commit);
}
cl_git_pass(git_reset(repo, target, GIT_RESET_MIXED, NULL));
reflog_check(repo, "HEAD", 10, NULL, git_buf_cstr(&buf));
reflog_check(repo, "refs/heads/master", 10, NULL, git_buf_cstr(&buf));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
/* Moved branch, expect revspec in message */
exp_msg = "reset: moving to HEAD~^{commit}";
cl_assert_equal_i(GIT_EUNMERGED, git_reset(repo, target, GIT_RESET_SOFT, NULL));
cl_git_pass(p_unlink(git_buf_cstr(&merge_head_path)));
- git_buf_free(&merge_head_path);
+ git_buf_dispose(&merge_head_path);
}
void test_reset_soft__fails_when_index_contains_conflicts_independently_of_MERGE_HEAD_file_existence(void)
cl_git_pass(git_buf_joinpath(&merge_head_path, git_repository_path(repo), "MERGE_HEAD"));
cl_git_pass(p_unlink(git_buf_cstr(&merge_head_path)));
- git_buf_free(&merge_head_path);
+ git_buf_dispose(&merge_head_path);
cl_git_pass(git_repository_index(&index, repo));
cl_assert_equal_i(true, git_index_has_conflicts(index));
git_index_free(index);
cl_git_pass(git_repository_head(&head, repo));
- cl_git_pass(git_reference_peel(&target, head, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel(&target, head, GIT_OBJECT_COMMIT));
git_reference_free(head);
cl_assert_equal_i(GIT_EUNMERGED, git_reset(repo, target, GIT_RESET_SOFT, NULL));
* binary
+*.sh text diff merge eol=lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+This test data was generated using the `tests/resources/generate_crlf.sh`
+(posix and windows directories) and `tests/resources/generate_crlf_checkin.sh`
+(checkin_results directory) scripts. Please see these scripts for usage information.
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+CRLF would be replaced by LF in 'binary-all-crlf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+LF would be replaced by CRLF in 'binary-all-lf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+CRLF would be replaced by LF in 'binary-all-crlf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+LF would be replaced by CRLF in 'binary-all-lf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+CRLF would be replaced by LF in 'binary-all-crlf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+CRLF would be replaced by LF in 'binary-all-crlf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+CRLF would be replaced by LF in 'binary-all-crlf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+LF would be replaced by CRLF in 'binary-all-lf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+CRLF would be replaced by LF in 'binary-all-crlf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+LF would be replaced by CRLF in 'binary-all-lf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+CRLF would be replaced by LF in 'binary-all-crlf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+CRLF would be replaced by LF in 'binary-all-crlf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+LF would be replaced by CRLF in 'binary-all-lf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+LF would be replaced by CRLF in 'binary-all-lf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+CRLF would be replaced by LF in 'binary-all-crlf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+LF would be replaced by CRLF in 'binary-all-lf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+CRLF would be replaced by LF in 'binary-all-crlf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+LF would be replaced by CRLF in 'binary-all-lf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+ref: refs/heads/master
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-one\r
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-lf
-lf
-lf
-lf
-lf
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.
-The rest is ASCII02.
-The rest is ASCII03.
-The rest is ASCII04.
-The rest is ASCII05.
-The rest is ASCII06.
-The rest is ASCII07.
-The rest is ASCII08.
-The rest is ASCII09.
-The rest is ASCII10.
-The rest is ASCII11.
-The rest is ASCII12.
-The rest is ASCII13.
-The rest is ASCII14.
-The rest is ASCII15.
-The rest is ASCII16.
-The rest is ASCII17.
-The rest is ASCII18.
-The rest is ASCII19.
-The rest is ASCII20.
-The rest is ASCII21.
-The rest is ASCII22.
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!
-♫♪♬♩
-Eat food
-🍅🍕
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-crlf\r
-lf\r
-lf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-crlf\r
-crlf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-lf\r
-lf\r
-lf\r
-lf\r
-lf\r
+++ /dev/null
-\ 1one\r
-two\r
-three\r
-four\r
+++ /dev/null
-\ 1one
-two
-three
-four
+++ /dev/null
-\ 1one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-\ 1one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-⚽The rest is ASCII01.\r
-The rest is ASCII02.\r
-The rest is ASCII03.\r
-The rest is ASCII04.\r
-The rest is ASCII05.\r
-The rest is ASCII06.\r
-The rest is ASCII07.\r
-The rest is ASCII08.\r
-The rest is ASCII09.\r
-The rest is ASCII10.\r
-The rest is ASCII11.\r
-The rest is ASCII12.\r
-The rest is ASCII13.\r
-The rest is ASCII14.\r
-The rest is ASCII15.\r
-The rest is ASCII16.\r
-The rest is ASCII17.\r
-The rest is ASCII18.\r
-The rest is ASCII19.\r
-The rest is ASCII20.\r
-The rest is ASCII21.\r
-The rest is ASCII22.\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-Lets sing!\r
-♫♪♬♩\r
-Eat food\r
-🍅🍕\r
+++ /dev/null
-one
-two\rthree
-four\r
\ No newline at end of file
+++ /dev/null
-one
-two\rthree\r
-four\r
\ No newline at end of file
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-crlf\r
-crlf\r
-lf
-crlf\r
-crlf\r
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
+++ /dev/null
-lf
-lf
-crlf\r
-lf
-lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+LF would be replaced by CRLF in 'binary-all-lf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+LF would be replaced by CRLF in 'binary-all-lf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+CRLF would be replaced by LF in 'binary-all-crlf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+LF would be replaced by CRLF in 'binary-all-lf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+CRLF would be replaced by LF in 'binary-all-crlf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+LF would be replaced by CRLF in 'binary-all-lf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+CRLF would be replaced by LF in 'binary-all-crlf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+LF would be replaced by CRLF in 'binary-all-lf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+CRLF would be replaced by LF in 'binary-all-crlf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+LF would be replaced by CRLF in 'binary-all-lf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+CRLF would be replaced by LF in 'binary-all-crlf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+CRLF would be replaced by LF in 'binary-all-crlf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+LF would be replaced by CRLF in 'binary-all-lf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+LF would be replaced by CRLF in 'binary-all-lf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+CRLF would be replaced by LF in 'binary-all-crlf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+LF would be replaced by CRLF in 'binary-all-lf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+CRLF would be replaced by LF in 'binary-all-crlf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'mixed-lf-cr-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+LF would be replaced by CRLF in 'binary-all-lf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'binary-mixed-lf-cr'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'mixed-lf-cr'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'all-crlf'
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'few-utf8-chars-crlf'
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+CRLF would be replaced by LF in 'many-utf8-chars-crlf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-crlf'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf-utf8bom'
--- /dev/null
+CRLF would be replaced by LF in 'more-lf'
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+LF would be replaced by CRLF in 'all-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'all-lf'
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+LF would be replaced by CRLF in 'few-utf8-chars-lf'
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+LF would be replaced by CRLF in 'many-utf8-chars-lf'
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-crlf'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf-utf8bom'
--- /dev/null
+LF would be replaced by CRLF in 'more-lf'
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+crlf
+crlf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+crlf
+crlf
+lf
+crlf
+crlf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+lf
+lf
+crlf
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+one\r
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+crlf\r
+lf\r
+lf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+lf
+lf
+lf
+lf
+lf
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+crlf\r
+crlf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+lf\r
+lf\r
+lf\r
+lf\r
+lf\r
--- /dev/null
+\ 1one\r
+two\r
+three\r
+four\r
--- /dev/null
+\ 1one
+two
+three
+four
--- /dev/null
+\ 1one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+\ 1one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+⚽The rest is ASCII01.\r
+The rest is ASCII02.\r
+The rest is ASCII03.\r
+The rest is ASCII04.\r
+The rest is ASCII05.\r
+The rest is ASCII06.\r
+The rest is ASCII07.\r
+The rest is ASCII08.\r
+The rest is ASCII09.\r
+The rest is ASCII10.\r
+The rest is ASCII11.\r
+The rest is ASCII12.\r
+The rest is ASCII13.\r
+The rest is ASCII14.\r
+The rest is ASCII15.\r
+The rest is ASCII16.\r
+The rest is ASCII17.\r
+The rest is ASCII18.\r
+The rest is ASCII19.\r
+The rest is ASCII20.\r
+The rest is ASCII21.\r
+The rest is ASCII22.\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+Lets sing!\r
+♫♪♬♩\r
+Eat food\r
+🍅🍕\r
--- /dev/null
+one
+two\rthree
+four\r
\ No newline at end of file
--- /dev/null
+one
+two\rthree\r
+four\r
\ No newline at end of file
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+crlf\r
+crlf\r
+lf
+crlf\r
+crlf\r
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+lf
+lf
+crlf\r
+lf
+lf
--- /dev/null
+x\ 1\95ÎA
+Â0\10@Q×9Åì\ 5\99f\926\ 1\11\8f z\82\99tBCm-i¼¿â\rüû\a?½\96¥4°\84\87VUÁS´\9a)E\1fóà\9c\84hET¤ë\83|\e\ 4}BÊd6®º6\10Á\81\11Õ\a±=&§\129Ø\1c8KêÆ\80<Æ\81¢dÃï6½*ܸÕ\92fx4-ëÄulpÞöë6鱗\ ó\14zç\88"\1cÑ"\9aôûkú¿4w]yQÈå©PVØß2\96j>ÄTIð
\ No newline at end of file
-5219b9784f9a92d7bd7cb567a6d6a21bfb86697e
+0db2a262bc8c5c3cba55254730045a8258da7a37
--- /dev/null
+file2
+file2
+file2
+file2!
+file2
--- /dev/null
+#!/usr/bin/env bash
+#
+# This script will generate the test corpus for CR/LF data using git;
+# we create files with all possible line ending varieties (all LF, all
+# CRLF, mixed, etc) on all the possible line ending configurations
+# (`core.autocrlf=true`, `text=auto` in gitattributes, etc). This
+# allows us to validate that our configuration will match byte-for-byte
+# the configuration that git produces.
+#
+# To update the test resource data, from the test resource directory:
+# git rm -r ./crlf_data/{posix,windows}
+# sh ./generate_crlf.sh ./crlf ./crlf_data /tmp/crlf_gitdirs
+# git add ./crlf_data/{posix,windows}
+
+set -e
+
+if [ "$1" == "" -o "$2" == "" ]; then
+ echo "usage: $0 crlfrepo directory [tempdir]"
+ exit 1
+fi
+
+input=$1
+output=$2
+tempdir=$3
+
+set -u
+
+create_to_workdir_data() {
+ local input=$1
+ local output=$2
+ local tempdir=$3
+ local systype=$4
+ local autocrlf=$5
+ local attr=$6
+
+ local worktree="${output}/${systype}_to_workdir/autocrlf_${autocrlf}"
+
+ if [ "$attr" != "" ]; then
+ local attrdir=`echo $attr | sed -e "s/ /,/g" | sed -e "s/=/_/g"`
+ worktree="${worktree},${attrdir}"
+ fi
+
+ if [ "$tempdir" = "" ]; then
+ local gitdir="${worktree}/.git"
+ else
+ local gitdir="${tempdir}/generate_crlf_${RANDOM}"
+ fi
+
+ echo "Creating ${worktree}"
+ mkdir -p "${worktree}"
+
+ git clone --no-checkout --quiet --bare "${input}/.gitted" "${gitdir}"
+ git --work-tree="${worktree}" --git-dir="${gitdir}" config core.autocrlf ${autocrlf}
+
+ if [ "$attr" != "" ]; then
+ echo "* ${attr}" >> "${worktree}/.gitattributes"
+ fi
+
+ git --work-tree="${worktree}" --git-dir="${gitdir}" checkout HEAD
+
+ if [ "$attr" != "" ]; then
+ rm "${worktree}/.gitattributes"
+ fi
+
+ if [ "$tempdir" != "" ]; then
+ rm -rf "${gitdir}"
+ fi
+}
+
+create_to_odb_data() {
+ local input=$1
+ local output=$2
+ local tempdir=$3
+ local systype=$4
+ local autocrlf=$5
+ local safecrlf=$6
+ local attr=$7
+
+ local destdir="${output}/${systype}_to_odb/autocrlf_${autocrlf},safecrlf_${safecrlf}"
+
+ if [ "$attr" != "" ]; then
+ local attrdir=`echo $attr | sed -e "s/ /,/g" | sed -e "s/=/_/g"`
+ destdir="${destdir},${attrdir}"
+ fi
+
+ if [ "$tempdir" = "" ]; then
+ local workdir="${destdir}/_workdir"
+ else
+ local workdir="${tempdir}/generate_crlf_${RANDOM}"
+ fi
+
+ echo "Creating ${destdir}"
+ mkdir -p "${destdir}"
+
+ git init "${workdir}" >/dev/null
+ git --work-tree="${workdir}" --git-dir="${workdir}/.git" config core.autocrlf "${autocrlf}"
+ git --work-tree="${workdir}" --git-dir="${workdir}/.git" config core.safecrlf "${safecrlf}"
+
+ if [ "$attr" != "" ]; then
+ echo "* ${attr}" > "${workdir}/.gitattributes"
+ fi
+
+ cp ${input}/* ${workdir}
+
+ for path in ${workdir}/*; do
+ filename=$(basename $path)
+ failed=""
+ output=$(git --work-tree="${workdir}" --git-dir="${workdir}/.git" add ${filename} 2>&1) || failed=1
+
+ if [ ! -z "${failed}" -a "${output:0:35}" == "fatal: LF would be replaced by CRLF" ]; then
+ echo "LF would be replaced by CRLF in '${filename}'" > "${destdir}/${filename}.fail"
+ elif [ ! -z "${failed}" -a "${output:0:35}" == "fatal: CRLF would be replaced by LF" ]; then
+ echo "CRLF would be replaced by LF in '${filename}'" > "${destdir}/${filename}.fail"
+ elif [ ! -z "${failed}" ]; then
+ echo "failed to add ${filename}: ${output}" 1>&2
+ exit 1
+ else
+ git --work-tree="${workdir}" --git-dir="${workdir}/.git" cat-file blob ":${filename}" > "${destdir}/${filename}"
+ fi
+ done
+
+ if [ "$tempdir" != "" ]; then
+ rm -rf "${workdir}"
+ fi
+}
+
+if [[ `uname -s` == MINGW* ]]; then
+ systype="windows"
+else
+ systype="posix"
+fi
+
+for autocrlf in true false input; do
+ for attr in "" text text=auto -text crlf -crlf eol=lf eol=crlf \
+ "text eol=lf" "text eol=crlf" \
+ "text=auto eol=lf" "text=auto eol=crlf"; do
+
+ create_to_workdir_data "${input}" "${output}" "${tempdir}" \
+ "${systype}" "${autocrlf}" "${attr}"
+
+ for safecrlf in true false warn; do
+ create_to_odb_data "${input}" "${output}" "${tempdir}" \
+ "${systype}" "${autocrlf}" "${safecrlf}" "${attr}"
+ done
+ done
+done
+
--- /dev/null
+ref: refs/heads/master
--- /dev/null
+[core]
+ repositoryformatversion = 0
+ filemode = true
+ bare = false
+ logallrefupdates = true
--- /dev/null
+Unnamed repository; edit this file 'description' to name the repository.
--- /dev/null
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
--- /dev/null
+x\ 1u\8e]
+Â0\10\84}Î)ö\ 2Êf7iZ(â\ 1Ä;l\93\8d\16û#5\82zz\v¾êãÌ|ÃL\9cDZ/@\8c\9b²¨BÍÁ:i\888³b ®ö\19\93c´1\11Ö6çÌ\123\99\9b,:\15h|B\8e®I\8dKZ\85ä\ 5½÷,¶ë\884Ô9Ä\94}\14#\8fr\99\17\98úxeh»Çù~\88óx\93éµ{>÷`=YÆ\8a*\86-:D³\86ë±¢\v\9cú«ÀQ^o\1d\ 6h§U\1dÊE\87¯qßà\8fºù3d>ØÜI\ f
\ No newline at end of file
--- /dev/null
+x\ 1m\8eA
+Â0\14D]ç\14ÿ\ 2\96ü$m\13("®Å;$??(¶\8dÄ\bêé-\8a®dV3Ìð\86ò4\9d*(Vµ0\83Ç.\ 6¤\10¬Å>ÆH \9d#TQ\93E¥\90\92eNdÄÅ\17\9e+\18\8d½\8bäô"t]j]P¶}hÙ\18vl{g\925$ü\1es\81]ñ\11ö0PÍ[ÊyºøùÑÜï\eÀV¡\96\9d´\1d¬¥\91RÐûYå\ 2\87ÓÙÃÞ?\9e<\8e0Ì\8bÛÖ#\8f\9fàÚ,Å?sñ!5_Ô\8f$^\90ïHÿ
\ No newline at end of file
--- /dev/null
+x\ 1m\8eMnÂ0\10\85»ö)æ\ 2 {lbGB(¬ØTeÑ\13\8c\9dq\89òcd\ zz\1ceÛåûùô^Hó<\14@sø(\99\19"÷½6ì<ÅØ{¤\10¹¥Æ5ÒG[t6PkÐ\aq§ÌK\ 1Å
+\15²m¬q(\83²Ñzg[K̶"\8e\ 3KvÚ ú-·\94á;Í\f\17Ê\9e~\18\8eË\10FìB\9aï´¼öÏç Ô\ 1\95\96\8d6
+vÒH)jX\ f\16Îð5\8c\ 4\9fôúãiZÑ\91ºrãi3\1eûZü\a\17×ÚÉpÞÖ\8fiUÝöeÝ\13o\8bµO\99
\ No newline at end of file
--- /dev/null
+x\ 1mÍA
+Â0\10\ 5P×9Å\À\92¶\934\85"ŵx\871\99ÐbÓH\8cÐzz\8b\82¸pù?ÿól\faÌP6í.'f°-+Ô\95cÃ\16UÍ-:£|¥½Æ\8b\91L\8dö\8e´CA\8f<Ä\ 4ÇD\ e:\9bcoc\f7\9a×bY\ ePªª¬¥\965Â^¢\94¾\9dÌ Îã\95àDë\93§ ºyK}\1exú\14÷b\eþ¹\8b_çË\88\17ÒA:\9c
\ No newline at end of file
--- /dev/null
+x\ 1m\8eMjÃ0\10\85»Ö)æ\ 2 ÒHcÉ\10B\96Y\94Ò+\8cì\116±eã(äçôQé®tù~>Þë\96y\1e\v m>Ê&\ 2\8dÁÖ&×ÙÞ\93Ö=¢gOÄ\9e\ 3R\10\fBÖ¹6¢Zy\93\À&c\1d¹\86%¤(-±mû\1eµpè\fFJQ'\178EÅ·2,\eÜò%/÷\f\87u\18§S·Ì+ççþñ8\82!4V7ÎxØi§µªa½Vd\83¯ñÂðÉÏ\97L\13\1crU§2Èôk\÷µø\ f®¾ë\ 2\9cÇ\1fäï\98z\ 3\9b`KN
\ No newline at end of file
--- /dev/null
+x\ 1\9d\90Á
+Â0\10D=÷+\ 6z\17*\82\97 \15=\88\17\85~A\9aF\13M²¡MAÿÞ´\16m¡'s\9aag²Ë+\r\95Xg\9bE\8aB[o$ödt\ 1F;\990\11(\17d=w¯åó¹Åü\eb¿\R\90\958´\95\ 4k¢Ì«('\1f8-\1e\19XÙÞ\9añ\82ä\1c\94¬±k\83¢\1a\8c:\97óÞ\rõ®¸ú§ø9\9dõýÉÊ\8bÒ\ 6Gm\f\98\8fr<\ 3Ò/\10\1e ]\ 5º\ ehîÔH¯¦é\11\9eS?\9e9´à.pì\ro\9b\b§3KÑ\99ÜQ\1d\94'ó\ 1Å"µ\11ùä\r¨\83\8aú
\ No newline at end of file
--- /dev/null
+x\ 1}NKjC1\fìÚ§Ð\ 5\12d?=[\86P\ 2Ý\96ÞA²e^èKR\1c\17\92\9e¾¡é²t5\1ff\98)çãñ0 \10>\8dn\ 61¤\86ZC£¦³eÊ\9a²
+ÍX\99b\8aM8Eõ\85Ý\87t;\rHVT3W\8e¨\13R\8b!èÄŲ(7äê©föÂN>Çrîð²H_í\ 2»ò û_Ü^¯Ïàçà'\8c3eØ !ºòónX\87·Ã»À«Ü¾l]awº«ýXl}\18\97í=øGÝý·æ¾\ 1W=MV
\ No newline at end of file
--- /dev/null
+x\ 1m\8eKnÃ0\fD»Ö)x\81\ 6\8a$R\16`\14î¾hÏ@ªtcÄ\9f@Q\80¤§¯\ 2o»\9c\997\98ÉÛ²L\15\9c\8f/µ¨B A\91d»\1c;Á\88\99s\1a\93\92\ 67\8eIØ\8f\91\12\a2\17.ºVàh1p\10\8f$^ó·f²Y\95HÑ\8a2£tä#¢á[=m\ 5Ö)\9f\1dôrû¹\ ey[.¼>\ e÷û\e\1cÑ\1d½%ç\1c¼Ú`ia;VµÀçtføàǯÎ3ôkSC=é¼\e×C\ 3ÿ©\9b¯Æ\14xßWûí©\86ýÃsÏü\ 1·|Lµ
\ No newline at end of file
--- /dev/null
+x\ 1+)JMU06c040031QHËÌIÕ+©(aðöU\10Ø¥\9a÷ÙòàÅV_\ 5\95¹ËÝû\19\ 1+\95\ e»
\ No newline at end of file
--- /dev/null
+x\ 1mNKjÃ0\10íZ§\98\v4Ìè\13I`\82\17]\96lz\82\9144&þ\ 4[\86¤§\8fJ¶Ù½/ïåe\9a\86
+ÚÐG]E\80½$\8bÚÛ\10|bIH\1c]\10.\ 1\vá1¹è½!\9dÕ\8dW\99+\18&\1d]I9jc3f\17Ï^\a4G
+Ù\13iF²Ö+ÞëeYa\1eò\95 KûïÖçeºñü8Üï' §É`ë\10|¢ETÍlǪ¬p\1e®\fßüø\93q\84nn¬¯\17\19_ÂvhÁ7uõ³L\ 2_{\11è¶\ 6ûÒàÿ\92z\ 2P\98G\8d
\ No newline at end of file
--- /dev/null
+x\ 1\9d\8e[jÃ0\10EóUÌ\ 6\1aô\1cË\10Bò_º\852Ò\8c°\89m\ 5E-$«¯¡;Èß¹\a.\9c\×uî`\1d\1ez\13\ 1\1cÓ8`dmí \91)Y\14KÅ3\a2®x«Ý(\ e\8bºS\93Ã`´\16t¦$Ï\81%Ñ\8e\9c#å<ÆâK
+Ù\84Á\15VôÓ§Úàk¾\11|Òó%Ë\ 2§m_\97>Éò/\1eÇ\×3\98`\9dÁ\88!Â\87öZ«Ýî\91]Þ¼«+3¤¥¦ïú+Í,ê\ f}ZL{
\ No newline at end of file
--- /dev/null
+x\ 1m\8eK\8a\ 21\10\86]ç\14u\ 1%\8fJÒ\r2¸\16ñ\ e\95¤2Ó/º#¨§7(\ 3³\98åÿâûã4\f\97\ 2Úà¦,Ì`\9cñ2x\95-QR)¡\v\1c-+Thu#©A\13Û\8c\98iá±\80\95ÉUÍ\ e\ 3ë\98³\8e\9c\127¹\r>·^jë#eLIÐtÓ\ 2Çiå¹\83}¸}¯\878\r3\8d\8fÝýþ\ 5Êje¤C×ÀV¢\94¢\86õYá\ 5Î\97\1f\82\13=\9eÜ÷°\1f«:\94\8eû\8f±îjñ\9f¹ø%]ßÄ¿,ñ\ 2ÐpKö
\ No newline at end of file
--- /dev/null
+f63578091d884c3066a003c50eb6c85ae7542269
--- /dev/null
+# Simple Comment line
+<cto@company.xx> <cto@coompany.xx>
+Some Dude <some@dude.xx> nick1 <bugs@company.xx>
+Other Author <other@author.xx> nick2 <bugs@company.xx>
+Other Author <other@author.xx> <nick2@company.xx>
+Phil Hill <phil@company.xx> # Comment at end of line
+<joseph@company.xx> Joseph <bugs@company.xx>
+Santa Claus <santa.claus@northpole.xx> <me@company.xx>
+Untracked <untracked@company.xx>
--- /dev/null
+Added by Brad <cto@coompany.xx>
+Added by Brad L. <cto@coompany.xx>
+Added by nick1 <bugs@company.xx>
+Added by nick2 <bugs@company.xx>
+Added by nick3 <bugs@company.xx>
+Added by Some Garbage <nick2@company.xx>
+Added by unknown <phil@company.xx>
+Added by Joseph <bugs@company.xx>
+Added by Clause <me@company.xx>
+Added by Charles <charles@charles.xx>
--- /dev/null
+File Override <phil@company.xx>
+Other Name <fileoverridename@company.xx>
-#!/bin/sh\r
-#creates push_src repo for libgit2 push tests.\r
-set -eu\r
-\r
-#Create src repo for push\r
-mkdir push_src\r
-pushd push_src\r
- git init\r
- \r
- echo a > a.txt\r
- git add .\r
- git commit -m 'added a.txt'\r
- \r
- mkdir fold\r
- echo b > fold/b.txt\r
- git add .\r
- git commit -m 'added fold and fold/b.txt'\r
- \r
- git branch b1 #b1 and b2 are the same\r
- git branch b2\r
- \r
- git checkout -b b3\r
- echo edit >> a.txt\r
- git add .\r
- git commit -m 'edited a.txt'\r
-\r
- git checkout -b b4 master\r
- echo edit >> fold\b.txt\r
- git add .\r
- git commit -m 'edited fold\b.txt'\r
- \r
- git checkout -b b5 master\r
- git submodule add ../testrepo.git submodule\r
- git commit -m "added submodule named 'submodule' pointing to '../testrepo.git'"\r
- \r
- git checkout master\r
- git merge -m "merge b3, b4, and b5 to master" b3 b4 b5\r
-\r
- #Log commits to include in testcase\r
- git log --format=oneline --decorate --graph\r
- #*-. 951bbbb90e2259a4c8950db78946784fb53fcbce (HEAD, master) merge b3, b4, and b5 to master\r
- #|\ \\r
- #| | * fa38b91f199934685819bea316186d8b008c52a2 (b5) added submodule named 'submodule' pointing to '../testrepo.git'\r
- #| * | 27b7ce66243eb1403862d05f958c002312df173d (b4) edited fold\b.txt\r
- #| |/\r
- #* | d9b63a88223d8367516f50bd131a5f7349b7f3e4 (b3) edited a.txt\r
- #|/\r
- #* a78705c3b2725f931d3ee05348d83cc26700f247 (b2, b1) added fold and fold/b.txt\r
- #* 5c0bb3d1b9449d1cc69d7519fd05166f01840915 added a.txt\r
-\r
- #fix paths so that we can add repo folders under libgit2 repo\r
- #rename .git to .gitted\r
- find . -name .git -exec mv -i '{}' '{}ted' \;\r
- mv -i .gitmodules gitmodules\r
-popd\r
+#!/bin/sh
+#creates push_src repo for libgit2 push tests.
+set -eu
+
+#Create src repo for push
+mkdir push_src
+pushd push_src
+ git init
+
+ echo a > a.txt
+ git add .
+ git commit -m 'added a.txt'
+
+ mkdir fold
+ echo b > fold/b.txt
+ git add .
+ git commit -m 'added fold and fold/b.txt'
+
+ git branch b1 #b1 and b2 are the same
+ git branch b2
+
+ git checkout -b b3
+ echo edit >> a.txt
+ git add .
+ git commit -m 'edited a.txt'
+
+ git checkout -b b4 master
+ echo edit >> fold\b.txt
+ git add .
+ git commit -m 'edited fold\b.txt'
+
+ git checkout -b b5 master
+ git submodule add ../testrepo.git submodule
+ git commit -m "added submodule named 'submodule' pointing to '../testrepo.git'"
+
+ git checkout master
+ git merge -m "merge b3, b4, and b5 to master" b3 b4 b5
+
+ #Log commits to include in testcase
+ git log --format=oneline --decorate --graph
+ #*-. 951bbbb90e2259a4c8950db78946784fb53fcbce (HEAD, master) merge b3, b4, and b5 to master
+ #|\ \
+ #| | * fa38b91f199934685819bea316186d8b008c52a2 (b5) added submodule named 'submodule' pointing to '../testrepo.git'
+ #| * | 27b7ce66243eb1403862d05f958c002312df173d (b4) edited fold\b.txt
+ #| |/
+ #* | d9b63a88223d8367516f50bd131a5f7349b7f3e4 (b3) edited a.txt
+ #|/
+ #* a78705c3b2725f931d3ee05348d83cc26700f247 (b2, b1) added fold and fold/b.txt
+ #* 5c0bb3d1b9449d1cc69d7519fd05166f01840915 added a.txt
+
+ #fix paths so that we can add repo folders under libgit2 repo
+ #rename .git to .gitted
+ find . -name .git -exec mv -i '{}' '{}ted' \;
+ mv -i .gitmodules gitmodules
+popd
--- /dev/null
+ref: refs/heads/master
--- /dev/null
+[core]
+ repositoryformatversion = 0
+ filemode = true
+ bare = false
+ logallrefupdates = true
+ ignorecase = true
+ precomposeunicode = true
+ splitIndex = true
--- /dev/null
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
static git_repository *repo;
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_revert_bare__initialize(void)
{
repo = cl_git_sandbox_init(TEST_REPO_PATH);
git_oid_fromstr(&revert_oid, "72333f47d4e83616630ff3b0ffe4c0faebcc3c45");
cl_git_pass(git_repository_head(&head_ref, repo));
- cl_git_pass(git_reference_peel((git_object **)&head_commit, head_ref, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel((git_object **)&head_commit, head_ref, GIT_OBJECT_COMMIT));
cl_git_pass(git_commit_lookup(&revert_commit, repo, &revert_oid));
cl_git_pass(git_revert_commit(&index, repo, revert_commit, head_commit, 0, NULL));
static git_repository *repo;
static git_index *repo_index;
-// Fixture setup and teardown
+/* Fixture setup and teardown */
void test_revert_workdir__initialize(void)
{
git_config *cfg;
git_oid_fromstr(&revert_oid, "72333f47d4e83616630ff3b0ffe4c0faebcc3c45");
cl_git_pass(git_repository_head(&head_ref, repo));
- cl_git_pass(git_reference_peel((git_object **)&head, head_ref, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel((git_object **)&head, head_ref, GIT_OBJECT_COMMIT));
cl_git_pass(git_reset(repo, (git_object *)head, GIT_RESET_HARD, NULL));
cl_git_pass(git_commit_lookup(&commit, repo, &revert_oid));
git_commit_free(commit);
git_commit_free(head);
git_reference_free(head_ref);
- git_buf_free(&mergemsg_buf);
- git_buf_free(&conflicting_buf);
+ git_buf_dispose(&mergemsg_buf);
+ git_buf_dispose(&conflicting_buf);
}
/* git reset --hard 39467716290f6df775a91cdb9a4eb39295018145
};
cl_git_pass(git_repository_head(&head_ref, repo));
- cl_git_pass(git_reference_peel((git_object **)&orig_head, head_ref, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel((git_object **)&orig_head, head_ref, GIT_OBJECT_COMMIT));
cl_git_pass(git_reset(repo, (git_object *)orig_head, GIT_RESET_HARD, NULL));
cl_git_pass(git_revert(repo, orig_head, NULL));
git_commit_free(revert_commit);
git_commit_free(head_commit);
git_config_free(config);
- git_buf_free(&diff_buf);
+ git_buf_dispose(&diff_buf);
}
/* git reset --hard 72333f47d4e83616630ff3b0ffe4c0faebcc3c45
/* HEAD is 2d440f2b3147d3dc7ad1085813478d6d869d5a4d */
cl_git_pass(git_repository_head(&head, repo));
- cl_git_pass(git_reference_peel((git_object **)&commit, head, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel((git_object **)&commit, head, GIT_OBJECT_COMMIT));
cl_git_pass(git_reset(repo, (git_object *)commit, GIT_RESET_HARD, NULL));
cl_git_pass(git_revert(repo, commit, NULL));
git_revert_options opts = GIT_REVERT_OPTIONS_INIT;
cl_git_pass(git_repository_head(&head, repo));
- cl_git_pass(git_reference_peel((git_object **)&commit, head, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel((git_object **)&commit, head, GIT_OBJECT_COMMIT));
opts.mainline = 1;
cl_must_fail(git_revert(repo, commit, &opts));
cl_assert_equal_i(i, 7);
}
+void test_revwalk_basic__sorted_after_reset(void)
+{
+ int i = 0;
+ git_oid oid;
+
+ revwalk_basic_setup_walk(NULL);
+
+ git_oid_fromstr(&oid, commit_head);
+
+ /* push, sort, and test the walk */
+ cl_git_pass(git_revwalk_push(_walk, &oid));
+ git_revwalk_sorting(_walk, GIT_SORT_TIME);
+
+ cl_git_pass(test_walk_only(_walk, commit_sorting_time, 2));
+
+ /* reset, push, and test again - we should see all entries */
+ git_revwalk_reset(_walk);
+ cl_git_pass(git_revwalk_push(_walk, &oid));
+
+ while (git_revwalk_next(&oid, _walk) == 0)
+ i++;
+
+ cl_assert_equal_i(i, commit_count);
+}
+
void test_revwalk_basic__push_head_hide_ref(void)
{
int i = 0;
}
/*
-* Difference between test_revwalk_basic__multiple_push_1 and
+* Difference between test_revwalk_basic__multiple_push_1 and
* test_revwalk_basic__multiple_push_2 is in the order reference
-* refs/heads/packed-test and commit 5b5b02 are pushed.
+* refs/heads/packed-test and commit 5b5b02 are pushed.
* revwalk should return same commits in both the tests.
* $ git rev-list 5b5b02 HEAD ^refs/heads/packed-test
revwalk_basic_setup_walk("testrepo.git");
cl_git_pass(git_repository_head(&head, _repo));
- cl_git_pass(git_reference_peel((git_object **) &tip, head, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel((git_object **) &tip, head, GIT_OBJECT_COMMIT));
/* Commit with a far-ahead timestamp, we should be able to parse it in the revwalk */
- cl_git_pass(git_signature_new(&sig, "Joe", "joe@example.com", 2399662595, 0));
+ cl_git_pass(git_signature_new(&sig, "Joe", "joe@example.com", 2399662595ll, 0));
cl_git_pass(git_commit_tree(&tree, tip));
cl_git_pass(git_commit_create(&id, _repo, "HEAD", sig, sig, NULL, "some message", tree, 1,
git_revwalk_free(walk);
}
-void test_revwalk_hidecb__add_hide_cb_multiple_times(void)
+void test_revwalk_hidecb__unset_cb_before_walk(void)
{
git_revwalk *walk;
+ git_oid id;
+ int i, error;
+
+ cl_git_pass(git_revwalk_new(&walk, _repo));
+ cl_git_pass(git_revwalk_add_hide_cb(walk, hide_every_commit_cb, NULL));
+ cl_git_pass(git_revwalk_add_hide_cb(walk, NULL, NULL));
+ cl_git_pass(git_revwalk_push(walk, &_head_id));
+
+ /* It should return all 6 commits */
+ i = 0;
+ while ((error = git_revwalk_next(&id, walk)) == 0)
+ i++;
+
+ cl_assert_equal_i(i, 6);
+ cl_assert_equal_i(error, GIT_ITEROVER);
+
+ git_revwalk_free(walk);
+}
+
+void test_revwalk_hidecb__change_cb_before_walk(void)
+{
+ git_revwalk *walk;
+ git_oid id;
cl_git_pass(git_revwalk_new(&walk, _repo));
+ cl_git_pass(git_revwalk_add_hide_cb(walk, hide_none_cb, NULL));
cl_git_pass(git_revwalk_add_hide_cb(walk, hide_every_commit_cb, NULL));
- cl_git_fail(git_revwalk_add_hide_cb(walk, hide_every_commit_cb, NULL));
+ cl_git_pass(git_revwalk_push(walk, &_head_id));
+
+ /* First call to git_revwalk_next should return GIT_ITEROVER */
+ cl_assert_equal_i(GIT_ITEROVER, git_revwalk_next(&id, walk));
git_revwalk_free(walk);
}
memset(oids, 0x0, count * sizeof(git_oid));
va_start(ap, count);
-
+
for (i = 0; i < count; ++i) {
partial_oid = va_arg(ap, char *);
cl_git_pass(git_oid_fromstrn(&oid, partial_oid, strlen(partial_oid)));
- cl_git_pass(git_object_lookup_prefix(&object, _repo, &oid, strlen(partial_oid), GIT_OBJ_COMMIT));
+ cl_git_pass(git_object_lookup_prefix(&object, _repo, &oid, strlen(partial_oid), GIT_OBJECT_COMMIT));
git_oid_cpy(&oids[i], git_object_id(object));
git_object_free(object);
}
partial_oid = va_arg(ap, char *);
cl_git_pass(git_oid_fromstrn(&oid, partial_oid, strlen(partial_oid)));
- cl_git_pass(git_object_lookup_prefix(&object, _repo, &oid, strlen(partial_oid), GIT_OBJ_COMMIT));
+ cl_git_pass(git_object_lookup_prefix(&object, _repo, &oid, strlen(partial_oid), GIT_OBJECT_COMMIT));
git_oid_cpy(&oids[i], git_object_id(object));
git_object_free(object);
}
cl_git_pass(git_index_add_bypath(repo_index, "who"));
cl_git_pass(git_index_add_bypath(repo_index, "why"));
cl_git_pass(git_index_add_bypath(repo_index, "where"));
- git_index_write(repo_index);
+ cl_git_pass(git_index_write(repo_index));
cl_git_rewritefile("stash/where", "....\n");
cl_git_pass(git_futils_readbuffer(&where, "stash/where"));
cl_assert_equal_s("....\n", where.ptr);
- git_buf_free(&where);
+ git_buf_dispose(&where);
}
void test_stash_apply__with_existing_file(void)
cl_git_pass(git_futils_readbuffer(&where, "stash/where"));
cl_assert_equal_s("....\n", where.ptr);
- git_buf_free(&where);
+ git_buf_dispose(&where);
}
void test_stash_apply__conflict_index_with_default(void)
cl_git_pass(git_stash_save(&oid, repo, signature, NULL, GIT_STASH_INCLUDE_UNTRACKED));
assert_status(repo, "untracked", GIT_ENOTFOUND);
- // stash@{1} is the oldest (first) stash we made
+ /* stash@{1} is the oldest (first) stash we made */
cl_git_pass(git_stash_apply(repo, 1, NULL));
cl_assert_equal_i(git_index_has_conflicts(repo_index), 0);
assert_status(repo, "what", GIT_STATUS_WT_MODIFIED);
cl_git_pass(git_stash_save(&oid, repo, signature, NULL, GIT_STASH_INCLUDE_UNTRACKED));
assert_status(repo, "untracked", GIT_ENOTFOUND);
- // stash@{0} is the newest stash we made immediately above
+ /* stash@{0} is the newest stash we made immediately above */
cl_git_pass(git_stash_apply(repo, 0, NULL));
cl_assert_equal_i(git_index_has_conflicts(repo_index), 0);
/*
* Friendly reminder, in order to ease the reading of the following tests:
*
- * "stash" points to the worktree commit
+ * "stash" points to the worktree commit
* "stash^1" points to the base commit (HEAD when the stash was created)
* "stash^2" points to the index commit
* "stash^3" points to the untracked commit
cl_fixture_cleanup("sorry-it-is-a-non-bare-only-party");
}
-static void assert_object_oid(const char* revision, const char* expected_oid, git_otype type)
+static void assert_object_oid(const char* revision, const char* expected_oid, git_object_t type)
{
int result;
git_object *obj;
static void assert_blob_oid(const char* revision, const char* expected_oid)
{
- assert_object_oid(revision, expected_oid, GIT_OBJ_BLOB);
+ assert_object_oid(revision, expected_oid, GIT_OBJECT_BLOB);
}
void test_stash_save__does_not_keep_index_by_default(void)
cl_assert(!git_path_exists("stash/just.ignore"));
}
+/*
+ * Note: this test was flaky prior to fixing #4101 -- run it several
+ * times to get a failure. The issues is that whether the fast
+ * (stat-only) codepath is used inside stash's diff operation depends
+ * on whether files are "racily clean", and there doesn't seem to be
+ * an easy way to force the exact required state.
+ */
+void test_stash_save__untracked_regression(void)
+{
+ git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
+ const char *paths[] = {"what", "where", "how", "why"};
+ git_reference *head;
+ git_commit *head_commit;
+ git_buf untracked_dir;
+
+ const char* workdir = git_repository_workdir(repo);
+
+ git_buf_init(&untracked_dir, 0);
+ git_buf_printf(&untracked_dir, "%sz", workdir);
+
+ cl_assert(!p_mkdir(untracked_dir.ptr, 0777));
+
+ cl_git_pass(git_repository_head(&head, repo));
+
+ cl_git_pass(git_reference_peel((git_object **)&head_commit, head, GIT_OBJECT_COMMIT));
+
+ opts.checkout_strategy = GIT_CHECKOUT_FORCE;
+
+ opts.paths.strings = (char **)paths;
+ opts.paths.count = 4;
+
+ cl_git_pass(git_checkout_tree(repo, (git_object*)head_commit, &opts));
+
+ cl_git_pass(git_stash_save(&stash_tip_oid, repo, signature, NULL, GIT_STASH_DEFAULT));
+
+ assert_commit_message_contains("refs/stash", "WIP on master");
+
+ git_reference_free(head);
+ git_commit_free(head_commit);
+ git_buf_dispose(&untracked_dir);
+}
+
#define MESSAGE "Look Ma! I'm on TV!"
void test_stash_save__can_accept_a_message(void)
{
void test_stash_save__stashing_updates_the_reflog(void)
{
- assert_object_oid("refs/stash@{0}", NULL, GIT_OBJ_COMMIT);
+ assert_object_oid("refs/stash@{0}", NULL, GIT_OBJECT_COMMIT);
cl_git_pass(git_stash_save(&stash_tip_oid, repo, signature, NULL, GIT_STASH_DEFAULT));
- assert_object_oid("refs/stash@{0}", git_oid_tostr_s(&stash_tip_oid), GIT_OBJ_COMMIT);
- assert_object_oid("refs/stash@{1}", NULL, GIT_OBJ_COMMIT);
+ assert_object_oid("refs/stash@{0}", git_oid_tostr_s(&stash_tip_oid), GIT_OBJECT_COMMIT);
+ assert_object_oid("refs/stash@{1}", NULL, GIT_OBJECT_COMMIT);
}
void test_stash_save__cannot_stash_when_there_are_no_local_change(void)
assert_blob_oid("stash@{1}^2:who", "cc628ccd10742baea8241c5924df992b5c019f71"); /* world */
assert_blob_oid("stash@{1}^2:when", NULL);
- assert_object_oid("stash@{1}^3", NULL, GIT_OBJ_COMMIT);
+ assert_object_oid("stash@{1}^3", NULL, GIT_OBJECT_COMMIT);
assert_blob_oid("stash@{0}^0:what", "ce013625030ba8dba906f756967f9e9ca394464a"); /* hello */
assert_blob_oid("stash@{0}^0:how", "ac790413e2d7a26c3767e78c57bb28716686eebc"); /* small */
cl_git_pass(git_stash_save(&stash_tip_oid, repo, signature, NULL, GIT_STASH_INCLUDE_UNTRACKED));
- assert_object_oid("stash^3^{tree}", EMPTY_TREE, GIT_OBJ_TREE);
+ assert_object_oid("stash^3^{tree}", EMPTY_TREE, GIT_OBJECT_TREE);
}
void test_stash_save__ignored_directory(void)
cl_git_mkfile("empty_standard_repo/A.txt", "Differs in case");
cl_git_pass(git_repository_index(&index, g_repo));
- ignore_case = (git_index_caps(index) & GIT_INDEXCAP_IGNORE_CASE) != 0;
+ ignore_case = (git_index_caps(index) & GIT_INDEX_CAPABILITY_IGNORE_CASE) != 0;
git_index_free(index);
cl_git_pass(git_status_file(&flags, g_repo, "A.txt"));
cl_assert(st.status == GIT_STATUS_WT_NEW);
cl_git_sandbox_cleanup();
- git_buf_free(&file);
+ git_buf_dispose(&file);
}
}
void test_status_ignore__deeper(void)
{
- int ignored;
+ const char *test_files[] = {
+ "empty_standard_repo/foo.data",
+ "empty_standard_repo/bar.data",
+ "empty_standard_repo/dont_ignore/foo.data",
+ "empty_standard_repo/dont_ignore/bar.data",
+ NULL
+ };
- g_repo = cl_git_sandbox_init("empty_standard_repo");
+ make_test_data("empty_standard_repo", test_files);
+ cl_git_mkfile("empty_standard_repo/.gitignore",
+ "*.data\n"
+ "!dont_ignore/*.data\n");
- cl_git_mkfile("empty_standard_repo/.gitignore",
- "*.data\n"
- "!dont_ignore/*.data\n");
+ assert_is_ignored("foo.data");
+ assert_is_ignored("bar.data");
- cl_git_pass(p_mkdir("empty_standard_repo/dont_ignore", 0777));
- cl_git_mkfile("empty_standard_repo/foo.data", "");
- cl_git_mkfile("empty_standard_repo/bar.data", "");
- cl_git_mkfile("empty_standard_repo/dont_ignore/foo.data", "");
- cl_git_mkfile("empty_standard_repo/dont_ignore/bar.data", "");
+ refute_is_ignored("dont_ignore/foo.data");
+ refute_is_ignored("dont_ignore/bar.data");
+}
- cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, "foo.data"));
- cl_assert_equal_i(1, ignored);
- cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, "bar.data"));
- cl_assert_equal_i(1, ignored);
+void test_status_ignore__unignored_dir_with_ignored_contents(void)
+{
+ static const char *test_files[] = {
+ "empty_standard_repo/dir/a.test",
+ "empty_standard_repo/dir/subdir/a.test",
+ NULL
+ };
- cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, "dont_ignore/foo.data"));
- cl_assert_equal_i(0, ignored);
- cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, "dont_ignore/bar.data"));
- cl_assert_equal_i(0, ignored);
+ make_test_data("empty_standard_repo", test_files);
+ cl_git_mkfile(
+ "empty_standard_repo/.gitignore",
+ "*.test\n"
+ "!dir/*\n");
+
+ refute_is_ignored("dir/a.test");
+ assert_is_ignored("dir/subdir/a.test");
+}
+
+void test_status_ignore__unignored_subdirs(void)
+{
+ static const char *test_files[] = {
+ "empty_standard_repo/dir/a.test",
+ "empty_standard_repo/dir/subdir/a.test",
+ NULL
+ };
+
+ make_test_data("empty_standard_repo", test_files);
+ cl_git_mkfile(
+ "empty_standard_repo/.gitignore",
+ "dir/*\n"
+ "!dir/*/\n");
+
+ assert_is_ignored("dir/a.test");
+ refute_is_ignored("dir/subdir/a.test");
}
if (extra)
cl_git_append2file(newpath.ptr, extra);
- git_buf_free(&oldpath);
- git_buf_free(&newpath);
+ git_buf_dispose(&oldpath);
+ git_buf_dispose(&newpath);
}
#define rename_file(R,O,N) _rename_helper((R), (O), (N), NULL)
cl_git_pass(git_status_list_new(&statuslist, g_repo, &opts));
- check_status(statuslist, (index_caps & GIT_INDEXCAP_IGNORE_CASE) ?
+ check_status(statuslist, (index_caps & GIT_INDEX_CAPABILITY_IGNORE_CASE) ?
expected_icase : expected_case, 1);
git_status_list_free(statuslist);
cl_git_pass(git_status_list_new(&statuslist, g_repo, &opts));
- check_status(statuslist, (index_caps & GIT_INDEXCAP_IGNORE_CASE) ?
+ check_status(statuslist, (index_caps & GIT_INDEX_CAPABILITY_IGNORE_CASE) ?
expected_icase : expected_case, 4);
git_status_list_free(statuslist);
cl_git_mkfile(file_name, file_contents);
cl_set_cleanup(&cleanup__remove_file, (void *)file_name);
- cl_git_pass(git_odb_hashfile(&actual_id, file_name, GIT_OBJ_BLOB));
+ cl_git_pass(git_odb_hashfile(&actual_id, file_name, GIT_OBJECT_BLOB));
cl_assert_equal_oid(&expected_id, &actual_id);
}
cl_git_mkfile(file_name, file_contents);
cl_set_cleanup(&cleanup__remove_file, (void *)file_name);
- cl_git_pass(git_odb_hashfile(&actual_id, file_name, GIT_OBJ_BLOB));
+ cl_git_pass(git_odb_hashfile(&actual_id, file_name, GIT_OBJECT_BLOB));
cl_assert_equal_oid(&expected_id, &actual_id);
}
#include "status_helpers.h"
-// A utf-8 string with 83 characters, but 249 bytes.
+/* A utf-8 string with 83 characters, but 249 bytes. */
static const char *longname = "\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97\xe5\x8f\x97";
/* first purge the contents of the worktree */
cl_git_pass(git_buf_sets(&workdir, git_repository_workdir(repo)));
cl_git_pass(git_path_direach(&workdir, 0, remove_file_cb, NULL));
- git_buf_free(&workdir);
+ git_buf_dispose(&workdir);
/* now get status */
memset(&counts, 0x0, sizeof(status_entry_counts));
bool ignore_case;
cl_git_pass(git_repository_index(&index, repo));
- ignore_case = (git_index_caps(index) & GIT_INDEXCAP_IGNORE_CASE) != 0;
+ ignore_case = (git_index_caps(index) & GIT_INDEX_CAPABILITY_IGNORE_CASE) != 0;
git_index_free(index);
/* first alter the contents of the worktree */
pathsArray.strings = paths;
opts.pathspec = pathsArray;
- // We committed zzz_new_dir/new_file above. It shouldn't be reported.
+ /* We committed zzz_new_dir/new_file above. It shouldn't be reported. */
cl_git_pass(
git_status_foreach_ext(repo, &opts, cb_status__normal, &counts)
);
cl_git_pass(git_status_foreach(repo, cb_status__check_592, "l.txt"));
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
void test_status_worktree__issue_592_2(void)
cl_git_pass(git_status_foreach(repo, cb_status__check_592, "c/a.txt"));
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
void test_status_worktree__issue_592_3(void)
cl_git_pass(git_status_foreach(repo, cb_status__check_592, "c/a.txt"));
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
void test_status_worktree__issue_592_4(void)
cl_git_pass(git_status_foreach(repo, cb_status__check_592, "t/b.txt"));
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
void test_status_worktree__issue_592_5(void)
cl_git_pass(git_status_foreach(repo, cb_status__check_592, NULL));
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
void test_status_worktree__issue_592_ignores_0(void)
cl_assert_equal_i(expected_camel_cased_file_status, status);
git_repository_free(repo2);
- git_buf_free(&lower_case_path);
- git_buf_free(&camel_case_path);
+ git_buf_dispose(&lower_case_path);
+ git_buf_dispose(&camel_case_path);
}
void test_status_worktree__file_status_honors_core_ignorecase_true(void)
cl_git_pass(git_repository_index(&index, repo));
native_ignore_case =
- (git_index_caps(index) & GIT_INDEXCAP_IGNORE_CASE) != 0;
+ (git_index_caps(index) & GIT_INDEX_CAPABILITY_IGNORE_CASE) != 0;
git_index_free(index);
memset(&counts, 0, sizeof(counts));
git_status_options opts = GIT_STATUS_OPTIONS_INIT;
status_entry_counts counts = {0};
- // Create directory with amazingly long filename
+ /* Create directory with amazingly long filename */
sprintf(path, "empty_standard_repo/%s", longname);
cl_git_pass(git_futils_mkdir_r(path, 0777));
sprintf(path, "empty_standard_repo/%s/foo", longname);
opts.flags = GIT_STATUS_OPT_DEFAULTS | GIT_STATUS_OPT_UPDATE_INDEX;
cl_git_pass(git_repository_head(&head, repo));
- cl_git_pass(git_reference_peel(&head_object, head, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel(&head_object, head, GIT_OBJECT_COMMIT));
cl_git_pass(git_reset(repo, head_object, GIT_RESET_HARD, NULL));
cl_git_pass(git_repository_index(&index, repo));
native_ignore_case =
- (git_index_caps(index) & GIT_INDEXCAP_IGNORE_CASE) != 0;
+ (git_index_caps(index) & GIT_INDEX_CAPABILITY_IGNORE_CASE) != 0;
git_index_free(index);
opts.pathspec.strings = &subdir_path;
--- /dev/null
+#undef GIT_DEPRECATE_HARD
+
+#include "clar_libgit2.h"
+#include "git2/sys/stream.h"
+#include "streams/tls.h"
+#include "streams/socket.h"
+#include "stream.h"
+
+static git_stream test_stream;
+static int ctor_called;
+
+void test_stream_deprecated__cleanup(void)
+{
+ cl_git_pass(git_stream_register(GIT_STREAM_TLS | GIT_STREAM_STANDARD, NULL));
+}
+
+static int test_stream_init(git_stream **out, const char *host, const char *port)
+{
+ GIT_UNUSED(host);
+ GIT_UNUSED(port);
+
+ ctor_called = 1;
+ *out = &test_stream;
+
+ return 0;
+}
+
+void test_stream_deprecated__register_tls(void)
+{
+ git_stream *stream;
+ int error;
+
+ ctor_called = 0;
+ cl_git_pass(git_stream_register_tls(test_stream_init));
+ cl_git_pass(git_tls_stream_new(&stream, "localhost", "443"));
+ cl_assert_equal_i(1, ctor_called);
+ cl_assert_equal_p(&test_stream, stream);
+
+ ctor_called = 0;
+ stream = NULL;
+ cl_git_pass(git_stream_register_tls(NULL));
+ error = git_tls_stream_new(&stream, "localhost", "443");
+
+ /*
+ * We don't have TLS support enabled, or we're on Windows,
+ * which has no arbitrary TLS stream support.
+ */
+#if defined(GIT_WIN32) || !defined(GIT_HTTPS)
+ cl_git_fail_with(-1, error);
+#else
+ cl_git_pass(error);
+#endif
+
+ cl_assert_equal_i(0, ctor_called);
+ cl_assert(&test_stream != stream);
+
+ git_stream_free(stream);
+}
--- /dev/null
+#include "clar_libgit2.h"
+#include "git2/sys/stream.h"
+#include "streams/tls.h"
+#include "streams/socket.h"
+#include "stream.h"
+
+static git_stream test_stream;
+static int ctor_called;
+
+void test_stream_registration__cleanup(void)
+{
+ cl_git_pass(git_stream_register(GIT_STREAM_TLS | GIT_STREAM_STANDARD, NULL));
+}
+
+static int test_stream_init(git_stream **out, const char *host, const char *port)
+{
+ GIT_UNUSED(host);
+ GIT_UNUSED(port);
+
+ ctor_called = 1;
+ *out = &test_stream;
+
+ return 0;
+}
+
+static int test_stream_wrap(git_stream **out, git_stream *in, const char *host)
+{
+ GIT_UNUSED(in);
+ GIT_UNUSED(host);
+
+ ctor_called = 1;
+ *out = &test_stream;
+
+ return 0;
+}
+
+void test_stream_registration__insecure(void)
+{
+ git_stream *stream;
+ git_stream_registration registration = {0};
+
+ registration.version = 1;
+ registration.init = test_stream_init;
+ registration.wrap = test_stream_wrap;
+
+ ctor_called = 0;
+ cl_git_pass(git_stream_register(GIT_STREAM_STANDARD, ®istration));
+ cl_git_pass(git_socket_stream_new(&stream, "localhost", "80"));
+ cl_assert_equal_i(1, ctor_called);
+ cl_assert_equal_p(&test_stream, stream);
+
+ ctor_called = 0;
+ stream = NULL;
+ cl_git_pass(git_stream_register(GIT_STREAM_STANDARD, NULL));
+ cl_git_pass(git_socket_stream_new(&stream, "localhost", "80"));
+
+ cl_assert_equal_i(0, ctor_called);
+ cl_assert(&test_stream != stream);
+
+ git_stream_free(stream);
+}
+
+void test_stream_registration__tls(void)
+{
+ git_stream *stream;
+ git_stream_registration registration = {0};
+ int error;
+
+ registration.version = 1;
+ registration.init = test_stream_init;
+ registration.wrap = test_stream_wrap;
+
+ ctor_called = 0;
+ cl_git_pass(git_stream_register(GIT_STREAM_TLS, ®istration));
+ cl_git_pass(git_tls_stream_new(&stream, "localhost", "443"));
+ cl_assert_equal_i(1, ctor_called);
+ cl_assert_equal_p(&test_stream, stream);
+
+ ctor_called = 0;
+ stream = NULL;
+ cl_git_pass(git_stream_register(GIT_STREAM_TLS, NULL));
+ error = git_tls_stream_new(&stream, "localhost", "443");
+
+ /* We don't have TLS support enabled, or we're on Windows,
+ * which has no arbitrary TLS stream support.
+ */
+#if defined(GIT_WIN32) || !defined(GIT_HTTPS)
+ cl_git_fail_with(-1, error);
+#else
+ cl_git_pass(error);
+#endif
+
+ cl_assert_equal_i(0, ctor_called);
+ cl_assert(&test_stream != stream);
+
+ git_stream_free(stream);
+}
+
+void test_stream_registration__both(void)
+{
+ git_stream *stream;
+ git_stream_registration registration = {0};
+
+ registration.version = 1;
+ registration.init = test_stream_init;
+ registration.wrap = test_stream_wrap;
+
+ cl_git_pass(git_stream_register(GIT_STREAM_STANDARD | GIT_STREAM_TLS, ®istration));
+
+ ctor_called = 0;
+ cl_git_pass(git_tls_stream_new(&stream, "localhost", "443"));
+ cl_assert_equal_i(1, ctor_called);
+ cl_assert_equal_p(&test_stream, stream);
+
+ ctor_called = 0;
+ cl_git_pass(git_socket_stream_new(&stream, "localhost", "80"));
+ cl_assert_equal_i(1, ctor_called);
+ cl_assert_equal_p(&test_stream, stream);
+}
cl_git_pass(git_index_add_bypath(index, tmp + strlen("renames/")));
}
- git_buf_free(&b);
+ git_buf_dispose(&b);
git_index_free(index);
test_with_many(100);
b.ptr[8] = '\n';
cl_git_mkfile(tmp, b.ptr);
}
- git_buf_free(&b);
+ git_buf_dispose(&b);
for (i = 0; i < 2500; i += 1) {
p_snprintf(tmp, sizeof(tmp), "renames/newfile%03d", i);
#include "repository.h"
static git_repository *g_repo = NULL;
+static const char *valid_blob_id = "fa49b077972391ad58037050f2a75f74e3671e92";
void test_submodule_add__cleanup(void)
{
cl_git_pass(git_buf_printf(&key, "submodule.%s.url", name));
assert_config_entry_value(g_repo, git_buf_cstr(&key), url);
- git_buf_free(&key);
+ git_buf_dispose(&key);
}
void test_submodule_add__url_absolute(void)
cl_assert_equal_s("gitdir: ../.git/modules/sm_libgit2/", dot_git_content.ptr);
git_repository_free(repo);
- git_buf_free(&dot_git_content);
+ git_buf_dispose(&dot_git_content);
/* add a submodule not using a gitlink */
assert_submodule_url("TestGitRepository", git_repository_workdir(g_repo));
}
+
+static void test_add_entry(
+ git_index *index,
+ const char *idstr,
+ const char *path,
+ git_filemode_t mode)
+{
+ git_index_entry entry = {{0}};
+
+ cl_git_pass(git_oid_fromstr(&entry.id, idstr));
+
+ entry.path = path;
+ entry.mode = mode;
+
+ cl_git_pass(git_index_add(index, &entry));
+}
+
+void test_submodule_add__path_exists_in_index(void)
+{
+ git_index *index;
+ git_submodule *sm;
+ git_buf filename = GIT_BUF_INIT;
+
+ g_repo = cl_git_sandbox_init("testrepo");
+
+ cl_git_pass(git_buf_joinpath(&filename, "subdirectory", "test.txt"));
+
+ cl_git_pass(git_repository_index__weakptr(&index, g_repo));
+
+ test_add_entry(index, valid_blob_id, filename.ptr, GIT_FILEMODE_BLOB);
+
+ cl_git_fail_with(git_submodule_add_setup(&sm, g_repo, "./", "subdirectory", 1), GIT_EEXISTS);
+
+ git_submodule_free(sm);
+ git_buf_dispose(&filename);
+}
+
+void test_submodule_add__file_exists_in_index(void)
+{
+ git_index *index;
+ git_submodule *sm;
+ git_buf name = GIT_BUF_INIT;
+
+ g_repo = cl_git_sandbox_init("testrepo");
+
+ cl_git_pass(git_repository_index__weakptr(&index, g_repo));
+
+ test_add_entry(index, valid_blob_id, "subdirectory", GIT_FILEMODE_BLOB);
+
+ cl_git_fail_with(git_submodule_add_setup(&sm, g_repo, "./", "subdirectory", 1), GIT_EEXISTS);
+
+ git_submodule_free(sm);
+ git_buf_dispose(&name);
+}
"[submodule \"" EVIL_SM_NAME "\"]\n"
" path = testrepo\n"
" url = ../testrepo.git\n");
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
/* Find it all the different ways we know about it */
foundit = 0;
"[submodule \"" EVIL_SM_NAME_WINDOWS "\"]\n"
" path = testrepo\n"
" url = ../testrepo.git\n");
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
/* Find it all the different ways we know about it */
foundit = 0;
cl_git_pass(git_config_get_string(&config_url, cfg, "submodule.testrepo.url"));
cl_assert_equal_s(absolute_url.ptr, config_url);
- git_buf_free(&absolute_url);
+ git_buf_dispose(&absolute_url);
git_config_free(cfg);
git_submodule_free(sm);
}
cl_git_pass(git_config_get_string(&config_url, cfg, "submodule.testrepo.url"));
cl_assert_equal_s(absolute_url.ptr, config_url);
- git_buf_free(&absolute_url);
+ git_buf_dispose(&absolute_url);
git_config_free(cfg);
git_submodule_free(sm);
}
/* Put the parent repository into a detached head state. */
cl_git_pass(git_repository_head(&head_ref, g_repo));
- cl_git_pass(git_reference_peel(&head_commit, head_ref, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel(&head_commit, head_ref, GIT_OBJECT_COMMIT));
cl_git_pass(git_repository_set_head_detached(g_repo, git_commit_id((git_commit *)head_commit)));
cl_git_pass(git_config_get_string(&config_url, cfg, "submodule.testrepo.url"));
cl_assert_equal_s(absolute_url.ptr, config_url);
- git_buf_free(&absolute_url);
+ git_buf_dispose(&absolute_url);
git_config_free(cfg);
git_object_free(head_commit);
git_reference_free(head_ref);
"[submodule \"naughty\"]\n"
" path = testrepo\n"
" url = -u./payload\n");
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
/* We do want to find it, but with the appropriate field empty */
foundit = 0;
"[submodule \"naughty\"]\n"
" path = --something\n"
" url = blah.git\n");
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
/* We do want to find it, but with the appropriate field empty */
foundit = 0;
cl_git_pass(git_submodule_resolve_url(&buf, g_repo, backslashed_path));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_submodule_free(sm);
git_repository_free(subrepo);
}
cl_git_pass(git_buf_joinpath(&p, git_repository_workdir(smrepo), "file"));
cl_git_mkfile(p.ptr, "new file");
- git_buf_free(&p);
+ git_buf_dispose(&p);
cl_git_pass(git_index_add_bypath(idx, "file"));
cl_git_pass(git_index_write(idx));
baseline_tests();
cl_git_rewritefile("submod2/.gitmodules", snap2.ptr);
- git_buf_free(&snap2);
+ git_buf_dispose(&snap2);
refute_submodule_exists(g_repo, "mismatch_name", GIT_ENOTFOUND);
refute_submodule_exists(g_repo, "mismatch_path", GIT_ENOTFOUND);
baseline_tests();
cl_git_rewritefile("submod2/.gitmodules", snap1.ptr);
- git_buf_free(&snap1);
+ git_buf_dispose(&snap1);
refute_submodule_exists(g_repo, "mismatch_name", GIT_ENOTFOUND);
refute_submodule_exists(g_repo, "mismatch_path", GIT_ENOTFOUND);
cl_git_pass(git_futils_readbuffer(&buf, "status/.gitmodules"));
cl_assert(strstr(buf.ptr, "[submodule \"submodules/libgit2\"]") != NULL);
cl_assert(strstr(buf.ptr, "path = submodules/libgit2") != NULL);
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
/* lookup */
cl_git_pass(git_path_prettify_dir(&actual, actual.ptr, NULL));
cl_assert_equal_s(expected.ptr, actual.ptr);
- git_buf_free(&expected);
- git_buf_free(&actual);
+ git_buf_dispose(&expected);
+ git_buf_dispose(&actual);
}
void test_submodule_open__opening_via_lookup_succeeds(void)
cl_git_pass(git_repository_open(&g_child, path.ptr));
assert_sm_valid(g_parent, g_child, "sm_unchanged");
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
void test_submodule_open__direct_open_succeeds_for_broken_sm_with_gitdir(void)
cl_git_pass(git_repository_open(&g_child, path.ptr));
assert_sm_valid(g_parent, g_child, "sm_unchanged");
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
git_submodule_free(sm);
git_repository_free(repo);
- git_buf_free(&dot_git_content);
+ git_buf_dispose(&dot_git_content);
}
git_buf path = GIT_BUF_INIT;
cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(g_repo), name));
cl_git_pass(git_futils_rmdir_r(path.ptr, NULL, GIT_RMDIR_REMOVE_FILES));
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
static void add_submodule_to_index(const char *name)
cl_must_pass(p_unlink(in_f.ptr));
- git_buf_free(&in_f);
- git_buf_free(&out_f);
- git_buf_free(&path);
+ git_buf_dispose(&in_f);
+ git_buf_dispose(&out_f);
+ git_buf_dispose(&path);
}
static void cleanup_fixture_submodules(void *payload)
checkout_options.checkout_strategy = GIT_CHECKOUT_SAFE;
cl_git_pass(git_reference_lookup(&branch_reference, g_repo, "refs/heads/alternate_1"));
- cl_git_pass(git_reference_peel(&branch_commit, branch_reference, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel(&branch_commit, branch_reference, GIT_OBJECT_COMMIT));
cl_git_pass(git_checkout_tree(g_repo, branch_commit, &checkout_options));
cl_git_pass(git_repository_set_head(g_repo, git_reference_name(branch_reference)));
/* verify that the expected callbacks have been called. */
cl_assert_equal_i(1, update_payload.checkout_progress_called);
-
+
git_submodule_free(sm);
git_object_free(branch_commit);
git_reference_free(branch_reference);
checkout_options.checkout_strategy = GIT_CHECKOUT_SAFE;
cl_git_pass(git_reference_lookup(&branch_reference, g_repo, "refs/heads/alternate_1"));
- cl_git_pass(git_reference_peel(&branch_commit, branch_reference, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel(&branch_commit, branch_reference, GIT_OBJECT_COMMIT));
cl_git_pass(git_checkout_tree(g_repo, branch_commit, &checkout_options));
cl_git_pass(git_repository_set_head(g_repo, git_reference_name(branch_reference)));
checkout_options.checkout_strategy = GIT_CHECKOUT_SAFE;
cl_git_pass(git_reference_lookup(&branch_reference, g_repo, "refs/heads/alternate_1"));
- cl_git_pass(git_reference_peel(&branch_commit, branch_reference, GIT_OBJ_COMMIT));
+ cl_git_pass(git_reference_peel(&branch_commit, branch_reference, GIT_OBJECT_COMMIT));
cl_git_pass(git_checkout_tree(g_repo, branch_commit, &checkout_options));
cl_git_pass(git_repository_set_head(g_repo, git_reference_name(branch_reference)));
void test_threads_basic__cache(void)
{
- // run several threads polling the cache at the same time
+ /* run several threads polling the cache at the same time */
cl_assert(1 == 1);
}
static void *set_error(void *dummy)
{
- giterr_set(GITERR_INVALID, "oh no, something happened!\n");
+ git_error_set(GIT_ERROR_INVALID, "oh no, something happened!\n");
return dummy;
}
static void *run_index_diffs(void *arg)
{
int thread = *(int *)arg;
+ git_repository *repo;
git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
git_diff *diff = NULL;
size_t i;
int exp[4] = { 0, 0, 0, 0 };
+ cl_git_pass(git_repository_open(&repo, git_repository_path(_repo)));
+
switch (thread & 0x03) {
case 0: /* diff index to workdir */;
- cl_git_pass(git_diff_index_to_workdir(&diff, _repo, NULL, &opts));
+ cl_git_pass(git_diff_index_to_workdir(&diff, repo, NULL, &opts));
break;
case 1: /* diff tree 'a' to index */;
- cl_git_pass(git_diff_tree_to_index(&diff, _repo, _a, NULL, &opts));
+ cl_git_pass(git_diff_tree_to_index(&diff, repo, _a, NULL, &opts));
break;
case 2: /* diff tree 'b' to index */;
- cl_git_pass(git_diff_tree_to_index(&diff, _repo, _b, NULL, &opts));
+ cl_git_pass(git_diff_tree_to_index(&diff, repo, _b, NULL, &opts));
break;
case 3: /* diff index to workdir (explicit index) */;
{
git_index *idx;
- cl_git_pass(git_repository_index(&idx, _repo));
- cl_git_pass(git_diff_index_to_workdir(&diff, _repo, idx, &opts));
+ cl_git_pass(git_repository_index(&idx, repo));
+ cl_git_pass(git_diff_index_to_workdir(&diff, repo, idx, &opts));
git_index_free(idx);
break;
}
}
git_diff_free(diff);
- giterr_clear();
+ git_repository_free(repo);
+ git_error_clear();
return arg;
}
git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
git_diff *diff = NULL;
git_index *idx = NULL;
+ git_repository *repo;
- cl_git_pass(git_repository_index(&idx, _repo));
+ cl_git_pass(git_repository_open(&repo, git_repository_path(_repo)));
+ cl_git_pass(git_repository_index(&idx, repo));
/* have first thread altering the index as we go */
if (thread == 0) {
switch (thread & 0x03) {
case 0: /* diff index to workdir */;
- cl_git_pass(git_diff_index_to_workdir(&diff, _repo, idx, &opts));
+ cl_git_pass(git_diff_index_to_workdir(&diff, repo, idx, &opts));
break;
case 1: /* diff tree 'a' to index */;
- cl_git_pass(git_diff_tree_to_index(&diff, _repo, _a, idx, &opts));
+ cl_git_pass(git_diff_tree_to_index(&diff, repo, _a, idx, &opts));
break;
case 2: /* diff tree 'b' to index */;
- cl_git_pass(git_diff_tree_to_index(&diff, _repo, _b, idx, &opts));
+ cl_git_pass(git_diff_tree_to_index(&diff, repo, _b, idx, &opts));
break;
case 3: /* diff index to workdir reversed */;
opts.flags |= GIT_DIFF_REVERSE;
- cl_git_pass(git_diff_index_to_workdir(&diff, _repo, idx, &opts));
+ cl_git_pass(git_diff_index_to_workdir(&diff, repo, idx, &opts));
break;
}
done:
git_index_free(idx);
- giterr_clear();
+ git_repository_free(repo);
+ git_error_clear();
return arg;
}
static void *run_workdir_iterator(void *arg)
{
int error = 0;
+ git_repository *repo;
git_iterator *iter;
git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT;
const git_index_entry *entry = NULL;
iter_opts.flags = GIT_ITERATOR_DONT_AUTOEXPAND;
+ cl_git_pass(git_repository_open(&repo, git_repository_path(_repo)));
cl_git_pass(git_iterator_for_workdir(
- &iter, _repo, NULL, NULL, &iter_opts));
+ &iter, repo, NULL, NULL, &iter_opts));
while (!error) {
if (entry && entry->mode == GIT_FILEMODE_TREE) {
cl_assert_equal_i(GIT_ITEROVER, error);
git_iterator_free(iter);
- giterr_clear();
+ git_repository_free(repo);
+ git_error_clear();
return arg;
}
git_reference_iterator_free(i);
git_repository_free(repo);
- giterr_clear();
+ git_error_clear();
return arg;
}
git_repository_free(repo);
- giterr_clear();
+ git_error_clear();
return arg;
}
}
git_repository_free(repo);
- giterr_clear();
+ git_error_clear();
return arg;
}
#include "clar_libgit2.h"
#include "win32/w32_stack.h"
+#include "win32/w32_crtdbg_stacktrace.h"
#if defined(GIT_MSVC_CRTDBG)
static void a(void)
{
- libgit2-giterr-set-buffer
+ libgit2-git-error-set-buffer
Memcheck:Leak
...
fun:git__realloc
fun:git_buf_try_grow
fun:git_buf_grow
fun:git_buf_vprintf
- fun:giterr_set
+ fun:git_error_set
}
{
mac-setenv-leak-1
void test_win32_longpath__cleanup(void)
{
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
#ifdef GIT_WIN32
size_t expected_len, actual_len;
char *expected_msg;
- err = giterr_last();
+ err = git_error_last();
actual_len = strlen(err->message);
expected_msg = git_win32_get_error_message(ERROR_FILENAME_EXCED_RANGE);
--- /dev/null
+#include "clar_libgit2.h"
+#include "worktree_helpers.h"
+#include "submodule/submodule_helpers.h"
+
+#define COMMON_REPO "testrepo.git"
+#define WORKTREE_REPO "worktree"
+
+static git_repository *g_repo;
+
+void test_worktree_bare__initialize(void)
+{
+ g_repo = cl_git_sandbox_init(COMMON_REPO);
+
+ cl_assert_equal_i(1, git_repository_is_bare(g_repo));
+ cl_assert_equal_i(0, git_repository_is_worktree(g_repo));
+}
+
+void test_worktree_bare__cleanup(void)
+{
+ cl_fixture_cleanup(WORKTREE_REPO);
+ cl_git_sandbox_cleanup();
+}
+
+void test_worktree_bare__list(void)
+{
+ git_strarray wts;
+
+ cl_git_pass(git_worktree_list(&wts, g_repo));
+ cl_assert_equal_i(wts.count, 0);
+
+ git_strarray_free(&wts);
+}
+
+void test_worktree_bare__add(void)
+{
+ git_worktree *wt;
+ git_repository *wtrepo;
+ git_strarray wts;
+
+ cl_git_pass(git_worktree_add(&wt, g_repo, "name", WORKTREE_REPO, NULL));
+
+ cl_git_pass(git_worktree_list(&wts, g_repo));
+ cl_assert_equal_i(wts.count, 1);
+
+ cl_git_pass(git_worktree_validate(wt));
+
+ cl_git_pass(git_repository_open(&wtrepo, WORKTREE_REPO));
+ cl_assert_equal_i(0, git_repository_is_bare(wtrepo));
+ cl_assert_equal_i(1, git_repository_is_worktree(wtrepo));
+
+ git_strarray_free(&wts);
+ git_worktree_free(wt);
+ git_repository_free(wtrepo);
+}
+
+void test_worktree_bare__repository_path(void)
+{
+ git_worktree *wt;
+ git_repository *wtrepo;
+
+ cl_git_pass(git_worktree_add(&wt, g_repo, "name", WORKTREE_REPO, NULL));
+ cl_assert_equal_s(git_worktree_path(wt), cl_git_sandbox_path(0, WORKTREE_REPO, NULL));
+
+ cl_git_pass(git_repository_open(&wtrepo, WORKTREE_REPO));
+ cl_assert_equal_s(git_repository_path(wtrepo), cl_git_sandbox_path(1, COMMON_REPO, "worktrees", "name", NULL));
+
+ cl_assert_equal_s(git_repository_commondir(g_repo), git_repository_commondir(wtrepo));
+ cl_assert_equal_s(git_repository_workdir(wtrepo), cl_git_sandbox_path(1, WORKTREE_REPO, NULL));
+
+ git_repository_free(wtrepo);
+ git_worktree_free(wt);
+}
cl_git_pass(git_config_set_int32(cfg, "core.dummy", 5));
git_config_free(cfg);
- // reopen to verify configuration has been set in the
- // common dir
+ /*
+ * reopen to verify configuration has been set in the
+ * common dir
+ */
cl_git_pass(git_repository_config(&cfg, fixture.repo));
cl_git_pass(git_config_get_int32(&val, cfg, "core.dummy"));
cl_assert_equal_i(val, 5);
cl_assert(git_path_exists(path.ptr));
}
- git_buf_free(&path);
+ git_buf_dispose(&path);
git_reference_free(ours_ref);
git_reference_free(theirs_ref);
git_annotated_commit_free(ours);
cl_git_pass(git_futils_readbuffer(&buf, path.ptr));
cl_assert_equal_s(buf.ptr, CONFLICT_BRANCH_FILE_TXT);
- git_buf_free(&path);
- git_buf_free(&buf);
+ git_buf_dispose(&path);
+ git_buf_dispose(&buf);
}
static void assert_worktree_valid(git_repository *wt, const char *parentdir, const char *wtdir)
{
- git_buf path = GIT_BUF_INIT;
-
cl_assert(wt->is_worktree);
- cl_git_pass(git_buf_joinpath(&path, clar_sandbox_path(), wtdir));
- cl_git_pass(git_path_prettify(&path, path.ptr, NULL));
- cl_git_pass(git_path_to_dir(&path));
- cl_assert_equal_s(wt->workdir, path.ptr);
-
- cl_git_pass(git_buf_joinpath(&path, path.ptr, ".git"));
- cl_git_pass(git_path_prettify(&path, path.ptr, NULL));
- cl_assert_equal_s(wt->gitlink, path.ptr);
-
- cl_git_pass(git_buf_joinpath(&path, clar_sandbox_path(), parentdir));
- cl_git_pass(git_buf_joinpath(&path, path.ptr, ".git"));
- cl_git_pass(git_buf_joinpath(&path, path.ptr, "worktrees"));
- cl_git_pass(git_buf_joinpath(&path, path.ptr, wtdir));
- cl_git_pass(git_path_prettify(&path, path.ptr, NULL));
- cl_git_pass(git_path_to_dir(&path));
- cl_assert_equal_s(wt->gitdir, path.ptr);
-
- git_buf_free(&path);
+ cl_assert_equal_s(wt->workdir, cl_git_sandbox_path(1, wtdir, NULL));
+ cl_assert_equal_s(wt->gitlink, cl_git_sandbox_path(0, wtdir, ".git", NULL));
+ cl_assert_equal_s(wt->gitdir, cl_git_sandbox_path(1, parentdir, ".git", "worktrees", wtdir, NULL));
}
void test_worktree_open__initialize(void)
cl_git_pass(git_repository_open(&wt, gitdir_path.ptr));
assert_worktree_valid(wt, COMMON_REPO, WORKTREE_REPO);
- git_buf_free(&gitdir_path);
+ git_buf_dispose(&gitdir_path);
git_repository_free(wt);
}
cl_assert_equal_s(git_repository_workdir(fixture.worktree),
git_repository_workdir(repo));
- git_buf_free(&path);
+ git_buf_dispose(&path);
git_repository_free(repo);
}
git_reference_free(branch);
}
+void test_worktree_refs__delete_unrelated_branch_on_worktree(void)
+{
+ git_reference *branch;
+
+ cl_git_pass(git_branch_lookup(&branch, fixture.worktree,
+ "merge-conflict", GIT_BRANCH_LOCAL));
+ cl_git_pass(git_branch_delete(branch));
+
+ git_reference_free(branch);
+}
+
+void test_worktree_refs__delete_unrelated_branch_on_parent(void)
+{
+ git_reference *branch;
+
+ cl_git_pass(git_branch_lookup(&branch, fixture.repo,
+ "merge-conflict", GIT_BRANCH_LOCAL));
+ cl_git_pass(git_branch_delete(branch));
+
+ git_reference_free(branch);
+}
+
void test_worktree_refs__renaming_reference_updates_worktree_heads(void)
{
git_reference *head, *branch, *renamed;
git_reference_free(branch);
git_reference_free(head);
git_commit_free(commit);
- git_buf_free(&refpath);
+ git_buf_dispose(&refpath);
}
cl_assert_equal_s(git_repository_workdir(child.worktree),
git_repository_workdir(repo));
- git_buf_free(&path);
+ git_buf_dispose(&path);
git_repository_free(repo);
}
git_worktree_free(wt);
git_repository_free(repo);
- git_buf_free(&wt_path);
- git_buf_free(&sm_relative_path);
- git_buf_free(&wt_relative_path);
+ git_buf_dispose(&wt_path);
+ git_buf_dispose(&sm_relative_path);
+ git_buf_dispose(&wt_relative_path);
}
}
}
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
void test_worktree_worktree__list_in_worktree_repo(void)
git_strarray_free(&wts);
}
-void test_worktree_worktree__list_bare(void)
-{
- git_repository *repo;
- git_strarray wts;
-
- repo = cl_git_sandbox_init("testrepo.git");
- cl_git_pass(git_worktree_list(&wts, repo));
- cl_assert_equal_i(wts.count, 0);
-
- git_repository_free(repo);
-}
-
void test_worktree_worktree__list_without_worktrees(void)
{
git_repository *repo;
cl_assert_equal_s(wt->commondir_path, fixture.repo->gitdir);
cl_assert_equal_s(wt->commondir_path, fixture.repo->commondir);
- git_buf_free(&gitdir_path);
+ git_buf_dispose(&gitdir_path);
git_worktree_free(wt);
}
cl_git_pass(git_worktree_lookup(&wt, fixture.repo, "testrepo-worktree"));
cl_git_fail(git_repository_open_from_worktree(&repo, wt));
- git_buf_free(&buf);
- git_buf_free(&path);
+ git_buf_dispose(&buf);
+ git_buf_dispose(&path);
git_worktree_free(wt);
}
cl_git_pass(git_worktree_lookup(&wt, fixture.repo, "testrepo-worktree"));
cl_git_fail(git_repository_open_from_worktree(&repo, wt));
- git_buf_free(&buf);
- git_buf_free(&path);
+ git_buf_dispose(&buf);
+ git_buf_dispose(&path);
git_worktree_free(wt);
}
cl_git_pass(git_worktree_lookup(&wt, fixture.repo, "testrepo-worktree"));
cl_git_fail(git_repository_open_from_worktree(&repo, wt));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_worktree_free(wt);
}
cl_assert(git__suffixcmp(git_repository_workdir(repo), "worktree-new/") == 0);
cl_git_pass(git_branch_lookup(&branch, repo, "worktree-new", GIT_BRANCH_LOCAL));
- git_buf_free(&path);
+ git_buf_dispose(&path);
git_worktree_free(wt);
git_reference_free(branch);
git_repository_free(repo);
}
-void test_worktree_worktree__add_from_bare(void)
-{
- git_worktree *wt;
- git_repository *repo, *wtrepo;
-
- repo = cl_git_sandbox_init("short_tag.git");
-
- cl_assert_equal_i(1, git_repository_is_bare(repo));
- cl_assert_equal_i(0, git_repository_is_worktree(repo));
-
- cl_git_pass(git_worktree_add(&wt, repo, "worktree-frombare", "worktree-frombare", NULL));
- cl_git_pass(git_repository_open(&wtrepo, "worktree-frombare"));
- cl_assert_equal_i(0, git_repository_is_bare(wtrepo));
- cl_assert_equal_i(1, git_repository_is_worktree(wtrepo));
-
- git_worktree_free(wt);
- git_repository_free(repo);
- git_repository_free(wtrepo);
-}
-
void test_worktree_worktree__add_locked(void)
{
git_worktree *wt;
cl_assert(git__suffixcmp(git_repository_workdir(repo), "worktree-locked/") == 0);
cl_git_pass(git_branch_lookup(&branch, repo, "worktree-locked", GIT_BRANCH_LOCAL));
- git_buf_free(&path);
+ git_buf_dispose(&path);
git_worktree_free(wt);
git_reference_free(branch);
git_repository_free(repo);
cl_git_pass(git_buf_joinpath(&path, fixture.repo->workdir, "../worktree-new"));
cl_git_fail(git_worktree_add(&wt, fixture.repo, "worktree-new", path.ptr, NULL));
- git_buf_free(&path);
+ git_buf_dispose(&path);
git_commit_free(commit);
git_reference_free(head);
git_reference_free(branch);
}
+void test_worktree_worktree__add_with_explicit_branch(void)
+{
+ git_reference *head, *branch, *wthead;
+ git_commit *commit;
+ git_worktree *wt;
+ git_repository *wtrepo;
+ git_buf path = GIT_BUF_INIT;
+ git_worktree_add_options opts = GIT_WORKTREE_ADD_OPTIONS_INIT;
+
+ cl_git_pass(git_repository_head(&head, fixture.repo));
+ cl_git_pass(git_commit_lookup(&commit, fixture.repo, &head->target.oid));
+ cl_git_pass(git_branch_create(&branch, fixture.repo, "worktree-with-ref", commit, false));
+
+ opts.ref = branch;
+
+ cl_git_pass(git_buf_joinpath(&path, fixture.repo->workdir, "../worktree-with-different-name"));
+ cl_git_pass(git_worktree_add(&wt, fixture.repo, "worktree-with-different-name", path.ptr, &opts));
+ cl_git_pass(git_repository_open_from_worktree(&wtrepo, wt));
+ cl_git_pass(git_repository_head(&wthead, wtrepo));
+ cl_assert_equal_s(git_reference_name(wthead), "refs/heads/worktree-with-ref");
+
+ git_buf_dispose(&path);
+ git_commit_free(commit);
+ git_reference_free(head);
+ git_reference_free(branch);
+ git_reference_free(wthead);
+ git_repository_free(wtrepo);
+ git_worktree_free(wt);
+}
+
+
void test_worktree_worktree__init_existing_worktree(void)
{
git_worktree *wt;
cl_git_pass(git_worktree_lookup(&wt, fixture.repo, "testrepo-worktree"));
cl_assert_equal_s(wt->gitlink_path, fixture.worktree->gitlink);
- git_buf_free(&path);
+ git_buf_dispose(&path);
git_worktree_free(wt);
}
cl_assert(!git_path_exists(path.ptr));
}
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
void test_worktree_worktree__init_submodule(void)
cl_git_pass(git_buf_joinpath(&path, sm->gitdir, "worktrees/repo-worktree/"));
cl_assert_equal_s(path.ptr, wt->gitdir);
- git_buf_free(&path);
+ git_buf_dispose(&path);
git_worktree_free(worktree);
git_repository_free(sm);
git_repository_free(wt);
git_worktree_free(wt);
}
+void test_worktree_worktree__name(void)
+{
+ git_worktree *wt;
+
+ cl_git_pass(git_worktree_lookup(&wt, fixture.repo, "testrepo-worktree"));
+ cl_assert_equal_s(git_worktree_name(wt), "testrepo-worktree");
+
+ git_worktree_free(wt);
+}
+
+void test_worktree_worktree__path(void)
+{
+ git_worktree *wt;
+ git_buf expected_path = GIT_BUF_INIT;
+
+ cl_git_pass(git_buf_joinpath(&expected_path, clar_sandbox_path(), "testrepo-worktree"));
+ cl_git_pass(git_worktree_lookup(&wt, fixture.repo, "testrepo-worktree"));
+ cl_assert_equal_s(git_worktree_path(wt), expected_path.ptr);
+
+ git_buf_dispose(&expected_path);
+ git_worktree_free(wt);
+}
+
void test_worktree_worktree__validate_invalid_commondir(void)
{
git_worktree *wt;
cl_assert_equal_s(reason.ptr, "because");
cl_assert(wt->locked);
- git_buf_free(&reason);
+ git_buf_dispose(&reason);
git_worktree_free(wt);
}
cl_assert_equal_i(reason.size, 0);
cl_assert(wt->locked);
- git_buf_free(&reason);
+ git_buf_dispose(&reason);
git_worktree_free(wt);
}
projects / libgit2.git / commitdiff