about summary refs log tree commit diff
path: root/git (follow)
Commit message (Collapse)AuthorAge
* git: update to v2.24.1Christian Hesse2019-12-10
| | | | | | | | Update to git version v2.24.1. No changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
* git: update to v2.24.0Christian Hesse2019-11-08
| | | | | | | | | | | Update to git version v2.24.0. Never use get_cached_commit_buffer() directly, use repo_get_commit_buffer() instead. The latter calls the former anyway. This fixes segmentation fault when commit-graph is enabled and get_cached_commit_buffer() does not return the expected result. Signed-off-by: Christian Hesse <mail@eworm.de>
* git: update to v2.23.0Christian Hesse2019-10-25
| | | | | | | | Update to git version v2.23.0. No changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
* git: update to v2.22.0Christian Hesse2019-10-25
| | | | | | | | | | Update to git version v2.22.0. Upstream commit bce9db6d ("trace2: use system/global config for default trace2 settings") caused a regression. We have to unset HOME and XDG_CONFIG_HOME before early loading of config from trace2 code kicks in. Signed-off-by: Christian Hesse <mail@eworm.de>
* git: update to v2.21.0Christian Hesse2019-06-05
| | | | | | | | | | | | | | Update to git version v2.21.0. Required changes follow upstream commits: * 6a7895fd8a3bd409f2b71ffc355d5142172cc2a0 (commit: prepare free_commit_buffer and release_commit_memory for any repo) * e092073d643b17c82d72cf692fbfaea9c9796f11 (tree.c: make read_tree*() take 'struct repository *') Signed-off-by: Christian Hesse <mail@eworm.de> Reviewed-by: John Keeping <john@keeping.me.uk>
* git: update to v2.20.0Christian Hesse2018-12-09
| | | | | | | | | | | | Update to git version v2.20.0. Required changes follow upstream commits: * 00436bf1b1c2a8fe6cf5d2c2457d419d683042f4 (archive: initialize archivers earlier) * 611e42a5980a3a9f8bb3b1b49c1abde63c7a191e (xdiff: provide a separate emit callback for hunks) Signed-off-by: Christian Hesse <mail@eworm.de>
* git: update to v2.19.1Christian Hesse2018-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update to git version v2.19.1. Required changes follow upstream commits: * commit: add repository argument to get_cached_commit_buffer (3ce85f7e5a41116145179f0fae2ce6d86558d099) * commit: add repository argument to lookup_commit_reference (2122f6754c93be8f02bfb5704ed96c88fc9837a8) * object: add repository argument to parse_object (109cd76dd3467bd05f8d2145b857006649741d5c) * tag: add repository argument to deref_tag (a74093da5ed601a09fa158e5ba6f6f14c1142a3e) * tag: add repository argument to lookup_tag (ce71efb713f97f476a2d2ab541a0c73f684a5db3) * tree: add repository argument to lookup_tree (f86bcc7b2ce6cad68ba1a48a528e380c6126705e) * archive.c: avoid access to the_index (b612ee202a48f129f81f8f6a5af6cf71d1a9caef) * for_each_*_object: move declarations to object-store.h (0889aae1cd18c1804ba01c1a4229e516dfb9fe9b) Signed-off-by: Christian Hesse <mail@eworm.de>
* git: update to v2.18.0Christian Hesse2018-06-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update to git version v2.18.0. Required changes follow upstream commits: * Convert find_unique_abbrev* to struct object_id (aab9583f7b5ea5463eb3f653a0b4ecac7539dc94) * sha1_file: convert read_sha1_file to struct object_id (b4f5aca40e6f77cbabcbf4ff003c3cf30a1830c8) * sha1_file: convert sha1_object_info* to object_id (abef9020e3df87c441c9a3a95f592fce5fa49bb9) * object-store: move packed_git and packed_git_mru to object store (a80d72db2a73174b3f22142eb2014b33696fd795) * treewide: rename tree to maybe_tree (891435d55da80ca3654b19834481205be6bdfe33) The changed data types required some of our own functions to be converted to struct object_id: ls_item print_dir print_dir_entry print_object single_tree_cb walk_tree write_tree_link And finally we use new upstream functions that were added for struct object_id: hashcpy -> oidcpy sha1_to_hex -> oid_to_hex Signed-off-by: Christian Hesse <mail@eworm.de> Reviewed-by: John Keeping <john@keeping.me.uk>
* git: update to v2.17.1Christian Hesse2018-06-27
| | | | | | | | | Update to git version v2.17.1. Required changes: * The function 'typename' has been renamed to 'type_name' (upstream commit debca9d2fe784193dc2d9f98b5edac605ddfefbb) Signed-off-by: Christian Hesse <mail@eworm.de>
* git: update to v2.16.0Christian Hesse2018-01-19
| | | | | | | | | | | | | | | Update to git version v2.16.0: * refs: convert resolve_ref_unsafe to struct object_id (49e61479be913f67e66bb3fdf8de9475c41b58bd) * diff: remove DIFF_OPT_SET macro (23dcf77f48feb49c54bad09210f093a799816334) * log: add option to choose which refs to decorate (65516f586b69307f977cd67cc45513a296cabc25) * diff: convert flags to be stored in bitfields (02f2f56bc377c287c411947d0e1482aac888f8db) Signed-off-by: Christian Hesse <mail@eworm.de>
* git: update to v2.15.1Christian Hesse2017-12-06
| | | | | | | | Update to git version v2.15.1: With commit 0abe14f6 prepare_packed_git() moved to packfile.[ch]. Signed-off-by: Christian Hesse <mail@eworm.de> Reviewed-by: John Keeping <john@keeping.me.uk>
* git: update to v2.14Jeff Smith2017-08-10
| | | | | | | | | | | | | | | | Numerous changes were made to git functions to use an object_id structure rather than sending sha1 hashes as raw unsigned character arrays. The functions that affect cgit are: parse_object, lookup_commit_reference, lookup_tag, lookup_tree, parse_tree_indirect, diff_root_tree_sha1, diff_tree_sha1, and format_display_notes. Commit b2141fc (config: don't include config.h by default) made it necessary to that config.h be explicitly included when needed. Commit 07a3d41 (grep: remove regflags from the public grep_opt API) removed one way of specifying the ignore-case grep option. Signed-off-by: Jeff Smith <whydoubt@gmail.com>
* git: update to v2.13.4Christian Hesse2017-08-10
| | | | | | | | | | Update to git version v2.13.4: With commit 8aee769f (pathspec: copy and free owned memory) the definition of struct pathspec_item has changed with the expectation that pathspecs will be managed dynamically. We work around this a bit by setting up a static structure, but let's allocate the match string to avoid needing to cast away const. Updated a patch from John Keeping <john@keeping.me.uk> for git v2.12.1.
* git: update to v2.11.0Christian Hesse2016-11-30
| | | | | Update to git version v2.11.0. Function write_archive() dropped argument (int setup_prefix).
* git: update to v2.10.2 againJohn Keeping2016-11-24
| | | | | | | The submodule was accidentally downgraded in commit 8e9ddd21 (Bump version, 2016-11-23). Restore v2.10.2 so it matches the makefile again. Signed-off-by: John Keeping <john@keeping.me.uk>
* Bump version.Jason A. Donenfeld2016-11-23
|
* git: update to v2.10.2Christian Hesse2016-11-06
| | | | Update to git version v2.10.2, no changes required.
* git: update to v2.10.1Christian Hesse2016-10-04
| | | | Update to git version v2.10.1, no changes required.
* git: update to v2.10.0Christian Hesse2016-09-04
| | | | | | | | Upstream continues to replace unsigned char *sha1 with struct object_id old_oid. This makes the required changes. The git lib has its own main function now. Rename our main function to cmd_main, it is called from main then.
* git: update to v2.9.1Christian Hesse2016-07-12
| | | | | | Update to git version v2.9.1, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
* git: update to v2.9.0Christian Hesse2016-06-17
| | | | | | Update to git version v2.9.0, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
* git: update to v2.8.3Christian Hesse2016-05-20
| | | | | | Update to git version v2.8.3, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
* git: update to v2.8.2Christian Hesse2016-05-12
| | | | | | | | | Update to git version v2.8.2. * Upstream commit 1a0c8dfd89475d6bb09ddee8c019cf0ae5b3bdc2 (strbuf: give strbuf_getline() to the "most text friendly" variant) changed API. Signed-off-by: Christian Hesse <mail@eworm.de>
* git: update to v2.7.2Christian Hesse2016-02-23
| | | | | | Update to git version v2.7.2, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
* git: update to v2.7.1Christian Hesse2016-02-08
| | | | | | Update to git version v2.7.1, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
* git: update to v2.7.0Christian Hesse2016-01-13
| | | | | | | | | | | | | | Update to git version v2.7.0. * Upstream commit ed1c9977cb1b63e4270ad8bdf967a2d02580aa08 (Remove get_object_hash.) changed API: Convert all instances of get_object_hash to use an appropriate reference to the hash member of the oid member of struct object. This provides no functional change, as it is essentially a macro substitution. Signed-off-by: Christian Hesse <mail@eworm.de>
* git: update to v2.6.1Christian Hesse2015-10-06
| | | | | | Update to git version v2.6.1, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
* git: update to v2.5.0Christian Hesse2015-08-12
| | | | | | | | | | | | | | | Update to git version v2.5.0. * Upstream commit 5455ee0573a22bb793a7083d593ae1ace909cd4c (Merge branch 'bc/object-id') changed API: for_each_ref() callback functions were taught to name the objects not with "unsigned char sha1[20]" but with "struct object_id". * Upstream commit dcf692625ac569fefbe52269061230f4fde10e47 (path.c: make get_pathname() call sites return const char *) Signed-off-by: Christian Hesse <mail@eworm.de>
* git: update to v2.4.1Christian Hesse2015-05-14
| | | | | | Update to git version v2.4.1, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
* git: update to v2.3.3Christian Hesse2015-03-14
| | | | | | Update to git version v2.3.3, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
* git: update to v2.3.2Christian Hesse2015-03-07
| | | | | | Update to git version v2.3.2, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
* git: update to v2.3.1Christian Hesse2015-03-03
| | | | | | Update to git version v2.3.1, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
* git: update for v2.3.0Christian Hesse2015-02-08
| | | | | | | | | * sort_string_list(): rename to string_list_sort() (upstream commit 3383e199) * update read_tree_recursive callback to pass strbuf as base (upstream commit 6a0b0b6d) Signed-off-by: Christian Hesse <mail@eworm.de>
* git: update to v2.2.2Christian Hesse2015-01-13
| | | | | | Update to git version v2.2.2, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
* git: update to v2.2.1Christian Hesse2014-12-23
| | | | | | Update to git version v2.2.1, including API changes. Signed-off-by: Christian Hesse <mail@eworm.de>
* git: update to v2.0.4John Keeping2014-08-07
| | | | | | No CGit changes required. Signed-off-by: John Keeping <john@keeping.me.uk>
* git: update to v2.0.3John Keeping2014-07-28
| | | | | | | | | | This is slightly more involved than just bumping the version number because it pulls in a change to convert the commit buffer to a slab, removing the "buffer" field from "struct commit". All sites that access "commit->buffer" have been changed to use the new functions provided for this purpose. Signed-off-by: John Keeping <john@keeping.me.uk>
* git: update to 2.0.1Christian Hesse2014-06-28
| | | | | Everything works just bumping the version in Makefile and commit hash in submodule. No code changes required.
* git: update for git 2.0Christian Hesse2014-06-28
| | | | | | | prefixcmp() and suffixcmp() have been remove, functionality is now provided by starts_with() and ends_with(). Retrurn values have been changed, so instead of just renaming we have to fix logic. Everything else looks just fine.
* git: update to 1.9.2Christian Hesse2014-04-12
| | | | | Everything works just bumping the version in Makefile and commit hash in submodule. No code changes required.
* git: update to 1.9.1Christian Hesse2014-03-20
| | | | | Everything works just bumping the version in Makefile and commit hash in submodule. No code changes required.
* git: Update to 1.9.0Lukas Fleischer2014-02-21
| | | | | | No code changes required, just bump the submodule and Makefile versions. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
* git: update to 1.8.5Christian Hesse2014-01-08
| | | | | | | Everything works just bumping the version in Makefile and commit hash in submodule. No code changes required. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
* git: update to 1.8.4John Keeping2013-08-26
| | | | | | No code changes required, just bump the submodule and makefile versions. Signed-off-by: John Keeping <john@keeping.me.uk>
* git: update to 1.8.3John Keeping2013-05-25
| | | | | | No changes required, just bump the submodule and Makefile versions. Signed-off-by: John Keeping <john@keeping.me.uk>
* git: update to 1.8.2.2John Keeping2013-04-27
| | | | | | No changes required, just bump the submodule and Makefile version. Signed-off-by: John Keeping <john@keeping.me.uk>
* Update git to v1.8.2.1John Keeping2013-04-08
| | | | | | | | | | | This requires a small change to how we handle notes, but otherwise just works. Note that we can't use anything from v1.8.0 until v1.8.2.1 because some of the symbols that we need for graph drawing were made private in v1.8.0 and this was not reverted until v1.8.2.1. Signed-off-by: John Keeping <john@keeping.me.uk>
* Update git to v1.7.12.4John Keeping2013-03-02
| | | | | | No changes needed. Signed-off-by: John Keeping <john@keeping.me.uk>
* Update git to v1.7.9.7John Keeping2013-03-02
| | | | | | resolve_ref() is renamed to resolve_ref_unsafe(). CGit's usage is safe. Signed-off-by: John Keeping <john@keeping.me.uk>
* Update git to v1.7.8.6John Keeping2013-03-02
| | | | | | No changes required. Signed-off-by: John Keeping <john@keeping.me.uk>